diff --git a/core/modules/migrate/src/Entity/Migration.php b/core/modules/migrate/src/Entity/Migration.php index 54b90c3..5e0cb9b 100644 --- a/core/modules/migrate/src/Entity/Migration.php +++ b/core/modules/migrate/src/Entity/Migration.php @@ -478,15 +478,15 @@ public function setTrackLastImported($track_last_imported) { * {@inheritdoc} */ public function getMigrationDependencies() { - return $this->migration_dependencies + array('required' => [], 'optional' => []); + return $this->migration_dependencies + ['required' => [], 'optional' => []]; } /** * {@inheritdoc} */ public function trustData() { - // Migrations cannot be trusted since they are often write by hand or as the - // result of a copy/paste. + // Migrations cannot be trusted since they are often written by hand and not + // through a UI. $this->trustedData = FALSE; return $this; } diff --git a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php index 50f2a9b..1842b93 100644 --- a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php +++ b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php @@ -7,6 +7,7 @@ namespace Drupal\migrate\Plugin; +use Drupal\Component\Plugin\DependentPluginInterface; use Drupal\Component\Plugin\PluginInspectionInterface; use Drupal\migrate\Entity\MigrationInterface; use Drupal\migrate\Row; @@ -22,7 +23,7 @@ * * @ingroup migration */ -interface MigrateDestinationInterface extends PluginInspectionInterface { +interface MigrateDestinationInterface extends PluginInspectionInterface, DependentPluginInterface { /** * Get the destination ids. diff --git a/core/modules/migrate/src/Plugin/MigrateSourceInterface.php b/core/modules/migrate/src/Plugin/MigrateSourceInterface.php index 7154d27..0321ea9 100644 --- a/core/modules/migrate/src/Plugin/MigrateSourceInterface.php +++ b/core/modules/migrate/src/Plugin/MigrateSourceInterface.php @@ -6,6 +6,7 @@ */ namespace Drupal\migrate\Plugin; + use Drupal\Component\Plugin\DependentPluginInterface; use Drupal\Component\Plugin\PluginInspectionInterface; use Drupal\migrate\Row; @@ -20,7 +21,7 @@ * * @ingroup migration */ -interface MigrateSourceInterface extends \Countable, \Iterator, PluginInspectionInterface { +interface MigrateSourceInterface extends \Countable, \Iterator, PluginInspectionInterface, DependentPluginInterface { /** * Returns available fields on the source. diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Config.php b/core/modules/migrate/src/Plugin/migrate/destination/Config.php index 99ba651..9af5531 100644 --- a/core/modules/migrate/src/Plugin/migrate/destination/Config.php +++ b/core/modules/migrate/src/Plugin/migrate/destination/Config.php @@ -108,7 +108,7 @@ public function getIds() { * {@inheritdoc} */ public function calculateDependencies() { - list($provider,) = explode('.', $this->config->getName(), 2); + $provider = explode('.', $this->config->getName(), 2)[0]; $this->addDependency('module', $provider); return $this->dependencies; } diff --git a/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php index c45cf18..192740b 100644 --- a/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php +++ b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php @@ -8,7 +8,6 @@ namespace Drupal\migrate\Plugin\migrate\destination; -use Drupal\Component\Plugin\DependentPluginInterface; use Drupal\Core\Entity\DependencyTrait; use Drupal\Core\Plugin\PluginBase; use Drupal\migrate\Entity\MigrationInterface; @@ -26,7 +25,7 @@ * * @ingroup migration */ -abstract class DestinationBase extends PluginBase implements MigrateDestinationInterface, RequirementsInterface, DependentPluginInterface { +abstract class DestinationBase extends PluginBase implements MigrateDestinationInterface, RequirementsInterface { use DependencyTrait; diff --git a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php index 62816af..8f85a77 100644 --- a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php +++ b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php @@ -7,7 +7,6 @@ namespace Drupal\migrate\Plugin\migrate\source; -use Drupal\Component\Plugin\DependentPluginInterface; use Drupal\Core\Entity\DependencyTrait; use Drupal\Core\Plugin\PluginBase; use Drupal\migrate\Entity\MigrationInterface; @@ -26,7 +25,7 @@ * * @ingroup migration */ -abstract class SourcePluginBase extends PluginBase implements MigrateSourceInterface, DependentPluginInterface { +abstract class SourcePluginBase extends PluginBase implements MigrateSourceInterface { use DependencyTrait;