diff -u b/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php --- b/core/modules/migrate/src/Plugin/Migration.php +++ b/core/modules/migrate/src/Plugin/Migration.php @@ -2,13 +2,13 @@ namespace Drupal\migrate\Plugin; -use Drupal\Component\Plugin\ConfigurablePluginInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Plugin\PluginBase; use Drupal\migrate\Exception\RequirementsException; use Drupal\migrate\MigrateException; use Drupal\migrate\MigrateSkipRowException; use Drupal\Component\Utility\NestedArray; +use Drupal\migrate\Plugin\migrate\ConfigurablePluginInterface; use Drupal\migrate\Plugin\migrate\ConfigurablePluginTrait; use Symfony\Component\DependencyInjection\ContainerInterface; diff -u b/core/modules/migrate/src/Plugin/migrate/ConfigurablePluginTrait.php b/core/modules/migrate/src/Plugin/migrate/ConfigurablePluginTrait.php --- b/core/modules/migrate/src/Plugin/migrate/ConfigurablePluginTrait.php +++ b/core/modules/migrate/src/Plugin/migrate/ConfigurablePluginTrait.php @@ -7,7 +7,7 @@ /** * Provides a re-usable implementation ConfigurablePluginInterface. * - * @see \Drupal\Component\Plugin\ConfigurablePluginInterface + * @see \Drupal\migrate\Plugin\migrate\ConfigurablePluginInterface */ trait ConfigurablePluginTrait { @@ -17,7 +17,7 @@ * @return array * An array of this plugin's configuration. * - * @see \Drupal\Component\Plugin\ConfigurablePluginInterface::getConfiguration() + * @see \Drupal\migrate\Plugin\migrate\ConfigurablePluginInterface::getConfiguration() */ public function getConfiguration() { return $this->configuration; @@ -29,7 +29,7 @@ * @param array $configuration * An associative array containing the plugin's configuration. * - * @see \Drupal\Component\Plugin\ConfigurablePluginInterface::setConfiguration(). + * @see \Drupal\migrate\Plugin\migrate\ConfigurablePluginInterface::setConfiguration() */ public function setConfiguration(array $configuration) { $this->configuration = NestedArray::mergeDeep($this->defaultConfiguration(), $configuration); @@ -43,21 +43,8 @@ * - * @see \Drupal\Component\Plugin\ConfigurablePluginInterface::defaultConfiguration() + * @see \Drupal\migrate\Plugin\migrate\ConfigurablePluginInterface::defaultConfiguration() */ public function defaultConfiguration() { return []; } - /** - * Calculates dependencies for the configured plugin. - * - * @return array - * An array of dependencies grouped by type (config, content, module, - * theme). - * - * @see \Drupal\Component\Plugin\DependentPluginInterface::calculateDependencies() - */ - public function calculateDependencies() { - return []; - } - } diff -u b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php --- b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php +++ b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php @@ -2,8 +2,8 @@ namespace Drupal\migrate\Plugin\migrate\destination; -use Drupal\Component\Plugin\ConfigurablePluginInterface; use Drupal\Core\Plugin\PluginBase; +use Drupal\migrate\Plugin\migrate\ConfigurablePluginInterface; use Drupal\migrate\Plugin\migrate\ConfigurablePluginTrait; use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\Exception\RequirementsException; diff -u b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php --- b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php +++ b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php @@ -2,10 +2,10 @@ namespace Drupal\migrate\Plugin\migrate\source; -use Drupal\Component\Plugin\ConfigurablePluginInterface; use Drupal\Core\Plugin\PluginBase; use Drupal\migrate\Event\MigrateRollbackEvent; use Drupal\migrate\Event\RollbackAwareInterface; +use Drupal\migrate\Plugin\migrate\ConfigurablePluginInterface; use Drupal\migrate\Plugin\migrate\ConfigurablePluginTrait; use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\MigrateException; diff -u b/core/modules/migrate/src/ProcessPluginBase.php b/core/modules/migrate/src/ProcessPluginBase.php --- b/core/modules/migrate/src/ProcessPluginBase.php +++ b/core/modules/migrate/src/ProcessPluginBase.php @@ -2,8 +2,8 @@ namespace Drupal\migrate; -use Drupal\Component\Plugin\ConfigurablePluginInterface; use Drupal\Core\Plugin\PluginBase; +use Drupal\migrate\Plugin\migrate\ConfigurablePluginInterface; use Drupal\migrate\Plugin\migrate\ConfigurablePluginTrait; use Drupal\migrate\Plugin\MigrateProcessInterface; @@ -27,9 +27,9 @@ use ConfigurablePluginTrait; /** - * @inheritDoc + * {@inheritdoc} */ - public function __construct(array $configuration, string $plugin_id, mixed $plugin_definition) { + public function __construct(array $configuration, string $plugin_id, $plugin_definition) { parent::__construct($configuration, $plugin_id, $plugin_definition); $this->setConfiguration($configuration); } only in patch2: unchanged: --- /dev/null +++ b/core/modules/migrate/src/Plugin/migrate/ConfigurablePluginInterface.php @@ -0,0 +1,41 @@ +