Issue #2676222 by alexpott, johnrosswvsu: Move MigrationInterface out of the...

Issue #2676222 by alexpott, johnrosswvsu: Move MigrationInterface out of the migrate\Entity namspace now they are plugins

core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php

@@ -9,7 +9,7 @@
 
 use Drupal\ban\BanIpManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -39,7 +39,7 @@ class BlockedIP extends DestinationBase implements ContainerFactoryPluginInterfa
    *  The plugin ID.
    * @param mixed $plugin_definition
    *  The plugin definiiton.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *  The current migration.
    * @param \Drupal\ban\BanIpManagerInterface $ban_manager
    *  The IP manager service.

core/modules/block/src/Plugin/migrate/process/BlockPluginId.php

@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Plugin\MigrateProcessInterface;
 use Drupal\migrate\ProcessPluginBase;

core/modules/block/src/Plugin/migrate/process/BlockTheme.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\block\Plugin\migrate\process;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
@@ -45,7 +45,7 @@ class BlockTheme extends ProcessPluginBase implements ContainerFactoryPluginInte
    *   The plugin ID for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration entity.
    * @param \Drupal\Core\Config\Config $theme_config
    *   The system.theme configuration factory object.

core/modules/block/src/Plugin/migrate/process/BlockVisibility.php

@@ -9,7 +9,7 @@
 
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\MigrateProcessInterface;

core/modules/comment/src/Plugin/migrate/destination/EntityComment.php

@@ -12,7 +12,7 @@
 use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\State\StateInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;

core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php

