DGI9-477: Pass all args.

composer.json

@@ -24,5 +24,12 @@
     "suggest": {
         "discoverygarden/entity_reference_integrity_extra": "Deal with addtional 'entity_reference' fields.",
         "drupal/entity_reference_integrity": "Used to check things when a migration elects to 'manage_orphans'."
+    },
+    "extra": {
+        "drush": {
+            "services": {
+                "drush.10-11.services.yml": "^10 || ^11"
+            }
+        }
     }
 }

drush.services.yml → drush.10-11.services.yml

@@ -2,7 +2,10 @@
 services:
   dgi_migrate.commands:
     class: \Drupal\dgi_migrate\Drush\Commands\MigrateCommands
-    factory: [null, create]
-    arguments: ['@service_container']
+    arguments:
+      - '@plugin.manager.migration'
+      - '@date.formatter'
+      - '@entity_type.manager'
+      - '@keyvalue'
     tags:
       - { name: drush.command }

modules/devel/src/Plugin/migrate/process/Ddm.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\dgi_migrate_devel\Plugin\migrate\process;
 
-use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
 /**

modules/dgi_migrate_big_set_overrides/src/Config/Overrides.php

@@ -4,8 +4,8 @@
 
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Cache\CacheableMetadata;
-use Drupal\Core\Config\ConfigFactoryOverrideInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\ConfigFactoryOverrideInterface;
 use Drupal\Core\Config\StorageInterface;
 
 /**

modules/dgi_migrate_dspace/src/Commands/DspaceCommands.php

@@ -2,10 +2,9 @@
 
 namespace Drupal\dgi_migrate_dspace\Commands;
 
-use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
-
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
 use Drush\Commands\DrushCommands;
 
 /**

modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/Controller/Xslt.php

@@ -2,14 +2,12 @@
 
 namespace Drupal\dgi_migrate_foxml_standard_mods_xslt\Controller;
 
-use Drupal\dgi_migrate_foxml_standard_mods_xslt\Form\Settings;
-
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Cache\CacheableResponse;
 use Drupal\Core\Config\Config;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Session\AccountInterface;
-
+use Drupal\dgi_migrate_foxml_standard_mods_xslt\Form\Settings;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\IpUtils;
 use Symfony\Component\HttpFoundation\Request;

modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/EventSubscriber/ConfigEventSubscriber.php

@@ -2,13 +2,11 @@
 
 namespace Drupal\dgi_migrate_foxml_standard_mods_xslt\EventSubscriber;
 
-use Drupal\dgi_migrate_foxml_standard_mods_xslt\Form\Settings;
-use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
-
 use Drupal\Component\Plugin\Discovery\CachedDiscoveryInterface;
 use Drupal\Core\Config\ConfigCrudEvent;
 use Drupal\Core\Config\ConfigEvents;
-
+use Drupal\dgi_migrate_foxml_standard_mods_xslt\Form\Settings;
+use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**

modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/Plugin/migrate/process/Process.php

@@ -2,10 +2,9 @@
 
 namespace Drupal\dgi_migrate_foxml_standard_mods_xslt\Plugin\migrate\process;
 
-use Drupal\dgi_saxon_helper_migrate\Plugin\migrate\process\Saxon;
-use Drupal\dgi_saxon_helper\TransformerInterface;
-
 use Drupal\Core\Url;
+use Drupal\dgi_saxon_helper\TransformerInterface;
+use Drupal\dgi_saxon_helper_migrate\Plugin\migrate\process\Saxon;
 
 /**
  * Wrapper to help perform _our_ transformation.

modules/dgi_migrate_foxml_standard_mods/src/Plugin/migrate/process/ConstituentSequence.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\dgi_migrate_foxml_standard_mods\Plugin\migrate\process;
 
-use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
 /**

modules/dgi_migrate_foxml_standard_mods/src/Plugin/migrate/process/DgiStandardTitleParagraph.php

@@ -2,15 +2,14 @@
 
 namespace Drupal\dgi_migrate_foxml_standard_mods\Plugin\migrate\process;
 
+use Drupal\Component\Utility\Unicode;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 use Drupal\paragraphs\Entity\Paragraph;
 
-use Drupal\Component\Utility\Unicode;
-
 /**
  * Generate a Title paragraph.
  *

modules/dgi_migrate_foxml_standard_mods/tests/src/Kernel/RoleMapperMigrationTest.php

@@ -3,10 +3,9 @@
 namespace Drupal\Tests\dgi_migrate_foxml_standard_mods\Kernel;
 
 use Drupal\KernelTests\KernelTestBase;
-use Symfony\Component\Yaml\Yaml;
-
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\Row;
+use Symfony\Component\Yaml\Yaml;
 
 /**
  * Test out the role mapper.

modules/dgi_migrate_foxml_standard_mods/tests/src/Unit/RoleMapperTest.php

@@ -2,9 +2,8 @@
 
 namespace Drupal\Tests\dgi_migrate_foxml_standard_mods\Unit;
 
-use Drupal\Tests\UnitTestCase;
-
 use Drupal\dgi_migrate_foxml_standard_mods\Plugin\migrate\process\TypedRelation;
+use Drupal\Tests\UnitTestCase;
 
 /**
  * Test out the role mapper.

modules/dgi_migrate_imagemagick_cleanup/src/EventSubscriber/EventSubscriber.php

@@ -2,18 +2,16 @@
 
 namespace Drupal\dgi_migrate_imagemagick_cleanup\EventSubscriber;
 
-use Drupal\dgi_migrate_imagemagick_cleanup\Event\TempImageEvent;
-use Drupal\migrate\Event\MigrateEvents;
-use Drupal\migrate\Event\MigratePreRowSaveEvent;
-use Drupal\migrate\Event\MigratePostRowSaveEvent;
-use Drupal\imagemagick\Event\ImagemagickExecutionEvent;
-use Drupal\imagemagick\ImagemagickExecArguments;
-
 use Drupal\Core\DestructableInterface;
-use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\File\Exception\FileException;
+use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
-
+use Drupal\dgi_migrate_imagemagick_cleanup\Event\TempImageEvent;
+use Drupal\imagemagick\Event\ImagemagickExecutionEvent;
+use Drupal\imagemagick\ImagemagickExecArguments;
+use Drupal\migrate\Event\MigrateEvents;
+use Drupal\migrate\Event\MigratePostRowSaveEvent;
+use Drupal\migrate\Event\MigratePreRowSaveEvent;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

modules/dgi_migrate_regenerate_pathauto_aliases/src/Commands/Pathauto.php

@@ -2,13 +2,13 @@
 
 namespace Drupal\dgi_migrate_regenerate_pathauto_aliases\Commands;
 
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\pathauto\PathautoGeneratorInterface;
-use Drush\Commands\DrushCommands;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\pathauto\PathautoGeneratorInterface;
 use Drupal\pathauto\PathautoState;
+use Drush\Commands\DrushCommands;
 use Psr\Log\LoggerInterface;
 
 /**

src/MigrateBatchExecutable.php

@@ -2,23 +2,22 @@
 
 namespace Drupal\dgi_migrate;
 
+use Drupal\Component\Utility\Timer;
+use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Queue\QueueInterface;
-use Drupal\migrate\MigrateException;
-use Drupal\migrate_tools\IdMapFilter;
-use Drupal\migrate_tools\MigrateExecutable;
 use Drupal\migrate\Event\MigrateEvents;
 use Drupal\migrate\Event\MigrateImportEvent;
 use Drupal\migrate\Event\MigratePostRowSaveEvent;
 use Drupal\migrate\Event\MigratePreRowSaveEvent;
 use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateMessageInterface;
 use Drupal\migrate\MigrateSkipRowException;
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
-
-use Drupal\Core\DependencyInjection\DependencySerializationTrait;
-use Drupal\Component\Utility\Timer;
+use Drupal\migrate_tools\IdMapFilter;
+use Drupal\migrate_tools\MigrateExecutable;
 
 /**
  * Migration executable to run as fully queued batch.

src/Plugin/migrate/process/AbstractEntityAccessor.php

@@ -2,12 +2,10 @@
 
 namespace Drupal\dgi_migrate\Plugin\migrate\process;
 
-use Drupal\migrate\EntityFieldDefinitionTrait;
-use Drupal\migrate\ProcessPluginBase;
-
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-
+use Drupal\migrate\EntityFieldDefinitionTrait;
+use Drupal\migrate\ProcessPluginBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

src/Plugin/migrate/process/AssembleDate.php

@@ -2,9 +2,9 @@
 
 namespace Drupal\dgi_migrate\Plugin\migrate\process;
 
-use Drupal\migrate\ProcessPluginBase;
-use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\MigrateException;
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
 /**

src/Plugin/migrate/process/CrossDeepen.php

@@ -2,9 +2,9 @@
 
 namespace Drupal\dgi_migrate\Plugin\migrate\process;
 
-use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
 /**

src/Plugin/migrate/process/DcName.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\dgi_migrate\Plugin\migrate\process;
 
-use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
 /**

src/Plugin/migrate/process/DetermineExtension.php

@@ -2,12 +2,12 @@
 
 namespace Drupal\dgi_migrate\Plugin\migrate\process;
 
-use Symfony\Component\Mime\MimeTypes;
-use Drupal\migrate\ProcessPluginBase;
-use Drupal\migrate\MigrateExecutableInterface;
-use Drupal\migrate\Row;
 use Drupal\migrate\MigrateException;
+use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\Row;
+use Symfony\Component\Mime\MimeTypes;
 
 /**
  * Determine a file extension from a MIME-type.

src/Plugin/migrate/process/Method.php

@@ -2,10 +2,10 @@
 
 namespace Drupal\dgi_migrate\Plugin\migrate\process;
 
-use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
-use Drupal\migrate\MigrateException;
 
 /**
  * Call a method on an object.

src/Plugin/migrate/process/NaiveFileCopy.php

@@ -2,17 +2,17 @@
 
 namespace Drupal\dgi_migrate\Plugin\migrate\process;
 
-use Drupal\migrate\Plugin\migrate\process\FileCopy;
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\File\Exception\FileException;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\Plugin\migrate\process\FileCopy;
+use Drupal\migrate\Plugin\MigrateProcessInterface;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
-use Drupal\migrate\Plugin\MigrateProcessInterface;
 
 /**
  * Naive file_copy implementation.

src/Plugin/migrate/process/Realpath.php

@@ -2,13 +2,13 @@
 
 namespace Drupal\dgi_migrate\Plugin\migrate\process;
 
-use Drupal\migrate\ProcessPluginBase;
+use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
-use Drupal\migrate\MigrateException;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\File\FileSystemInterface;
 
 /**
  * Wrapper for FileSystem::realpath.

src/Plugin/migrate/process/StaticMap.php

@@ -5,8 +5,8 @@
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\MigrateSkipProcessException;
 use Drupal\migrate\MigrateSkipRowException;
-use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\process\StaticMap as Upstream;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 
 /**

src/Plugin/migrate/process/SubProcess.php

@@ -2,9 +2,9 @@
 
 namespace Drupal\dgi_migrate\Plugin\migrate\process;
 
-use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\MigrateSkipRowException;
+use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
 /**

src/Plugin/migrate/process/Subindex.php

@@ -2,10 +2,10 @@
 
 namespace Drupal\dgi_migrate\Plugin\migrate\process;
 
-use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
-use Drupal\migrate\MigrateException;
 
 /**
  * Accesses a property from an object.

src/Plugin/migrate/process/Subproperty.php

@@ -2,10 +2,10 @@
 
 namespace Drupal\dgi_migrate\Plugin\migrate\process;
 
-use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
-use Drupal\migrate\MigrateException;
 
 /**
  * Accesses a property from an object.