From 4eda2b40e57b0575e338afdd777f69c30bb38955 Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Mon, 15 Jan 2024 15:37:20 -0400 Subject: [PATCH 1/2] Pass all args. --- composer.json | 7 +++++++ drush.services.yml => drush.10-11.services.yml | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) rename drush.services.yml => drush.10-11.services.yml (52%) diff --git a/composer.json b/composer.json index 7ccbf6b..493806c 100644 --- a/composer.json +++ b/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" + } + } } } diff --git a/drush.services.yml b/drush.10-11.services.yml similarity index 52% rename from drush.services.yml rename to drush.10-11.services.yml index 5093c21..ace95f1 100644 --- a/drush.services.yml +++ b/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 } From 876c4c3d2a86eded5938ffd2293966fbdb8b919e Mon Sep 17 00:00:00 2001 From: JojoVes Date: Fri, 10 May 2024 13:24:52 -0300 Subject: [PATCH 2/2] alphabetise use statements used phpcbf --standard=Drupal,DrupalPractice --- modules/devel/src/Plugin/migrate/process/Ddm.php | 2 +- .../src/Config/Overrides.php | 2 +- .../src/Commands/DspaceCommands.php | 3 +-- .../modules/xslt/src/Controller/Xslt.php | 4 +--- .../EventSubscriber/ConfigEventSubscriber.php | 6 ++---- .../xslt/src/Plugin/migrate/process/Process.php | 5 ++--- .../migrate/process/ConstituentSequence.php | 2 +- .../process/DgiStandardTitleParagraph.php | 3 +-- .../tests/src/Kernel/RoleMapperMigrationTest.php | 3 +-- .../tests/src/Unit/RoleMapperTest.php | 3 +-- .../src/EventSubscriber/EventSubscriber.php | 16 +++++++--------- .../src/Commands/Pathauto.php | 8 ++++---- src/MigrateBatchExecutable.php | 15 +++++++-------- .../migrate/process/AbstractEntityAccessor.php | 6 ++---- src/Plugin/migrate/process/AssembleDate.php | 4 ++-- src/Plugin/migrate/process/CrossDeepen.php | 2 +- src/Plugin/migrate/process/DcName.php | 2 +- .../migrate/process/DetermineExtension.php | 8 ++++---- src/Plugin/migrate/process/Method.php | 4 ++-- src/Plugin/migrate/process/NaiveFileCopy.php | 8 ++++---- src/Plugin/migrate/process/Realpath.php | 8 ++++---- src/Plugin/migrate/process/StaticMap.php | 2 +- src/Plugin/migrate/process/SubProcess.php | 2 +- src/Plugin/migrate/process/Subindex.php | 4 ++-- src/Plugin/migrate/process/Subproperty.php | 4 ++-- src/Plugin/migrate/process/TypedRelation.php | 6 ++---- src/Plugin/migrate/process/UnpackArray.php | 4 ++-- src/Plugin/migrate/process/Xml/AbstractDom.php | 4 ++-- src/Plugin/migrate/process/Xml/ContextQuery.php | 4 ++-- src/Plugin/migrate/process/Xml/Xpath.php | 4 ++-- src/Plugin/migrate/source/Migration.php | 6 +++--- src/Routing/RouteSubscriber.php | 3 +-- 32 files changed, 70 insertions(+), 87 deletions(-) diff --git a/modules/devel/src/Plugin/migrate/process/Ddm.php b/modules/devel/src/Plugin/migrate/process/Ddm.php index ec51c25..e742298 100644 --- a/modules/devel/src/Plugin/migrate/process/Ddm.php +++ b/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; /** diff --git a/modules/dgi_migrate_big_set_overrides/src/Config/Overrides.php b/modules/dgi_migrate_big_set_overrides/src/Config/Overrides.php index 76f47c2..2346053 100644 --- a/modules/dgi_migrate_big_set_overrides/src/Config/Overrides.php +++ b/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; /** diff --git a/modules/dgi_migrate_dspace/src/Commands/DspaceCommands.php b/modules/dgi_migrate_dspace/src/Commands/DspaceCommands.php index 738fa39..a70049f 100644 --- a/modules/dgi_migrate_dspace/src/Commands/DspaceCommands.php +++ b/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; /** diff --git a/modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/Controller/Xslt.php b/modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/Controller/Xslt.php index 1734600..e2d6edc 100644 --- a/modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/Controller/Xslt.php +++ b/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; diff --git a/modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/EventSubscriber/ConfigEventSubscriber.php b/modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/EventSubscriber/ConfigEventSubscriber.php index fafba13..1095695 100644 --- a/modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/EventSubscriber/ConfigEventSubscriber.php +++ b/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; /** diff --git a/modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/Plugin/migrate/process/Process.php b/modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/Plugin/migrate/process/Process.php index 413881f..35099db 100644 --- a/modules/dgi_migrate_foxml_standard_mods/modules/xslt/src/Plugin/migrate/process/Process.php +++ b/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. diff --git a/modules/dgi_migrate_foxml_standard_mods/src/Plugin/migrate/process/ConstituentSequence.php b/modules/dgi_migrate_foxml_standard_mods/src/Plugin/migrate/process/ConstituentSequence.php index fa4f118..e9b87ff 100644 --- a/modules/dgi_migrate_foxml_standard_mods/src/Plugin/migrate/process/ConstituentSequence.php +++ b/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; /** diff --git a/modules/dgi_migrate_foxml_standard_mods/src/Plugin/migrate/process/DgiStandardTitleParagraph.php b/modules/dgi_migrate_foxml_standard_mods/src/Plugin/migrate/process/DgiStandardTitleParagraph.php index 466d546..58ddaea 100644 --- a/modules/dgi_migrate_foxml_standard_mods/src/Plugin/migrate/process/DgiStandardTitleParagraph.php +++ b/modules/dgi_migrate_foxml_standard_mods/src/Plugin/migrate/process/DgiStandardTitleParagraph.php @@ -2,6 +2,7 @@ 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; @@ -9,8 +10,6 @@ use Drupal\migrate\Row; use Drupal\paragraphs\Entity\Paragraph; -use Drupal\Component\Utility\Unicode; - /** * Generate a Title paragraph. * diff --git a/modules/dgi_migrate_foxml_standard_mods/tests/src/Kernel/RoleMapperMigrationTest.php b/modules/dgi_migrate_foxml_standard_mods/tests/src/Kernel/RoleMapperMigrationTest.php index 2fc0163..14a0b13 100644 --- a/modules/dgi_migrate_foxml_standard_mods/tests/src/Kernel/RoleMapperMigrationTest.php +++ b/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. diff --git a/modules/dgi_migrate_foxml_standard_mods/tests/src/Unit/RoleMapperTest.php b/modules/dgi_migrate_foxml_standard_mods/tests/src/Unit/RoleMapperTest.php index 439aa4a..5f76bef 100644 --- a/modules/dgi_migrate_foxml_standard_mods/tests/src/Unit/RoleMapperTest.php +++ b/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. diff --git a/modules/dgi_migrate_imagemagick_cleanup/src/EventSubscriber/EventSubscriber.php b/modules/dgi_migrate_imagemagick_cleanup/src/EventSubscriber/EventSubscriber.php index 3f02bcb..9f38f68 100644 --- a/modules/dgi_migrate_imagemagick_cleanup/src/EventSubscriber/EventSubscriber.php +++ b/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; diff --git a/modules/dgi_migrate_regenerate_pathauto_aliases/src/Commands/Pathauto.php b/modules/dgi_migrate_regenerate_pathauto_aliases/src/Commands/Pathauto.php index 1589e0e..9d0dd54 100644 --- a/modules/dgi_migrate_regenerate_pathauto_aliases/src/Commands/Pathauto.php +++ b/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; /** diff --git a/src/MigrateBatchExecutable.php b/src/MigrateBatchExecutable.php index 60fd0e3..9344dc6 100644 --- a/src/MigrateBatchExecutable.php +++ b/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. diff --git a/src/Plugin/migrate/process/AbstractEntityAccessor.php b/src/Plugin/migrate/process/AbstractEntityAccessor.php index d45586b..0a640bf 100644 --- a/src/Plugin/migrate/process/AbstractEntityAccessor.php +++ b/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; /** diff --git a/src/Plugin/migrate/process/AssembleDate.php b/src/Plugin/migrate/process/AssembleDate.php index 4b430bc..86a6078 100644 --- a/src/Plugin/migrate/process/AssembleDate.php +++ b/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; /** diff --git a/src/Plugin/migrate/process/CrossDeepen.php b/src/Plugin/migrate/process/CrossDeepen.php index 5d23dc1..679a18c 100644 --- a/src/Plugin/migrate/process/CrossDeepen.php +++ b/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; /** diff --git a/src/Plugin/migrate/process/DcName.php b/src/Plugin/migrate/process/DcName.php index 6da7e76..4fd1b19 100644 --- a/src/Plugin/migrate/process/DcName.php +++ b/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; /** diff --git a/src/Plugin/migrate/process/DetermineExtension.php b/src/Plugin/migrate/process/DetermineExtension.php index 3f18a36..7f84a07 100644 --- a/src/Plugin/migrate/process/DetermineExtension.php +++ b/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. diff --git a/src/Plugin/migrate/process/Method.php b/src/Plugin/migrate/process/Method.php index 3603d93..dd468be 100644 --- a/src/Plugin/migrate/process/Method.php +++ b/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. diff --git a/src/Plugin/migrate/process/NaiveFileCopy.php b/src/Plugin/migrate/process/NaiveFileCopy.php index 931b936..1e30eb5 100644 --- a/src/Plugin/migrate/process/NaiveFileCopy.php +++ b/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. diff --git a/src/Plugin/migrate/process/Realpath.php b/src/Plugin/migrate/process/Realpath.php index 3c08dbe..125dc40 100644 --- a/src/Plugin/migrate/process/Realpath.php +++ b/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. diff --git a/src/Plugin/migrate/process/StaticMap.php b/src/Plugin/migrate/process/StaticMap.php index 6396699..7360ce1 100644 --- a/src/Plugin/migrate/process/StaticMap.php +++ b/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; /** diff --git a/src/Plugin/migrate/process/SubProcess.php b/src/Plugin/migrate/process/SubProcess.php index 5de6398..2743e72 100644 --- a/src/Plugin/migrate/process/SubProcess.php +++ b/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; /** diff --git a/src/Plugin/migrate/process/Subindex.php b/src/Plugin/migrate/process/Subindex.php index a270744..aa9de0c 100644 --- a/src/Plugin/migrate/process/Subindex.php +++ b/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. diff --git a/src/Plugin/migrate/process/Subproperty.php b/src/Plugin/migrate/process/Subproperty.php index 3470dba..c804d4c 100644 --- a/src/Plugin/migrate/process/Subproperty.php +++ b/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. diff --git a/src/Plugin/migrate/process/TypedRelation.php b/src/Plugin/migrate/process/TypedRelation.php index cd87778..678fe08 100644 --- a/src/Plugin/migrate/process/TypedRelation.php +++ b/src/Plugin/migrate/process/TypedRelation.php @@ -2,12 +2,10 @@ namespace Drupal\dgi_migrate\Plugin\migrate\process; +use Drupal\Core\Plugin\ContainerFactoryPluginInterface; +use Drupal\migrate\MigrateException; use Drupal\migrate\MigrateExecutableInterface; use Drupal\migrate\Row; -use Drupal\migrate\MigrateException; - -use Drupal\Core\Plugin\ContainerFactoryPluginInterface; - use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/src/Plugin/migrate/process/UnpackArray.php b/src/Plugin/migrate/process/UnpackArray.php index 7b1531b..2dc32d4 100644 --- a/src/Plugin/migrate/process/UnpackArray.php +++ b/src/Plugin/migrate/process/UnpackArray.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; /** * Unpack an array. diff --git a/src/Plugin/migrate/process/Xml/AbstractDom.php b/src/Plugin/migrate/process/Xml/AbstractDom.php index 507c1ef..8b885f1 100644 --- a/src/Plugin/migrate/process/Xml/AbstractDom.php +++ b/src/Plugin/migrate/process/Xml/AbstractDom.php @@ -3,10 +3,10 @@ namespace Drupal\dgi_migrate\Plugin\migrate\process\Xml; use Drupal\dgi_migrate\Plugin\migrate\process\MissingBehaviorTrait; -use Drupal\migrate\ProcessPluginBase; +use Drupal\migrate\MigrateException; use Drupal\migrate\MigrateExecutableInterface; +use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\Row; -use Drupal\migrate\MigrateException; /** * Parses X(HT)ML into a DOMDocument instance. diff --git a/src/Plugin/migrate/process/Xml/ContextQuery.php b/src/Plugin/migrate/process/Xml/ContextQuery.php index 8de861b..4d825cf 100644 --- a/src/Plugin/migrate/process/Xml/ContextQuery.php +++ b/src/Plugin/migrate/process/Xml/ContextQuery.php @@ -2,10 +2,10 @@ namespace Drupal\dgi_migrate\Plugin\migrate\process\Xml; -use Drupal\migrate\ProcessPluginBase; +use Drupal\dgi_migrate\Plugin\migrate\process\MissingBehaviorTrait; use Drupal\migrate\MigrateExecutableInterface; +use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\Row; -use Drupal\dgi_migrate\Plugin\migrate\process\MissingBehaviorTrait; /** * Query a DOMXPath using a DOMNode context as the source. diff --git a/src/Plugin/migrate/process/Xml/Xpath.php b/src/Plugin/migrate/process/Xml/Xpath.php index f7252d0..df2e3e3 100644 --- a/src/Plugin/migrate/process/Xml/Xpath.php +++ b/src/Plugin/migrate/process/Xml/Xpath.php @@ -2,10 +2,10 @@ namespace Drupal\dgi_migrate\Plugin\migrate\process\Xml; -use Drupal\migrate\ProcessPluginBase; +use Drupal\migrate\MigrateException; use Drupal\migrate\MigrateExecutableInterface; +use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\Row; -use Drupal\migrate\MigrateException; /** * Instantiate XPath processor. diff --git a/src/Plugin/migrate/source/Migration.php b/src/Plugin/migrate/source/Migration.php index 211e1ea..2872c78 100644 --- a/src/Plugin/migrate/source/Migration.php +++ b/src/Plugin/migrate/source/Migration.php @@ -2,12 +2,12 @@ namespace Drupal\dgi_migrate\Plugin\migrate\source; -use Drupal\migrate\Plugin\migrate\source\SourcePluginBase; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +use Drupal\dgi_migrate\MigrationIterator; +use Drupal\migrate\Plugin\migrate\source\SourcePluginBase; use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\Plugin\MigrationPluginManagerInterface; -use Drupal\dgi_migrate\MigrationIterator; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Perform a migration based upon the results of another migration. diff --git a/src/Routing/RouteSubscriber.php b/src/Routing/RouteSubscriber.php index 049f812..1677266 100644 --- a/src/Routing/RouteSubscriber.php +++ b/src/Routing/RouteSubscriber.php @@ -3,9 +3,8 @@ namespace Drupal\dgi_migrate\Routing; use Drupal\Core\Routing\RouteSubscriberBase; -use Symfony\Component\Routing\RouteCollection; - use Drupal\dgi_migrate\Form\MigrationExecuteForm; +use Symfony\Component\Routing\RouteCollection; /** * Route subscriber handler.