From 1cc137f3723ab54e77814138e953f0f932f85a42 Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Tue, 15 Mar 2016 08:52:48 +0900
Subject: [PATCH] Issue #2676222 by alexpott, johnrosswvsu: Move
MigrationInterface out of the migrate\Entity namspace now they are plugins
---
.../ban/src/Plugin/migrate/destination/BlockedIp.php | 4 ++--
.../src/Plugin/migrate/process/BlockPluginId.php | 2 +-
.../block/src/Plugin/migrate/process/BlockTheme.php | 4 ++--
.../src/Plugin/migrate/process/BlockVisibility.php | 2 +-
.../src/Plugin/migrate/destination/EntityComment.php | 2 +-
.../field/src/Tests/Migrate/d6/MigrateFieldTest.php | 2 +-
.../field/src/Tests/Migrate/d7/MigrateFieldTest.php | 2 +-
.../Plugin/migrate/process/d6/FieldSettingsTest.php | 2 +-
.../migrate/process/d7/FieldInstanceSettingsTest.php | 2 +-
.../Plugin/migrate/process/d7/FieldSettingsTest.php | 2 +-
.../src/Plugin/migrate/cckfield/d6/FileField.php | 2 +-
.../src/Plugin/migrate/cckfield/d7/FileField.php | 2 +-
.../src/Plugin/migrate/cckfield/d7/ImageField.php | 2 +-
.../src/Plugin/migrate/destination/EntityFile.php | 2 +-
.../file/src/Plugin/migrate/process/d6/CckFile.php | 4 ++--
.../src/Tests/Migrate/d6/FileMigrationTestTrait.php | 2 +-
.../Unit/Plugin/migrate/process/d6/CckFileTest.php | 2 +-
.../migrate/process/d6/FilterFormatPermission.php | 2 +-
.../src/Tests/Migrate/d6/MigrateImageCacheTest.php | 2 +-
.../link/src/Plugin/migrate/cckfield/LinkField.php | 2 +-
.../link/src/Plugin/migrate/process/d6/CckLink.php | 2 +-
core/modules/migrate/migrate.api.php | 2 +-
.../migrate/src/Event/MigrateIdMapMessageEvent.php | 8 ++++----
.../modules/migrate/src/Event/MigrateImportEvent.php | 8 ++++----
.../migrate/src/Event/MigratePostRowSaveEvent.php | 4 ++--
.../migrate/src/Event/MigratePreRowSaveEvent.php | 8 ++++----
.../migrate/src/Event/MigrateRollbackEvent.php | 8 ++++----
.../migrate/src/Event/MigrateRowDeleteEvent.php | 8 ++++----
.../migrate/src/MigrateBuildDependencyInterface.php | 2 +-
core/modules/migrate/src/MigrateException.php | 2 +-
core/modules/migrate/src/MigrateExecutable.php | 6 +++---
.../migrate/src/MigrateExecutableInterface.php | 2 +-
core/modules/migrate/src/MigrationStorage.php | 4 ++--
.../src/Plugin/MigrateDestinationInterface.php | 3 +--
.../src/Plugin/MigrateDestinationPluginManager.php | 1 -
.../migrate/src/Plugin/MigrateIdMapInterface.php | 1 -
.../migrate/src/Plugin/MigratePluginManager.php | 1 -
core/modules/migrate/src/Plugin/Migration.php | 3 +--
.../src/{Entity => Plugin}/MigrationInterface.php | 6 +++---
.../migrate/src/Plugin/MigrationPluginManager.php | 6 +++---
.../src/Plugin/MigrationPluginManagerInterface.php | 2 +-
.../destination/ComponentEntityDisplayBase.php | 2 +-
.../src/Plugin/migrate/destination/Config.php | 4 ++--
.../Plugin/migrate/destination/DestinationBase.php | 6 +++---
.../src/Plugin/migrate/destination/Entity.php | 2 +-
.../Plugin/migrate/destination/EntityContentBase.php | 4 ++--
.../Plugin/migrate/destination/NullDestination.php | 2 +-
.../migrate/src/Plugin/migrate/id_map/Sql.php | 6 +++---
.../src/Plugin/migrate/process/DedupeEntity.php | 2 +-
.../src/Plugin/migrate/process/MenuLinkParent.php | 2 +-
.../migrate/src/Plugin/migrate/process/Migration.php | 4 ++--
.../migrate/src/Plugin/migrate/process/Route.php | 2 +-
.../src/Plugin/migrate/source/EmbeddedDataSource.php | 2 +-
.../src/Plugin/migrate/source/SourcePluginBase.php | 4 ++--
.../migrate/src/Plugin/migrate/source/SqlBase.php | 2 +-
.../migrate/src/Tests/MigrateInterruptionTest.php | 2 +-
.../modules/migrate/src/Tests/MigrateMessageTest.php | 4 ++--
.../modules/migrate/src/Tests/MigrateSkipRowTest.php | 2 +-
core/modules/migrate/src/Tests/MigrateStatusTest.php | 2 +-
core/modules/migrate/src/Tests/MigrateTestBase.php | 8 ++++----
.../Plugin/migrate/destination/DummyDestination.php | 2 +-
.../migrate_prepare_row_test.module | 2 +-
.../src/Unit/MigrateExecutableMemoryExceededTest.php | 2 +-
.../migrate/tests/src/Unit/MigrateExecutableTest.php | 4 ++--
.../migrate/tests/src/Unit/MigrateSourceTest.php | 4 ++--
.../migrate/tests/src/Unit/MigrateSqlIdMapTest.php | 2 +-
.../migrate/tests/src/Unit/MigrateTestCase.php | 6 +++---
.../modules/migrate/tests/src/Unit/MigrationTest.php | 7 ++++---
.../migrate/destination/EntityContentBaseTest.php | 4 ++--
core/modules/migrate/tests/src/Unit/SqlBaseTest.php | 3 ++-
core/modules/migrate/tests/src/Unit/TestSqlIdMap.php | 4 ++--
.../tests/src/Unit/destination/ConfigTest.php | 3 ++-
.../src/Unit/destination/EntityRevisionTest.php | 5 +++--
.../migrate/tests/src/Unit/process/MigrationTest.php | 2 +-
.../migrate_drupal/src/MigrationCreationTrait.php | 2 +-
.../src/Plugin/MigrateCckFieldInterface.php | 12 ++++++------
.../Plugin/migrate/cckfield/CckFieldPluginBase.php | 2 +-
.../migrate/destination/EntityFieldStorageConfig.php | 4 ++--
.../src/Plugin/migrate/source/DrupalSqlBase.php | 2 +-
.../src/Plugin/migrate/source/EmptySource.php | 2 +-
.../src/Plugin/migrate/source/Variable.php | 2 +-
.../src/Plugin/migrate/source/d6/i18nVariable.php | 2 +-
.../src/Form/MigrateUpgradeForm.php | 2 +-
.../migrate_drupal_ui/src/MigrateUpgradeRunBatch.php | 2 +-
.../path/src/Plugin/migrate/destination/UrlAlias.php | 4 ++--
.../src/Tests/Migrate/d6/MigrateSearchPageTest.php | 2 +-
.../src/Tests/Migrate/d7/MigrateSearchPageTest.php | 2 +-
.../Plugin/migrate/destination/ShortcutSetUsers.php | 4 ++--
.../migrate/cckfield/TaxonomyTermReference.php | 2 +-
.../text/src/Plugin/migrate/cckfield/TextField.php | 2 +-
.../text/tests/src/Unit/Migrate/TextFieldTest.php | 4 ++--
.../src/Plugin/migrate/destination/EntityUser.php | 4 ++--
.../user/src/Plugin/migrate/destination/UserData.php | 4 ++--
.../src/Tests/Migrate/d6/MigrateUserConfigsTest.php | 2 +-
.../Tests/Migrate/d6/MigrateUserPictureFileTest.php | 2 +-
.../src/Tests/Migrate/d6/MigrateUserRoleTest.php | 2 +-
.../src/Tests/Migrate/d7/UserMigrationClassTest.php | 2 +-
97 files changed, 156 insertions(+), 157 deletions(-)
rename core/modules/migrate/src/{Entity => Plugin}/MigrationInterface.php (98%)
diff --git a/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php b/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
index 2ff4a3698fbe..48f060d232ed 100644
--- a/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
+++ b/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.
diff --git a/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php b/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php
index dd7980a424bd..ee3305e9c4fe 100644
--- a/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php
+++ b/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;
diff --git a/core/modules/block/src/Plugin/migrate/process/BlockTheme.php b/core/modules/block/src/Plugin/migrate/process/BlockTheme.php
index c072b422cf45..726623e553a8 100644
--- a/core/modules/block/src/Plugin/migrate/process/BlockTheme.php
+++ b/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.
diff --git a/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php b/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php
index be200976ccf2..8f9b89862396 100644
--- a/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php
+++ b/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;
diff --git a/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php b/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php
index 3bd373da9022..57cd8438e148 100644
--- a/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php
+++ b/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;
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
index 4b2d54278aaf..b43da7f3ed15 100644
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
+++ b/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());
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php
index 9d6d47eeb5b9..6379ce336cb8 100644
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php
+++ b/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());
}
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
index c0a12dd61df5..87a23d9c9c71 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
+++ b/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;
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
index 5bec59e2be74..f313fe9087f7 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
+++ b/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;
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
index ce1fec173afc..7c7607e49ca2 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
+++ b/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;
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php b/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php
index 4e4e4560798d..39c5af4dc34c 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php
+++ b/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;
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php b/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
index d9426fd87c65..fe60a5ef8d1f 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
+++ b/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;
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
index e818d70add82..7516804329f2 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
+++ b/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;
/**
diff --git a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
index 89667f117870..32f8fe2fbd94 100644
--- a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
+++ b/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;
diff --git a/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php b/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
index 4270b7971d12..4c8cf11de95a 100644
--- a/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
+++ b/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.
diff --git a/core/modules/file/src/Tests/Migrate/d6/FileMigrationTestTrait.php b/core/modules/file/src/Tests/Migrate/d6/FileMigrationTestTrait.php
index 3665831e0b56..9bb16936c548 100644
--- a/core/modules/file/src/Tests/Migrate/d6/FileMigrationTestTrait.php
+++ b/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 */
diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php
index b98d3a908b3e..07a3b2bbee66 100644
--- a/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php
+++ b/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;
diff --git a/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php b/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php
index 38619942cdc5..edf029d3de69 100644
--- a/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php
+++ b/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;
diff --git a/core/modules/image/src/Tests/Migrate/d6/MigrateImageCacheTest.php b/core/modules/image/src/Tests/Migrate/d6/MigrateImageCacheTest.php
index 3bc441fe89fc..368d0f12556b 100644
--- a/core/modules/image/src/Tests/Migrate/d6/MigrateImageCacheTest.php
+++ b/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;
diff --git a/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php b/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php
index 327cbdaadb00..6f65254ff031 100644
--- a/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php
+++ b/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;
/**
diff --git a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php b/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
index d70567122083..96ef9e398212 100644
--- a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
+++ b/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;
diff --git a/core/modules/migrate/migrate.api.php b/core/modules/migrate/migrate.api.php
index df5c66d80b3b..fa55b7d9a9e1 100644
--- a/core/modules/migrate/migrate.api.php
+++ b/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;
diff --git a/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php b/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php
index e6fe02e01599..b348a1e5205b 100644
--- a/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php
+++ b/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() {
diff --git a/core/modules/migrate/src/Event/MigrateImportEvent.php b/core/modules/migrate/src/Event/MigrateImportEvent.php
index 5dae9bf7c7c1..4a2a1a91cd87 100644
--- a/core/modules/migrate/src/Event/MigrateImportEvent.php
+++ b/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() {
diff --git a/core/modules/migrate/src/Event/MigratePostRowSaveEvent.php b/core/modules/migrate/src/Event/MigratePostRowSaveEvent.php
index 2da91a5f22de..46fdbc98e9d2 100644
--- a/core/modules/migrate/src/Event/MigratePostRowSaveEvent.php
+++ b/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.
diff --git a/core/modules/migrate/src/Event/MigratePreRowSaveEvent.php b/core/modules/migrate/src/Event/MigratePreRowSaveEvent.php
index 9df236392170..4342f86d03b9 100644
--- a/core/modules/migrate/src/Event/MigratePreRowSaveEvent.php
+++ b/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() {
diff --git a/core/modules/migrate/src/Event/MigrateRollbackEvent.php b/core/modules/migrate/src/Event/MigrateRollbackEvent.php
index 1a6ac314b712..671e5a852652 100644
--- a/core/modules/migrate/src/Event/MigrateRollbackEvent.php
+++ b/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() {
diff --git a/core/modules/migrate/src/Event/MigrateRowDeleteEvent.php b/core/modules/migrate/src/Event/MigrateRowDeleteEvent.php
index 7d3766af5b1f..224356b4abc7 100644
--- a/core/modules/migrate/src/Event/MigrateRowDeleteEvent.php
+++ b/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() {
diff --git a/core/modules/migrate/src/MigrateBuildDependencyInterface.php b/core/modules/migrate/src/MigrateBuildDependencyInterface.php
index dbf86940ae8d..c313f99defbc 100644
--- a/core/modules/migrate/src/MigrateBuildDependencyInterface.php
+++ b/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
diff --git a/core/modules/migrate/src/MigrateException.php b/core/modules/migrate/src/MigrateException.php
index 48334bf9be89..e2761cfe36db 100644
--- a/core/modules/migrate/src/MigrateException.php
+++ b/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.
diff --git a/core/modules/migrate/src/MigrateExecutable.php b/core/modules/migrate/src/MigrateExecutable.php
index 7f9b00dce25f..07231a9ffdda 100644
--- a/core/modules/migrate/src/MigrateExecutable.php
+++ b/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.
diff --git a/core/modules/migrate/src/MigrateExecutableInterface.php b/core/modules/migrate/src/MigrateExecutableInterface.php
index 71fa01769466..9a150f39017f 100644
--- a/core/modules/migrate/src/MigrateExecutableInterface.php
+++ b/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 {
diff --git a/core/modules/migrate/src/MigrationStorage.php b/core/modules/migrate/src/MigrationStorage.php
index 36390e046d4f..b22be293bbb0 100644
--- a/core/modules/migrate/src/MigrationStorage.php
+++ b/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();
diff --git a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
index 97c684dd5053..8322678b84e6 100644
--- a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
+++ b/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
diff --git a/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php b/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php
index 383a7de86b20..a7c807c73d80 100644
--- a/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php
+++ b/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.
diff --git a/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php b/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php
index 6a7a9d031ed8..50abca342c1e 100644
--- a/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php
+++ b/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;
diff --git a/core/modules/migrate/src/Plugin/MigratePluginManager.php b/core/modules/migrate/src/Plugin/MigratePluginManager.php
index 6ca1a2472ac6..53ab40598900 100644
--- a/core/modules/migrate/src/Plugin/MigratePluginManager.php
+++ b/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.
diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php
index 93b164d4ba57..20c3a66057f6 100644
--- a/core/modules/migrate/src/Plugin/Migration.php
+++ b/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));
diff --git a/core/modules/migrate/src/Entity/MigrationInterface.php b/core/modules/migrate/src/Plugin/MigrationInterface.php
similarity index 98%
rename from core/modules/migrate/src/Entity/MigrationInterface.php
rename to core/modules/migrate/src/Plugin/MigrationInterface.php
index b35cf29acf86..3efe82b8ae75 100644
--- a/core/modules/migrate/src/Entity/MigrationInterface.php
+++ b/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();
diff --git a/core/modules/migrate/src/Plugin/MigrationPluginManager.php b/core/modules/migrate/src/Plugin/MigrationPluginManager.php
index 71f50a14dbee..9c7dbc1f565a 100644
--- a/core/modules/migrate/src/Plugin/MigrationPluginManager.php
+++ b/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'] = [];
diff --git a/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php b/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
index 111702d8ca5b..bc7841fd5897 100644
--- a/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
+++ b/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
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php b/core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php
index dfd17399d392..00b731fe5e01 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php
+++ b/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;
/**
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Config.php b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
index b3c07c971447..2af93b208294 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Config.php
+++ b/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.
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php
index 0a38ba85ea3d..7bc05b035759 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php
+++ b/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
/**
* The migration.
*
- * @var \Drupal\migrate\Entity\MigrationInterface
+ * @var \Drupal\migrate\Plugin\MigrationInterface
*/
protected $migration;
@@ -56,7 +56,7 @@ abstract class DestinationBase extends PluginBase implements MigrateDestinationI
* The plugin_id for the plugin instance.
* @param mixed $plugin_definition
* The plugin implementation definition.
- * @param MigrationInterface $migration
+ * @param \Drupal\migrate\Plugin\MigrationInterface $migration
* The migration.
*/
public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration) {
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
index f1df40a049c9..c0528b63b2a6 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
@@ -11,7 +11,7 @@
use Drupal\Core\Entity\DependencyTrait;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
index f23b54fee15f..84e324d135cc 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
@@ -13,7 +13,7 @@
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Field\FieldTypePluginManagerInterface;
use Drupal\Core\TypedData\TypedDataInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\MigrateException;
use Drupal\migrate\Plugin\MigrateIdMapInterface;
use Drupal\migrate\Row;
@@ -47,7 +47,7 @@ class EntityContentBase extends Entity {
* 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\Entity\EntityStorageInterface $storage
* The storage for this entity type.
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php b/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php
index f35c5d418d28..3d4166d9d106 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.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;
/**
diff --git a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
index 4a706bf66ab7..7a9173413d3f 100644
--- a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
+++ b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
@@ -11,7 +11,7 @@
use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Plugin\PluginBase;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Event\MigrateIdMapMessageEvent;
use Drupal\migrate\MigrateException;
use Drupal\migrate\MigrateMessageInterface;
@@ -83,7 +83,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
/**
* The migration being done.
*
- * @var \Drupal\migrate\Entity\MigrationInterface
+ * @var \Drupal\migrate\Plugin\MigrationInterface
*/
protected $migration;
@@ -154,7 +154,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
* The plugin ID for the migration process to do.
* @param mixed $plugin_definition
* The configuration for the plugin.
- * @param \Drupal\migrate\Entity\MigrationInterface $migration
+ * @param \Drupal\migrate\Plugin\MigrationInterface $migration
* The migration to do.
*/
public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EventDispatcherInterface $event_dispatcher) {
diff --git a/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php b/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php
index 175e9c933477..f79f0bd26e2a 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
diff --git a/core/modules/migrate/src/Plugin/migrate/process/MenuLinkParent.php b/core/modules/migrate/src/Plugin/migrate/process/MenuLinkParent.php
index b15b32154c1d..e7befec571ae 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/MenuLinkParent.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/MenuLinkParent.php
@@ -11,7 +11,7 @@
use Drupal\Core\Menu\MenuLinkManagerInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Url;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\MigrateExecutableInterface;
use Drupal\migrate\MigrateSkipRowException;
use Drupal\migrate\Plugin\MigrateProcessInterface;
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Migration.php b/core/modules/migrate/src/Plugin/migrate/process/Migration.php
index 437293b3c20c..7dd850a2e7b4 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Migration.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Migration.php
@@ -12,7 +12,7 @@
use Drupal\migrate\Plugin\MigratePluginManager;
use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
use Drupal\migrate\ProcessPluginBase;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\MigrateExecutableInterface;
use Drupal\migrate\Row;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -79,7 +79,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
}
$this->skipOnEmpty($value);
$self = FALSE;
- /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */
+ /** @var \Drupal\migrate\Plugin\MigrationInterface[] $migrations */
$destination_ids = NULL;
$source_id_values = array();
$migrations = $this->migrationPluginManager->createInstances($migration_ids);
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Route.php b/core/modules/migrate/src/Plugin/migrate/process/Route.php
index 6fd6722e765d..3f8fa4648a28 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Route.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Route.php
@@ -9,7 +9,7 @@
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\Core\Path\PathValidatorInterface;
use Drupal\migrate\MigrateExecutableInterface;
use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php b/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php
index 4b429ebbcf0a..2b6e910e8b7b 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php
@@ -6,7 +6,7 @@
*/
namespace Drupal\migrate\Plugin\migrate\source;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
/**
* Source which takes its data directly from the plugin config.
diff --git a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
index d644dc357a4f..3e281fa75130 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
@@ -8,7 +8,7 @@
namespace Drupal\migrate\Plugin\migrate\source;
use Drupal\Core\Plugin\PluginBase;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\MigrateException;
use Drupal\migrate\MigrateSkipRowException;
use Drupal\migrate\Plugin\MigrateIdMapInterface;
@@ -37,7 +37,7 @@ abstract class SourcePluginBase extends PluginBase implements MigrateSourceInter
/**
* The entity migration object.
*
- * @var \Drupal\migrate\Entity\MigrationInterface
+ * @var \Drupal\migrate\Plugin\MigrationInterface
*/
protected $migration;
diff --git a/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
index ef102b67dd90..6837434465ca 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
@@ -10,7 +10,7 @@
use Drupal\Core\Database\Database;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\State\StateInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\migrate\id_map\Sql;
use Drupal\migrate\Plugin\MigrateIdMapInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/migrate/src/Tests/MigrateInterruptionTest.php b/core/modules/migrate/src/Tests/MigrateInterruptionTest.php
index e7341ece7bb0..e65607a134b2 100644
--- a/core/modules/migrate/src/Tests/MigrateInterruptionTest.php
+++ b/core/modules/migrate/src/Tests/MigrateInterruptionTest.php
@@ -10,7 +10,7 @@
use Drupal\migrate\Plugin\Migration;
use Drupal\migrate\Event\MigratePostRowSaveEvent;
use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Event\MigrateEvents;
use Drupal\migrate\MigrateExecutable;
use Drupal\simpletest\KernelTestBase;
diff --git a/core/modules/migrate/src/Tests/MigrateMessageTest.php b/core/modules/migrate/src/Tests/MigrateMessageTest.php
index 5cfb85fb930c..30211e1dc7f3 100644
--- a/core/modules/migrate/src/Tests/MigrateMessageTest.php
+++ b/core/modules/migrate/src/Tests/MigrateMessageTest.php
@@ -8,7 +8,7 @@
namespace Drupal\migrate\Tests;
use Drupal\migrate\Plugin\Migration;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Event\MigrateEvents;
use Drupal\migrate\Event\MigrateIdMapMessageEvent;
use Drupal\migrate\MigrateExecutable;
@@ -32,7 +32,7 @@ class MigrateMessageTest extends KernelTestBase implements MigrateMessageInterfa
/**
* Migration to run.
*
- * @var \Drupal\migrate\Entity\MigrationInterface
+ * @var \Drupal\migrate\Plugin\MigrationInterface
*/
protected $migration;
diff --git a/core/modules/migrate/src/Tests/MigrateSkipRowTest.php b/core/modules/migrate/src/Tests/MigrateSkipRowTest.php
index 9b472b6dec11..1f4461f6b852 100644
--- a/core/modules/migrate/src/Tests/MigrateSkipRowTest.php
+++ b/core/modules/migrate/src/Tests/MigrateSkipRowTest.php
@@ -8,7 +8,7 @@
namespace Drupal\migrate\Tests;
use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate\Plugin\MigrateIdMapInterface;
use Drupal\migrate\Plugin\Migration;
diff --git a/core/modules/migrate/src/Tests/MigrateStatusTest.php b/core/modules/migrate/src/Tests/MigrateStatusTest.php
index dc5910716ee6..19f186e3152d 100644
--- a/core/modules/migrate/src/Tests/MigrateStatusTest.php
+++ b/core/modules/migrate/src/Tests/MigrateStatusTest.php
@@ -8,7 +8,7 @@
namespace Drupal\migrate\Tests;
use Drupal\migrate\Plugin\Migration;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
/**
* Tests migration status tracking.
diff --git a/core/modules/migrate/src/Tests/MigrateTestBase.php b/core/modules/migrate/src/Tests/MigrateTestBase.php
index a54d409e7594..27a095334136 100644
--- a/core/modules/migrate/src/Tests/MigrateTestBase.php
+++ b/core/modules/migrate/src/Tests/MigrateTestBase.php
@@ -39,7 +39,7 @@ abstract class MigrateTestBase extends KernelTestBase implements MigrateMessageI
/**
* The primary migration being tested.
*
- * @var \Drupal\migrate\Entity\MigrationInterface
+ * @var \Drupal\migrate\Plugin\MigrationInterface
*/
protected $migration;
@@ -144,7 +144,7 @@ protected function prepareMigrations(array $id_mappings) {
/**
* Executes a single migration.
*
- * @param string|\Drupal\migrate\Entity\MigrationInterface $migration
+ * @param string|\Drupal\migrate\Plugin\MigrationInterface $migration
* The migration to execute, or its ID.
*/
protected function executeMigration($migration) {
@@ -207,7 +207,7 @@ public function stopCollectingMessages() {
*
* This is done in order to test scenarios which require a failed row.
*
- * @param string|\Drupal\migrate\Entity\MigrationInterface $migration
+ * @param string|\Drupal\migrate\Plugin\MigrationInterface $migration
* The migration entity, or its ID.
* @param array $row
* The raw source row which "failed".
@@ -220,7 +220,7 @@ protected function mockFailure($migration, array $row, $status = MigrateIdMapInt
if (is_string($migration)) {
$migration = $this->getMigration($migration);
}
- /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+ /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
$destination = array_map(function() { return NULL; }, $migration->getDestinationPlugin()->getIds());
$row = new Row($row, $migration->getSourcePlugin()->getIds());
$migration->getIdMap()->saveIdMapping($row, $destination, $status);
diff --git a/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php b/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php
index 984560b25995..8d20eb5f1607 100644
--- a/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php
+++ b/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php
@@ -7,7 +7,7 @@
namespace Drupal\migrate_events_test\Plugin\migrate\destination;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
use Drupal\migrate\Row;
diff --git a/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module b/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module
index 9d9bd0266fce..66f1bd9370f7 100644
--- a/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module
+++ b/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module
@@ -6,7 +6,7 @@
* handling.
*/
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\MigrateSkipRowException;
use Drupal\migrate\Plugin\MigrateSourceInterface;
use Drupal\migrate\Row;
diff --git a/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php b/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php
index d0c160405ef3..cbe62b79c81d 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php
@@ -17,7 +17,7 @@ class MigrateExecutableMemoryExceededTest extends MigrateTestCase {
/**
* The mocked migration entity.
*
- * @var \Drupal\migrate\Entity\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\migrate\Plugin\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $migration;
diff --git a/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php b/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
index 8335e1f7d8d9..bfc0fd0da84b 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
@@ -8,7 +8,7 @@
namespace Drupal\Tests\migrate\Unit;
use Drupal\Component\Utility\Html;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\MigrateIdMapInterface;
use Drupal\migrate\MigrateException;
use Drupal\migrate\Row;
@@ -22,7 +22,7 @@ class MigrateExecutableTest extends MigrateTestCase {
/**
* The mocked migration entity.
*
- * @var \Drupal\migrate\Entity\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Drupal\migrate\Plugin\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $migration;
diff --git a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
index c071b159b360..65edd559b8ab 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
@@ -49,7 +49,7 @@ class MigrateSourceTest extends MigrateTestCase {
/**
* The migration entity.
*
- * @var \Drupal\migrate\Entity\Migration
+ * @var \Drupal\migrate\Plugin\MigrationInterface
*/
protected $migration;
@@ -371,7 +371,7 @@ public function testPrepareRowPrepareException() {
/**
* Gets a mock executable for the test.
*
- * @param \Drupal\migrate\Entity\MigrationInterface $migration
+ * @param \Drupal\migrate\Plugin\MigrationInterface $migration
* The migration entity.
*
* @return \Drupal\migrate\MigrateExecutable
diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
index 48be830adc79..5f576072e799 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
@@ -8,7 +8,7 @@
namespace Drupal\Tests\migrate\Unit;
use Drupal\Core\Database\Driver\sqlite\Connection;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\MigrateException;
use Drupal\migrate\Plugin\MigrateIdMapInterface;
use Drupal\migrate\Row;
diff --git a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
index 90379130b03f..d39fbe3c06fc 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
@@ -9,7 +9,7 @@
use Drupal\Core\Database\Driver\sqlite\Connection;
use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\Tests\UnitTestCase;
/**
@@ -34,14 +34,14 @@ abstract class MigrateTestCase extends UnitTestCase {
/**
* Local store for mocking setStatus()/getStatus().
*
- * @var \Drupal\migrate\Entity\MigrationInterface::STATUS_*
+ * @var \Drupal\migrate\Plugin\MigrationInterface::STATUS_*
*/
protected $migrationStatus = MigrationInterface::STATUS_IDLE;
/**
* Retrieves a mocked migration.
*
- * @return \Drupal\migrate\Entity\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @return \Drupal\migrate\Plugin\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
* The mocked migration.
*/
protected function getMigration() {
diff --git a/core/modules/migrate/tests/src/Unit/MigrationTest.php b/core/modules/migrate/tests/src/Unit/MigrationTest.php
index b338fce2c318..57ff64c9fe37 100644
--- a/core/modules/migrate/tests/src/Unit/MigrationTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrationTest.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\migrate\Unit;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\Migration;
use Drupal\migrate\Exception\RequirementsException;
use Drupal\migrate\Plugin\MigrateDestinationInterface;
@@ -92,9 +93,9 @@ public function testRequirementsForMigrations() {
// completed yet.
$migration->setRequirements(['test_a', 'test_b', 'test_c', 'test_d']);
- $migration_b = $this->getMock('Drupal\migrate\Entity\MigrationInterface');
- $migration_c = $this->getMock('Drupal\migrate\Entity\MigrationInterface');
- $migration_d = $this->getMock('Drupal\migrate\Entity\MigrationInterface');
+ $migration_b = $this->getMock(MigrationInterface::class);
+ $migration_c = $this->getMock(MigrationInterface::class);
+ $migration_d = $this->getMock(MigrationInterface::class);
$migration_b->expects($this->once())
->method('allRowsProcessed')
diff --git a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
index 6d511fafca2a..d08e035abc4a 100644
--- a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
+++ b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
@@ -11,7 +11,7 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Field\FieldTypePluginManagerInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
use Drupal\migrate\Plugin\MigrateIdMapInterface;
use Drupal\migrate\Row;
@@ -26,7 +26,7 @@
class EntityContentBaseTest extends UnitTestCase {
/**
- * @var \Drupal\migrate\Entity\MigrationInterface
+ * @var \Drupal\migrate\Plugin\MigrationInterface
*/
protected $migration;
diff --git a/core/modules/migrate/tests/src/Unit/SqlBaseTest.php b/core/modules/migrate/tests/src/Unit/SqlBaseTest.php
index 936d00f249ea..b7dc5eda5b2a 100644
--- a/core/modules/migrate/tests/src/Unit/SqlBaseTest.php
+++ b/core/modules/migrate/tests/src/Unit/SqlBaseTest.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\migrate\Unit;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\migrate\source\SqlBase;
use Drupal\Tests\UnitTestCase;
@@ -61,7 +62,7 @@ public function testMapJoinable($expected_result, $id_map_is_sql, $with_id_map,
->willReturn($idmap_connection);
// Setup a migration entity.
- $migration = $this->getMock('Drupal\migrate\Entity\MigrationInterface');
+ $migration = $this->getMock(MigrationInterface::class);
$migration->expects($with_id_map ? $this->once() : $this->never())
->method('getIdMap')
->willReturn($id_map_is_sql ? $sql : NULL);
diff --git a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
index de730f4ba87a..309865bb77bc 100644
--- a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
+++ b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
@@ -8,7 +8,7 @@
namespace Drupal\Tests\migrate\Unit;
use Drupal\Core\Database\Connection;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\MigrateException;
use Drupal\migrate\Plugin\migrate\id_map\Sql;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -29,7 +29,7 @@ class TestSqlIdMap extends Sql implements \Iterator {
* The plugin ID for the migration process to do.
* @param mixed $plugin_definition
* The configuration for the plugin.
- * @param \Drupal\migrate\Entity\MigrationInterface $migration
+ * @param \Drupal\migrate\Plugin\MigrationInterface $migration
* The migration to do.
* @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
* The event dispatcher service.
diff --git a/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php b/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
index b3c8b7aa0fec..f990ccbd7690 100644
--- a/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
+++ b/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
@@ -7,6 +7,7 @@
namespace Drupal\Tests\migrate\Unit\destination;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\migrate\destination\Config;
use Drupal\Tests\UnitTestCase;
@@ -73,7 +74,7 @@ public function testLanguageImport() {
$source = array(
'langcode' => 'mi',
);
- $migration = $this->getMockBuilder('Drupal\migrate\Entity\MigrationInterface')
+ $migration = $this->getMockBuilder(MigrationInterface::class)
->disableOriginalConstructor()
->getMock();
$config = $this->getMockBuilder('Drupal\Core\Config\Config')
diff --git a/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php b/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
index ec3d0f2b10b7..f1e288e57055 100644
--- a/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
+++ b/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
@@ -9,6 +9,7 @@
use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Entity\EntityInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\migrate\destination\EntityRevision as RealEntityRevision;
use Drupal\migrate\Row;
use Drupal\Tests\UnitTestCase;
@@ -22,7 +23,7 @@
class EntityRevisionTest extends UnitTestCase {
/**
- * @var \Drupal\migrate\Entity\MigrationInterface
+ * @var \Drupal\migrate\Plugin\MigrationInterface
*/
protected $migration;
@@ -45,7 +46,7 @@ protected function setUp() {
parent::setUp();
// Setup mocks to be used when creating a revision destination.
- $this->migration = $this->prophesize('\Drupal\migrate\Entity\MigrationInterface');
+ $this->migration = $this->prophesize(MigrationInterface::class);
$this->storage = $this->prophesize('\Drupal\Core\Entity\EntityStorageInterface');
$this->entityManager = $this->prophesize('\Drupal\Core\Entity\EntityManagerInterface');
$this->fieldTypeManager = $this->prophesize('\Drupal\Core\Field\FieldTypePluginManagerInterface');
diff --git a/core/modules/migrate/tests/src/Unit/process/MigrationTest.php b/core/modules/migrate/tests/src/Unit/process/MigrationTest.php
index b3a15f613773..76d55182e302 100644
--- a/core/modules/migrate/tests/src/Unit/process/MigrationTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/MigrationTest.php
@@ -8,7 +8,7 @@
namespace Drupal\Tests\migrate\Unit\process;
use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\migrate\process\Migration;
use Drupal\migrate\Plugin\MigrateDestinationInterface;
use Drupal\migrate\Plugin\MigrateIdMapInterface;
diff --git a/core/modules/migrate_drupal/src/MigrationCreationTrait.php b/core/modules/migrate_drupal/src/MigrationCreationTrait.php
index 68120e8b0b93..8528ae72d1cd 100644
--- a/core/modules/migrate_drupal/src/MigrationCreationTrait.php
+++ b/core/modules/migrate_drupal/src/MigrationCreationTrait.php
@@ -94,7 +94,7 @@ protected function createDatabaseStateSettings(array $database, $drupal_version)
* @param int $drupal_version
* The version of Drupal we're getting the migrations for.
*
- * @return \Drupal\migrate\Entity\MigrationInterface[]
+ * @return \Drupal\migrate\Plugin\MigrationInterface[]
* The migrations for import.
*/
protected function getMigrations($database_state_key, $drupal_version) {
diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
index dbe499d9064a..b69c422e3eac 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
@@ -8,7 +8,7 @@
namespace Drupal\migrate_drupal\Plugin;
use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
/**
@@ -19,7 +19,7 @@ interface MigrateCckFieldInterface extends PluginInspectionInterface {
/**
* Apply any custom processing to the field migration.
*
- * @param \Drupal\migrate\Entity\MigrationInterface $migration
+ * @param \Drupal\migrate\Plugin\MigrationInterface $migration
* The migration entity.
*/
public function processField(MigrationInterface $migration);
@@ -27,7 +27,7 @@ public function processField(MigrationInterface $migration);
/**
* Apply any custom processing to the field instance migration.
*
- * @param \Drupal\migrate\Entity\MigrationInterface $migration
+ * @param \Drupal\migrate\Plugin\MigrationInterface $migration
* The migration entity.
*/
public function processFieldInstance(MigrationInterface $migration);
@@ -35,7 +35,7 @@ public function processFieldInstance(MigrationInterface $migration);
/**
* Apply any custom processing to the field widget migration.
*
- * @param \Drupal\migrate\Entity\MigrationInterface $migration
+ * @param \Drupal\migrate\Plugin\MigrationInterface $migration
* The migration entity.
*/
public function processFieldWidget(MigrationInterface $migration);
@@ -43,7 +43,7 @@ public function processFieldWidget(MigrationInterface $migration);
/**
* Apply any custom processing to the field formatter migration.
*
- * @param \Drupal\migrate\Entity\MigrationInterface $migration
+ * @param \Drupal\migrate\Plugin\MigrationInterface $migration
* The migration entity.
*/
public function processFieldFormatter(MigrationInterface $migration);
@@ -69,7 +69,7 @@ public function getFieldWidgetMap();
/**
* Apply any custom processing to the cck bundle migrations.
*
- * @param \Drupal\migrate\Entity\MigrationInterface $migration
+ * @param \Drupal\migrate\Plugin\MigrationInterface $migration
* The migration entity.
* @param string $field_name
* The field name we're processing the value for.
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
index 7667c7f57ff9..587f78991c0e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
@@ -8,7 +8,7 @@
namespace Drupal\migrate_drupal\Plugin\migrate\cckfield;
use Drupal\Core\Plugin\PluginBase;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
use Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
index b25bff25993e..6c3f6c43aa6b 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
@@ -10,7 +10,7 @@
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Field\FieldTypePluginManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\migrate\destination\EntityFieldStorageConfig as BaseEntityFieldStorageConfig;
/**
@@ -38,7 +38,7 @@ class EntityFieldStorageConfig extends BaseEntityFieldStorageConfig {
* 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.
* @param EntityStorageInterface $storage
* The storage for this entity type.
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
index bb7f452e3c7d..75dd5d49e7e7 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -12,7 +12,7 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\State\StateInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Exception\RequirementsException;
use Drupal\migrate\Plugin\migrate\source\SqlBase;
use Drupal\migrate\Plugin\RequirementsInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
index 60a884323293..33f73ed5b685 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
@@ -10,7 +10,7 @@
use Drupal\Component\Plugin\DependentPluginInterface;
use Drupal\Core\Entity\DependencyTrait;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Plugin\migrate\source\EmptySource as BaseEmptySource;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
index 427384683c59..1c2ee2b45acb 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\State\StateInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
/**
* Drupal variable source from database.
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
index ca5184063f80..ec6cc28950d5 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
@@ -9,7 +9,7 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\State\StateInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
/**
diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
index 97d11221376e..e6365f56b679 100644
--- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -928,7 +928,7 @@ public function validateCredentialForm(array &$form, FormStateInterface $form_st
// from state.
$definitions = $this->pluginManager->getDefinitions();
foreach ($definitions as $id => $definition) {
- /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+ /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
$migration = $this->pluginManager->createInstance($id);
$is_drupal_migration = FALSE;
foreach ($migration->get('migration_tags') as $migration_tag) {
diff --git a/core/modules/migrate_drupal_ui/src/MigrateUpgradeRunBatch.php b/core/modules/migrate_drupal_ui/src/MigrateUpgradeRunBatch.php
index 46bb33c27aa2..3c30eac26553 100644
--- a/core/modules/migrate_drupal_ui/src/MigrateUpgradeRunBatch.php
+++ b/core/modules/migrate_drupal_ui/src/MigrateUpgradeRunBatch.php
@@ -9,7 +9,7 @@
use Drupal\Core\Link;
use Drupal\Core\Url;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Event\MigrateEvents;
use Drupal\migrate\Event\MigrateIdMapMessageEvent;
use Drupal\migrate\Event\MigrateMapDeleteEvent;
diff --git a/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php b/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
index 7efe155236b9..c617c55d6c72 100644
--- a/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
+++ b/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
@@ -8,7 +8,7 @@
namespace Drupal\path\Plugin\migrate\destination;
use Drupal\Core\Path\AliasStorage;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -37,7 +37,7 @@ class UrlAlias extends DestinationBase implements ContainerFactoryPluginInterfac
* 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.
* @param \Drupal\Core\Path\AliasStorage $alias_storage
* The alias storage service.
diff --git a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
index 9f206b0f403c..8dc2b9c15435 100644
--- a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
+++ b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
@@ -57,7 +57,7 @@ public function testSearchPage() {
->condition('name', 'node_rank_comments')
->execute();
- /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+ /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
$migration = $this->getMigration('search_page');
// Indicate we're rerunning a migration that's already run.
$migration->getIdMap()->prepareUpdate();
diff --git a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchPageTest.php b/core/modules/search/src/Tests/Migrate/d7/MigrateSearchPageTest.php
index 9dada8dc0094..f333b4820c05 100644
--- a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchPageTest.php
+++ b/core/modules/search/src/Tests/Migrate/d7/MigrateSearchPageTest.php
@@ -59,7 +59,7 @@ public function testSearchPage() {
->condition('name', 'node_rank_comments')
->execute();
- /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+ /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
$migration = $this->getMigration('search_page');
// Indicate we're rerunning a migration that's already run.
$migration->getIdMap()->prepareUpdate();
diff --git a/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php b/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php
index 10d9bf266d6f..8d57b42c8c15 100644
--- a/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php
+++ b/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php
@@ -9,7 +9,7 @@
use Drupal\shortcut\ShortcutSetStorageInterface;
use Drupal\user\Entity\User;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -38,7 +38,7 @@ class ShortcutSetUsers extends DestinationBase implements ContainerFactoryPlugin
* 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.
* @param \Drupal\shortcut\ShortcutSetStorageInterface $shortcut_set_storage
* The shortcut_set entity storage handler.
diff --git a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
index d6de1eca0123..098cc2c63f7f 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
@@ -7,7 +7,7 @@
namespace Drupal\taxonomy\Plugin\migrate\cckfield;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
/**
diff --git a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
index a386b5ffe566..080757eb9825 100644
--- a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
+++ b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
@@ -7,7 +7,7 @@
namespace Drupal\text\Plugin\migrate\cckfield;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
diff --git a/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php b/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php
index 78060d681034..38ee0d1e2711 100644
--- a/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php
+++ b/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php
@@ -7,7 +7,7 @@
namespace Drupal\Tests\text\Unit\Migrate;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
use Drupal\Tests\UnitTestCase;
use Drupal\text\Plugin\migrate\cckfield\TextField;
@@ -25,7 +25,7 @@ class TextFieldTest extends UnitTestCase {
protected $plugin;
/**
- * @var \Drupal\migrate\Entity\MigrationInterface
+ * @var \Drupal\migrate\Plugin\MigrationInterface
*/
protected $migration;
diff --git a/core/modules/user/src/Plugin/migrate/destination/EntityUser.php b/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
index 15a792273cf1..e85d5cd855e3 100644
--- a/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
+++ b/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
@@ -13,7 +13,7 @@
use Drupal\Core\Field\FieldTypePluginManagerInterface;
use Drupal\Core\Field\Plugin\Field\FieldType\EmailItem;
use Drupal\Core\Password\PasswordInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\MigrateException;
use Drupal\user\MigratePassword;
use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
@@ -43,7 +43,7 @@ class EntityUser extends EntityContentBase {
* 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.
* @param EntityStorageInterface $storage
* The storage for this entity type.
diff --git a/core/modules/user/src/Plugin/migrate/destination/UserData.php b/core/modules/user/src/Plugin/migrate/destination/UserData.php
index 5ae639fcc957..6f968b804e0a 100644
--- a/core/modules/user/src/Plugin/migrate/destination/UserData.php
+++ b/core/modules/user/src/Plugin/migrate/destination/UserData.php
@@ -7,7 +7,7 @@
namespace Drupal\user\Plugin\migrate\destination;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\user\UserData as UserDataStorage;
use Drupal\migrate\Row;
use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
@@ -35,7 +35,7 @@ class UserData extends DestinationBase implements ContainerFactoryPluginInterfac
* 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.
* @param \Drupal\user\UserData $user_data
* The user data service.
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php
index 4e4cb4b4925b..3dee8c508683 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php
@@ -81,7 +81,7 @@ public function testUserSettings() {
->condition('name', 'user_register')
->execute();
- /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+ /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
$migration = $this->getMigration('d6_user_settings');
// Indicate we're rerunning a migration that's already run.
$migration->getIdMap()->prepareUpdate();
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
index e1b3b7316bd9..5b338ec41a91 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
@@ -25,7 +25,7 @@ protected function setUp() {
$this->installEntitySchema('file');
- /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+ /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
$migration = $this->getMigration('d6_user_picture_file');
$source = $migration->get('source');
$source['site_path'] = 'core/modules/simpletest';
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php
index c266b14ac19a..e583d04d947c 100644
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php
+++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php
@@ -29,7 +29,7 @@ protected function setUp() {
* Tests user role migration.
*/
public function testUserRole() {
- /** @var \Drupal\migrate\entity\Migration $migration */
+ /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
$id_map = $this->getMigration('d6_user_role')->getIdMap();
$rid = 'anonymous';
$anonymous = Role::load($rid);
diff --git a/core/modules/user/src/Tests/Migrate/d7/UserMigrationClassTest.php b/core/modules/user/src/Tests/Migrate/d7/UserMigrationClassTest.php
index a8046380977c..393f40602f31 100644
--- a/core/modules/user/src/Tests/Migrate/d7/UserMigrationClassTest.php
+++ b/core/modules/user/src/Tests/Migrate/d7/UserMigrationClassTest.php
@@ -24,7 +24,7 @@ class UserMigrationClassTest extends MigrateDrupal7TestBase {
*/
public function testClass() {
$migration = $this->getMigration('d7_user');
- /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */
+ /** @var \Drupal\migrate\Plugin\MigrationInterface[] $migrations */
$this->assertIdentical('d7_user', $migration->id());
$process = $migration->getProcess();
$this->assertIdentical('field_file', $process['field_file'][0]['source']);
--
GitLab