diff --git a/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php b/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php index 2ff4a36..f1fede6 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\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\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 dd7980a..4ddcea1 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\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 c072b42..45bbc30 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\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\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 be20097..25114b1 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\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 3bd373d..e78ca6b 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\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 4b2d542..d00f93b 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\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 9d6d47e..79cfb57 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\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 c0a12dd..eeed31a 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\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 5bec59e..245e101 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\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 ce1fec1..343d8a3 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\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 4e4e456..1321e95 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\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 d9426fd..9de9c95 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\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 e818d70..68693a6 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\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 89667f1..b9387c1 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\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 4270b79..ae51842 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\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\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 3665831..76b6d4f 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\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 b98d3a9..c1f84ef 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\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 3861994..abb7580 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\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 3bc441f..14c160c 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\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 327cbda..c0ad4a0 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\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 d705671..1fe1d72 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\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 df5c66d..83365be 100644 --- a/core/modules/migrate/migrate.api.php +++ b/core/modules/migrate/migrate.api.php @@ -77,7 +77,7 @@ * The definition of how to migrate each type of data is stored in configuration * entities. The migration configuration entity class is * \Drupal\migrate\Entity\Migration, with interface - * \Drupal\migrate\Entity\MigrationInterface; the configuration schema can be + * \Drupal\migrate\MigrationInterface; the configuration schema can be * found in the migrate.schema.yml file. Migration configuration consists of IDs * and configuration for the source, process, and destination plugins, as well * as information on dependencies. Process configuration consists of sections, diff --git a/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php b/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php index e6fe02e..ae4ccb6 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\MigrationInterface; use Symfony\Component\EventDispatcher\Event; /** @@ -18,7 +18,7 @@ class MigrateIdMapMessageEvent extends Event { /** * Migration entity. * - * @var \Drupal\migrate\Entity\MigrationInterface + * @var \Drupal\migrate\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\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\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 5dae9bf..44015b9 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\MigrationInterface; use Symfony\Component\EventDispatcher\Event; /** @@ -18,14 +18,14 @@ class MigrateImportEvent extends Event { /** * Migration entity. * - * @var \Drupal\migrate\Entity\MigrationInterface + * @var \Drupal\migrate\MigrationInterface */ protected $migration; /** * Constructs an import event object. * - * @param \Drupal\migrate\Entity\MigrationInterface $migration + * @param \Drupal\migrate\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\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 2da91a5..9731a85 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\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\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 9df2363..dbf780e 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\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\MigrationInterface */ protected $migration; /** * Constructs a pre-save event object. * - * @param \Drupal\migrate\Entity\MigrationInterface $migration + * @param \Drupal\migrate\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\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 1a6ac31..409e7f1 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\MigrationInterface; use Symfony\Component\EventDispatcher\Event; /** @@ -18,14 +18,14 @@ class MigrateRollbackEvent extends Event { /** * Migration entity. * - * @var \Drupal\migrate\Entity\MigrationInterface + * @var \Drupal\migrate\MigrationInterface */ protected $migration; /** * Constructs an rollback event object. * - * @param \Drupal\migrate\Entity\MigrationInterface $migration + * @param \Drupal\migrate\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\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 7d3766a..fa60c2c 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\MigrationInterface; use Symfony\Component\EventDispatcher\Event; /** @@ -18,7 +18,7 @@ class MigrateRowDeleteEvent extends Event { /** * Migration entity. * - * @var \Drupal\migrate\Entity\MigrationInterface + * @var \Drupal\migrate\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\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\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 dbf8694..a1d9cab 100644 --- a/core/modules/migrate/src/MigrateBuildDependencyInterface.php +++ b/core/modules/migrate/src/MigrateBuildDependencyInterface.php @@ -12,7 +12,7 @@ /** * Builds a dependency tree for the migrations and set their order. * - * @param \Drupal\migrate\Entity\MigrationInterface[] $migrations + * @param \Drupal\migrate\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 48334bf..ce97a38 100644 --- a/core/modules/migrate/src/MigrateException.php +++ b/core/modules/migrate/src/MigrateException.php @@ -7,7 +7,6 @@ namespace Drupal\migrate; -use Drupal\migrate\Entity\MigrationInterface; use Drupal\migrate\Plugin\MigrateIdMapInterface; /** diff --git a/core/modules/migrate/src/MigrateExecutable.php b/core/modules/migrate/src/MigrateExecutable.php index 7f9b00d..30638e3 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; @@ -29,7 +28,7 @@ class MigrateExecutable implements MigrateExecutableInterface { /** * The configuration of the migration to do. * - * @var \Drupal\migrate\Entity\MigrationInterface + * @var \Drupal\migrate\MigrationInterface */ protected $migration; @@ -102,7 +101,7 @@ class MigrateExecutable implements MigrateExecutableInterface { /** * Constructs a MigrateExecutable and verifies and sets the memory limit. * - * @param \Drupal\migrate\Entity\MigrationInterface $migration + * @param \Drupal\migrate\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 71fa017..8bf9be1 100644 --- a/core/modules/migrate/src/MigrateExecutableInterface.php +++ b/core/modules/migrate/src/MigrateExecutableInterface.php @@ -7,8 +7,6 @@ namespace Drupal\migrate; -use Drupal\migrate\Entity\MigrationInterface; - interface MigrateExecutableInterface { /** diff --git a/core/modules/migrate/src/MigrationBuilder.php b/core/modules/migrate/src/MigrationBuilder.php index 1123b8d..9b232fc 100644 --- a/core/modules/migrate/src/MigrationBuilder.php +++ b/core/modules/migrate/src/MigrationBuilder.php @@ -35,7 +35,7 @@ public function __construct(MigratePluginManager $builder_manager) { * {@inheritdoc} */ public function createMigrations(array $templates) { - /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */ + /** @var \Drupal\migrate\MigrationInterface[] $migrations */ $migrations = []; foreach ($templates as $template_id => $template) { @@ -48,7 +48,7 @@ public function createMigrations(array $templates) { $variants = array(Migration::create($template)); } - /** @var \Drupal\migrate\Entity\MigrationInterface[] $variants */ + /** @var \Drupal\migrate\MigrationInterface[] $variants */ foreach ($variants as $variant) { $variant->set('template', $template_id); } diff --git a/core/modules/migrate/src/MigrationBuilderInterface.php b/core/modules/migrate/src/MigrationBuilderInterface.php index 66f3078..3c835db 100644 --- a/core/modules/migrate/src/MigrationBuilderInterface.php +++ b/core/modules/migrate/src/MigrationBuilderInterface.php @@ -19,7 +19,7 @@ * The parsed templates (each of which is an array parsed from YAML), keyed * by ID. * - * @return \Drupal\migrate\Entity\MigrationInterface[] + * @return \Drupal\migrate\MigrationInterface[] * The migration entities derived from the templates. */ public function createMigrations(array $templates); diff --git a/core/modules/migrate/src/Entity/MigrationInterface.php b/core/modules/migrate/src/MigrationInterface.php similarity index 98% rename from core/modules/migrate/src/Entity/MigrationInterface.php rename to core/modules/migrate/src/MigrationInterface.php index b35cf29..a1a9a95 100644 --- a/core/modules/migrate/src/Entity/MigrationInterface.php +++ b/core/modules/migrate/src/MigrationInterface.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\migrate\Entity\MigrationInterface. + * Contains \Drupal\migrate\MigrationInterface. */ -namespace Drupal\migrate\Entity; +namespace Drupal\migrate; use Drupal\Component\Plugin\DerivativeInspectionInterface; use Drupal\Component\Plugin\PluginInspectionInterface; @@ -106,7 +106,7 @@ * @return string * The plugin_id of the plugin instance. * - * @see \Drupal\migrate\Entity\MigrationInterface::getPluginId() + * @see \Drupal\migrate\MigrationInterface::getPluginId() */ public function id(); diff --git a/core/modules/migrate/src/MigrationStorage.php b/core/modules/migrate/src/MigrationStorage.php index 36390e0..ccd9dad 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\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\MigrationInterface $migration */ $id = $migration->id(); $requirements[$id] = array(); $dependency_graph[$id]['edges'] = array(); diff --git a/core/modules/migrate/src/Plugin/MigrateBuilderInterface.php b/core/modules/migrate/src/Plugin/MigrateBuilderInterface.php index 511af1b..f299529 100644 --- a/core/modules/migrate/src/Plugin/MigrateBuilderInterface.php +++ b/core/modules/migrate/src/Plugin/MigrateBuilderInterface.php @@ -23,7 +23,7 @@ * @param array $template * The parsed template. * - * @return \Drupal\migrate\Entity\MigrationInterface[] + * @return \Drupal\migrate\MigrationInterface[] * The unsaved migrations generated from the template. */ public function buildMigrations(array $template); diff --git a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php index 97c684d..757e12c 100644 --- a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php +++ b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php @@ -8,7 +8,7 @@ namespace Drupal\migrate\Plugin; use Drupal\Component\Plugin\PluginInspectionInterface; -use Drupal\migrate\Entity\MigrationInterface; +use Drupal\migrate\MigrationInterface; use Drupal\migrate\Row; /** @@ -48,7 +48,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\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 383a7de..8074230 100644 --- a/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php +++ b/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php @@ -10,7 +10,7 @@ use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; -use Drupal\migrate\Entity\MigrationInterface; +use Drupal\migrate\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 6a7a9d0..36e5405 100644 --- a/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php +++ b/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php @@ -8,7 +8,7 @@ namespace Drupal\migrate\Plugin; use Drupal\Component\Plugin\PluginInspectionInterface; -use Drupal\migrate\Entity\MigrationInterface; +use Drupal\migrate\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 6ca1a24..8481dce 100644 --- a/core/modules/migrate/src/Plugin/MigratePluginManager.php +++ b/core/modules/migrate/src/Plugin/MigratePluginManager.php @@ -11,7 +11,7 @@ use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Plugin\DefaultPluginManager; -use Drupal\migrate\Entity\MigrationInterface; +use Drupal\migrate\MigrationInterface; /** * Manages migrate plugins. diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php index 93b164d..3886f13 100644 --- a/core/modules/migrate/src/Plugin/Migration.php +++ b/core/modules/migrate/src/Plugin/Migration.php @@ -12,7 +12,7 @@ use Drupal\migrate\MigrateException; use Drupal\migrate\MigrateSkipRowException; use Drupal\Component\Utility\NestedArray; -use Drupal\migrate\Entity\MigrationInterface; +use Drupal\migrate\MigrationInterface; /** * Defines the Migration plugin. @@ -413,7 +413,7 @@ public function checkRequirements() { // There are no requirements to check. return; } - /** @var \Drupal\migrate\Entity\MigrationInterface[] $required_migrations */ + /** @var \Drupal\migrate\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/Plugin/MigrationPluginManager.php b/core/modules/migrate/src/Plugin/MigrationPluginManager.php index 71f50a1..822b4f3 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\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\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\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 111702d..8fd64e9 100644 --- a/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php +++ b/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php @@ -25,7 +25,7 @@ * An array of configuration relevant to the plugin instances. Keyed by the * plugin ID. * - * @return \Drupal\migrate\Entity\MigrationInterface[] + * @return \Drupal\migrate\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 dfd1739..f34d048 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\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 b3c07c9..6b39cd9 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\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\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 0a38ba8..d85fca9 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\MigrationInterface; use Drupal\migrate\Exception\RequirementsException; use Drupal\migrate\Plugin\MigrateDestinationInterface; use Drupal\migrate\Plugin\MigrateIdMapInterface; @@ -43,7 +43,7 @@ /** * The migration. * - * @var \Drupal\migrate\Entity\MigrationInterface + * @var \Drupal\migrate\MigrationInterface */ protected $migration; @@ -56,7 +56,7 @@ * The plugin_id for the plugin instance. * @param mixed $plugin_definition * The plugin implementation definition. - * @param MigrationInterface $migration + * @param \Drupal\migrate\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 f1df40a..80f3e1e 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\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 f23b54f..a167bb0 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\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\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 f35c5d4..f0e3004 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\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 4a706bf..4675d79 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\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\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\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 175e9c9..018701c 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\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 b15b321..50804b6 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\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 437293b..b337fa2 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\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\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 6fd6722..11baa9e 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\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 4b429eb..0b48bd8 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\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 d644dc3..d567d16 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\MigrationInterface; use Drupal\migrate\MigrateException; use Drupal\migrate\MigrateSkipRowException; use Drupal\migrate\Plugin\MigrateIdMapInterface; @@ -37,7 +37,7 @@ /** * The entity migration object. * - * @var \Drupal\migrate\Entity\MigrationInterface + * @var \Drupal\migrate\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 ef102b6..4493210 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\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 e7341ec..2aae320 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\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 5cfb85f..178f51e 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\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\MigrationInterface */ protected $migration; diff --git a/core/modules/migrate/src/Tests/MigrateSkipRowTest.php b/core/modules/migrate/src/Tests/MigrateSkipRowTest.php index 9b472b6..571ad48 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\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 dc59107..c9ce005 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\MigrationInterface; /** * Tests migration status tracking. diff --git a/core/modules/migrate/src/Tests/MigrateTestBase.php b/core/modules/migrate/src/Tests/MigrateTestBase.php index a54d409..f1127f3 100644 --- a/core/modules/migrate/src/Tests/MigrateTestBase.php +++ b/core/modules/migrate/src/Tests/MigrateTestBase.php @@ -39,7 +39,7 @@ /** * The primary migration being tested. * - * @var \Drupal\migrate\Entity\MigrationInterface + * @var \Drupal\migrate\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\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\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\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 984560b..58dc9bd 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\MigrationInterface; use Drupal\migrate\Plugin\migrate\destination\DestinationBase; 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 d0c1604..42ae3d5 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\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 8335e1f..1fc8c15 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\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\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 c071b15..8dbaf01 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\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\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 48be830..21f8409 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\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 9037913..718633d 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\MigrationInterface; use Drupal\Tests\UnitTestCase; /** @@ -34,14 +34,14 @@ /** * Local store for mocking setStatus()/getStatus(). * - * @var \Drupal\migrate\Entity\MigrationInterface::STATUS_* + * @var \Drupal\migrate\MigrationInterface::STATUS_* */ protected $migrationStatus = MigrationInterface::STATUS_IDLE; /** * Retrieves a mocked migration. * - * @return \Drupal\migrate\Entity\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject + * @return \Drupal\migrate\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 b338fce..01c4670 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\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 6d511fa..73c6322 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\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\MigrationInterface */ protected $migration; diff --git a/core/modules/migrate/tests/src/Unit/SqlBaseTest.php b/core/modules/migrate/tests/src/Unit/SqlBaseTest.php index 936d00f..213c4d5 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\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 de730f4..322d87b 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\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\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 b3c8b7a..50dad40 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\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 ec3d0f2..3ea7a8f 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\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\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 b3a15f6..529fe4c 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\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 68120e8..c7c2112 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\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 dbe499d..11332ef 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\MigrationInterface; use Drupal\migrate\Row; /** @@ -19,7 +19,7 @@ /** * Apply any custom processing to the field migration. * - * @param \Drupal\migrate\Entity\MigrationInterface $migration + * @param \Drupal\migrate\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\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\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\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\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/builder/CckBuilder.php b/core/modules/migrate_drupal/src/Plugin/migrate/builder/CckBuilder.php index 50b1fcd..e3f4365 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/builder/CckBuilder.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/builder/CckBuilder.php @@ -8,7 +8,7 @@ namespace Drupal\migrate_drupal\Plugin\migrate\builder; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\migrate\Entity\MigrationInterface; +use Drupal\migrate\MigrationInterface; use Drupal\migrate\Plugin\migrate\builder\BuilderBase; use Drupal\migrate\Plugin\MigratePluginManager; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -66,7 +66,7 @@ public static function create(ContainerInterface $container, array $configuratio * * @param string $field_type * The field type (plugin ID). - * @param \Drupal\migrate\Entity\MigrationInterface|NULL $migration + * @param \Drupal\migrate\MigrationInterface|NULL $migration * The migration, if any. * * @return \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface 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 7667c7f..2325e63 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\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 b25bff2..06d42bf 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\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\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 bb7f452..c8f1070 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\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 60a8843..65ebcf6 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\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 4273846..fa8d3e8 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\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 ca51840..24b3bed 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\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 97d1122..17ab516 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\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 46bb33c..e22f108 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\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 7efe155..50f1138 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\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\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 9f206b0..bda4123 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\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 9dada8d..6f81a44 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\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 10d9bf2..1f0c2d8 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\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\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 d6de1ec..a7bbb49 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\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 a386b5f..1632d43 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\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 78060d6..9db7d37 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\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\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 15a7922..60159df 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\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\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 5ae639f..29da198 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\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\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 4e4cb4b..92633e4 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\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 e1b3b73..273ad7a 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\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 c266b14..4d7054c 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\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 a804638..b54bc6f 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\MigrationInterface[] $migrations */ $this->assertIdentical('d7_user', $migration->id()); $process = $migration->getProcess(); $this->assertIdentical('field_file', $process['field_file'][0]['source']);