@@ -96,7 +96,7 @@ public function testFields() {
     $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', array('@fieldtype' => $field_storage->getType())));
 
     // Validate that the source count and processed count match up.
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
     $migration = $this->getMigration('d6_field');
     $this->assertIdentical($migration->getSourcePlugin()->count(), $migration->getIdMap()->processedCount());
 

core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php

@@ -114,7 +114,7 @@ public function testFields() {
     $this->assertIdentical('taxonomy_term', $field->getSetting('target_type'));
 
     // Validate that the source count and processed count match up.
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
     $migration = $this->getMigration('d7_field');
     $this->assertIdentical($migration->getSourcePlugin()->count(), $migration->getIdMap()->processedCount());
   }

core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php

@@ -8,7 +8,7 @@
 namespace Drupal\Tests\field\Unit\Plugin\migrate\process\d6;
 
 use Drupal\field\Plugin\migrate\process\d6\FieldSettings;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
 use Drupal\Tests\UnitTestCase;

core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php

@@ -8,7 +8,7 @@
 namespace Drupal\Tests\field\Unit\Plugin\migrate\process\d7;
 
 use Drupal\field\Plugin\migrate\process\d7\FieldInstanceSettings;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
 use Drupal\Tests\migrate\Unit\MigrateTestCase;

core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php

@@ -8,7 +8,7 @@
 namespace Drupal\Tests\field\Unit\Plugin\migrate\process\d7;
 
 use Drupal\field\Plugin\migrate\process\d7\FieldSettings;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
 use Drupal\Tests\migrate\Unit\MigrateTestCase;

core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\file\Plugin\migrate\cckfield\d6;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 

core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\file\Plugin\migrate\cckfield\d7;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 

core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\file\Plugin\migrate\cckfield\d7;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
 /**

core/modules/file/src/Plugin/migrate/destination/EntityFile.php

@@ -15,7 +15,7 @@
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\StreamWrapper\LocalStream;
 use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;

core/modules/file/src/Plugin/migrate/process/d6/CckFile.php

@@ -8,7 +8,7 @@
 namespace Drupal\file\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\MigrateProcessInterface;
@@ -39,7 +39,7 @@ class CckFile extends ProcessPluginBase implements ContainerFactoryPluginInterfa
    *   The plugin ID.
    * @param mixed $plugin_definition
    *   The plugin definition.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The current migration.
    * @param \Drupal\migrate\Plugin\MigrateProcessInterface $migration_plugin
    *   An instance of the 'migration' process plugin.

core/modules/file/src/Tests/Migrate/d6/FileMigrationTestTrait.php

@@ -19,7 +19,7 @@ protected function setUpMigratedFiles() {
     $this->installEntitySchema('file');
     $this->installConfig(['file']);
 
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
     $migration_plugin_manager = $this->container->get('plugin.manager.migration');
 
     /** @var \Drupal\migrate\Plugin\migration $migration */

core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php

@@ -8,7 +8,7 @@
 namespace Drupal\Tests\file\Unit\Plugin\migrate\process\d6;
 
 use Drupal\file\Plugin\migrate\process\d6\CckFile;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Plugin\MigrateProcessInterface;
 use Drupal\migrate\Row;

core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php

@@ -8,7 +8,7 @@
 namespace Drupal\filter\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Plugin\MigrateProcessInterface;
 use Drupal\migrate\ProcessPluginBase;

core/modules/image/src/Tests/Migrate/d6/MigrateImageCacheTest.php

@@ -9,7 +9,7 @@
 
 use Drupal\Core\Database\Database;
 use Drupal\image\Entity\ImageStyle;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 

core/modules/link/src/Plugin/migrate/cckfield/LinkField.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\link\Plugin\migrate\cckfield;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
 /**

core/modules/link/src/Plugin/migrate/process/d6/CckLink.php

@@ -8,7 +8,7 @@
 namespace Drupal\link\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;

core/modules/migrate/migrate.api.php

@@ -5,7 +5,7 @@
  * Hooks provided by the Migrate module.
  */
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\MigrateSourceInterface;
 use Drupal\migrate\Row;
 

core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -18,7 +18,7 @@ class MigrateIdMapMessageEvent extends Event {
   /**
    * Migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
@@ -46,7 +46,7 @@ class MigrateIdMapMessageEvent extends Event {
   /**
    * Constructs a post-save event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    * @param array $source_id_values
    *   Values represent the source ID.
@@ -65,7 +65,7 @@ public function __construct(MigrationInterface $migration, array $source_id_valu
   /**
    * Gets the migration entity.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface
+   * @return \Drupal\migrate\Plugin\MigrationInterface
    *   The migration entity involved.
    */
   public function getMigration() {

core/modules/migrate/src/Event/MigrateImportEvent.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -18,14 +18,14 @@ class MigrateImportEvent extends Event {
   /**
    * Migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
   /**
    * Constructs an import event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    */
   public function __construct(MigrationInterface $migration) {
@@ -35,7 +35,7 @@ public function __construct(MigrationInterface $migration) {
   /**
    * Gets the migration entity.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface
+   * @return \Drupal\migrate\Plugin\MigrationInterface
    *   The migration entity involved.
    */
   public function getMigration() {

core/modules/migrate/src/Event/MigratePostRowSaveEvent.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 
 /**
@@ -18,7 +18,7 @@ class MigratePostRowSaveEvent extends MigratePreRowSaveEvent {
   /**
    * Constructs a post-save event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    * @param \Drupal\migrate\Row $row
    *   Row object.

core/modules/migrate/src/Event/MigratePreRowSaveEvent.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Symfony\Component\EventDispatcher\Event;
 
@@ -26,14 +26,14 @@ class MigratePreRowSaveEvent extends Event {
   /**
    * Migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
   /**
    * Constructs a pre-save event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    */
   public function __construct(MigrationInterface $migration, Row $row) {
@@ -44,7 +44,7 @@ public function __construct(MigrationInterface $migration, Row $row) {
   /**
    * Gets the migration entity.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface
+   * @return \Drupal\migrate\Plugin\MigrationInterface
    *   The migration entity being imported.
    */
   public function getMigration() {

core/modules/migrate/src/Event/MigrateRollbackEvent.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -18,14 +18,14 @@ class MigrateRollbackEvent extends Event {
   /**
    * Migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
   /**
    * Constructs an rollback event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    */
   public function __construct(MigrationInterface $migration) {
@@ -35,7 +35,7 @@ public function __construct(MigrationInterface $migration) {
   /**
    * Gets the migration entity.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface
+   * @return \Drupal\migrate\Plugin\MigrationInterface
    *   The migration entity involved.
    */
   public function getMigration() {

core/modules/migrate/src/Event/MigrateRowDeleteEvent.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -18,7 +18,7 @@ class MigrateRowDeleteEvent extends Event {
   /**
    * Migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
@@ -32,7 +32,7 @@ class MigrateRowDeleteEvent extends Event {
   /**
    * Constructs a row deletion event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    * @param array $destination_id_values
    *   Values represent the destination ID.
@@ -45,7 +45,7 @@ public function __construct(MigrationInterface $migration, $destination_id_value
   /**
    * Gets the migration entity.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface
+   * @return \Drupal\migrate\Plugin\MigrationInterface
    *   The migration being rolled back.
    */
   public function getMigration() {

core/modules/migrate/src/MigrateBuildDependencyInterface.php

@@ -12,7 +12,7 @@ interface MigrateBuildDependencyInterface {
   /**
    * Builds a dependency tree for the migrations and set their order.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface[] $migrations
+   * @param \Drupal\migrate\Plugin\MigrationInterface[] $migrations
    *   Array of loaded migrations with their declared dependencies.
    * @param array $dynamic_ids
    *   Keys are dynamic ids (for example node:*) values are a list of loaded

core/modules/migrate/src/MigrateException.php

@@ -7,8 +7,8 @@
 
 namespace Drupal\migrate;
 
-use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 
 /**
  * Defines the migrate exception class.

core/modules/migrate/src/MigrateExecutable.php

@@ -9,7 +9,6 @@
 
 use Drupal\Core\Utility\Error;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\Event\MigrateEvents;
 use Drupal\migrate\Event\MigrateImportEvent;
 use Drupal\migrate\Event\MigratePostRowSaveEvent;
@@ -18,6 +17,7 @@
 use Drupal\migrate\Event\MigrateRowDeleteEvent;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -29,7 +29,7 @@ class MigrateExecutable implements MigrateExecutableInterface {
   /**
    * The configuration of the migration to do.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
@@ -102,7 +102,7 @@ class MigrateExecutable implements MigrateExecutableInterface {
   /**
    * Constructs a MigrateExecutable and verifies and sets the memory limit.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration to run.
    * @param \Drupal\migrate\MigrateMessageInterface $message
    *   The message to record.

core/modules/migrate/src/MigrateExecutableInterface.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 
 interface MigrateExecutableInterface {
 

core/modules/migrate/src/MigrationStorage.php

@@ -67,7 +67,7 @@ public function loadMultiple(array $ids = NULL) {
     if ($ids) {
       $ids = $this->getVariantIds($ids);
     }
-    /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */
+    /** @var \Drupal\migrate\Plugin\MigrationInterface[] $migrations */
     $migrations = parent::loadMultiple($ids);
 
     foreach ($migrations as $migration) {
@@ -126,7 +126,7 @@ public function buildDependencyMigration(array $migrations, array $dynamic_ids)
     $requirement_graph = array();
     $different = FALSE;
     foreach ($migrations as $migration) {
-      /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+      /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
       $id = $migration->id();
       $requirements[$id] = array();
       $dependency_graph[$id]['edges'] = array();

core/modules/migrate/src/Plugin/MigrateDestinationInterface.php

@@ -8,7 +8,6 @@
 namespace Drupal\migrate\Plugin;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\Row;
 
 /**
@@ -48,7 +47,7 @@ public function getIds();
    * @todo Review the cases where we need the Migration parameter, can we avoid
    *   that? To be resolved with https://www.drupal.org/node/2543568.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   (optional) The migration containing this destination. Defaults to NULL.
    *
    * @return array

core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php

@@ -10,7 +10,6 @@
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\migrate\Entity\MigrationInterface;
 
 /**
  * Plugin manager for migrate destination plugins.

core/modules/migrate/src/Plugin/MigrateIdMapInterface.php

@@ -8,7 +8,6 @@
 namespace Drupal\migrate\Plugin;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\MigrateMessageInterface;
 use Drupal\migrate\Row;
 

core/modules/migrate/src/Plugin/MigratePluginManager.php

@@ -11,7 +11,6 @@
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\migrate\Entity\MigrationInterface;
 
 /**
  * Manages migrate plugins.

core/modules/migrate/src/Plugin/Migration.php

@@ -12,7 +12,6 @@
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateSkipRowException;
 use Drupal\Component\Utility\NestedArray;
-use Drupal\migrate\Entity\MigrationInterface;
 
 /**
  * Defines the Migration plugin.
@@ -413,7 +412,7 @@ public function checkRequirements() {
       // There are no requirements to check.
       return;
     }
-    /** @var \Drupal\migrate\Entity\MigrationInterface[] $required_migrations */
+    /** @var \Drupal\migrate\Plugin\MigrationInterface[] $required_migrations */
     $required_migrations = $this->getMigrationPluginManager()->createInstances($this->requirements);
 
     $missing_migrations = array_diff($this->requirements, array_keys($required_migrations));

core/modules/migrate/src/Entity/MigrationInterface.php → core/modules/migrate/src/Plugin/MigrationInterface.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Entity\MigrationInterface.
+ * Contains \Drupal\migrate\Plugin\MigrationInterface.
  */
 
-namespace Drupal\migrate\Entity;
+namespace Drupal\migrate\Plugin;
 
 use Drupal\Component\Plugin\DerivativeInspectionInterface;
 use Drupal\Component\Plugin\PluginInspectionInterface;
@@ -106,7 +106,7 @@ interface MigrationInterface extends PluginInspectionInterface, DerivativeInspec
    * @return string
    *   The plugin_id of the plugin instance.
    *
-   * @see \Drupal\migrate\Entity\MigrationInterface::getPluginId()
+   * @see \Drupal\migrate\Plugin\MigrationInterface::getPluginId()
    */
   public function id();
 

core/modules/migrate/src/Plugin/MigrationPluginManager.php

@@ -37,7 +37,7 @@ class MigrationPluginManager extends DefaultPluginManager implements MigrationPl
    *
    * @var string
    */
-  protected $pluginInterface = 'Drupal\migrate\Entity\MigrationInterface';
+  protected $pluginInterface = 'Drupal\migrate\Plugin\MigrationInterface';
 
   /**
    * The module handler.
@@ -117,7 +117,7 @@ public function createInstances($migration_id, array $configuration = array()) {
    * @param string $tag
    *   A migration tag we want to filter by.
    *
-   * @return array|\Drupal\migrate\Entity\MigrationInterface[]
+   * @return array|\Drupal\migrate\Plugin\MigrationInterface[]
    *   An array of migration objects with the given tag.
    */
   public function createInstancesByTag($tag) {
@@ -163,7 +163,7 @@ public function buildDependencyMigration(array $migrations, array $dynamic_ids)
     $dependency_graph = [];
     $required_dependency_graph = [];
     foreach ($migrations as $migration) {
-      /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+      /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
       $id = $migration->id();
       $requirements[$id] = [];
       $dependency_graph[$id]['edges'] = [];

core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php

@@ -25,7 +25,7 @@ interface MigrationPluginManagerInterface extends PluginManagerInterface {
    *   An array of configuration relevant to the plugin instances. Keyed by the
    *   plugin ID.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface[]
+   * @return \Drupal\migrate\Plugin\MigrationInterface[]
    *   Fully configured plugin instances.
    *
    * @throws \Drupal\Component\Plugin\Exception\PluginException

core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Plugin\migrate\destination;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 
 /**

core/modules/migrate/src/Plugin/migrate/destination/Config.php

@@ -12,7 +12,7 @@
 use Drupal\Core\Entity\DependencyTrait;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -55,7 +55,7 @@ class Config extends DestinationBase implements ContainerFactoryPluginInterface,
    *   The plugin ID for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration entity.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The configuration factory.

core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php

@@ -8,7 +8,7 @@
 namespace Drupal\migrate\Plugin\migrate\destination;
 
 use Drupal\Core\Plugin\PluginBase;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\MigrateDestinationInterface;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
@@ -43,7 +43,7 @@ abstract class DestinationBase extends PluginBase implements MigrateDestinationI
   /**