From 15cd03118427c091c0e8c47399eca9403ace5c3f Mon Sep 17 00:00:00 2001
From: Adam Vessey <adam@discoverygarden.ca>
Date: Mon, 15 Jan 2024 14:57:52 -0400
Subject: [PATCH] Fix up for Drush 12.

---
 composer.json                                 |  2 +-
 drush.9-11.services.yml                       | 19 +++++++++++++++++++
 drush.services.yml                            |  8 --------
 .../Commands/ContentSyncCommands.php          |  2 +-
 4 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 drush.9-11.services.yml
 delete mode 100644 drush.services.yml
 rename src/{ => Drush}/Commands/ContentSyncCommands.php (99%)

diff --git a/composer.json b/composer.json
index 7bced48..89b6b81 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     "extra": {
         "drush": {
             "services": {
-                "drush.services.yml": "^9 || ^10"
+                "drush.9-11.services.yml": "^9 || ^10 || ^11"
             }
         }
     }
diff --git a/drush.9-11.services.yml b/drush.9-11.services.yml
new file mode 100644
index 0000000..e27644c
--- /dev/null
+++ b/drush.9-11.services.yml
@@ -0,0 +1,19 @@
+---
+services:
+  content_sync.commands:
+    class: \Drupal\content_sync\Drush\Commands\ContentSyncCommands
+    arguments:
+      - '@content.storage'
+      - '@content.storage.sync'
+      - '@content_sync.manager'
+      - '@entity_type.manager'
+      - '@content_sync.exporter'
+      - '@module_handler'
+      - '@event_dispatcher'
+      - '@lock'
+      - '@config.typed'
+      - '@module_installer'
+      - '@theme_handler'
+      - '@string_translation'
+    tags:
+      - { name: drush.command }
diff --git a/drush.services.yml b/drush.services.yml
deleted file mode 100644
index 4938e3f..0000000
--- a/drush.services.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-services:
-  content_sync.commands:
-    class: \Drupal\content_sync\Commands\ContentSyncCommands
-    factory: [null, create]
-    arguments: ['@service_container']
-    tags:
-      - { name: drush.command }
diff --git a/src/Commands/ContentSyncCommands.php b/src/Drush/Commands/ContentSyncCommands.php
similarity index 99%
rename from src/Commands/ContentSyncCommands.php
rename to src/Drush/Commands/ContentSyncCommands.php
index a1f21c3..016a887 100644
--- a/src/Commands/ContentSyncCommands.php
+++ b/src/Drush/Commands/ContentSyncCommands.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_sync\Commands;
+namespace Drupal\content_sync\Drush\Commands;
 
 use Drupal\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Console\Input\InputInterface;