only in patch2: unchanged: --- a/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php +++ b/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php @@ -9,7 +9,6 @@ use Drupal\ban\BanIpManagerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\migrate\Entity\MigrationInterface; use Drupal\migrate\Plugin\migrate\destination\DestinationBase; use Drupal\migrate\Row; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -39,25 +38,22 @@ class BlockedIP extends DestinationBase implements ContainerFactoryPluginInterfa * The plugin ID. * @param mixed $plugin_definition * The plugin definiiton. - * @param \Drupal\migrate\Entity\MigrationInterface $migration - * The current migration. * @param \Drupal\ban\BanIpManagerInterface $ban_manager * The IP manager service. */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, BanIpManagerInterface $ban_manager) { - parent::__construct($configuration, $plugin_id, $plugin_definition, $migration); + public function __construct(array $configuration, $plugin_id, $plugin_definition, BanIpManagerInterface $ban_manager) { + parent::__construct($configuration, $plugin_id, $plugin_definition); $this->banManager = $ban_manager; } /** * {@inheritdoc} */ - public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) { + public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { return new static( $configuration, $plugin_id, $plugin_definition, - $migration, $container->get('ban.ip_manager') ); } @@ -72,7 +68,7 @@ public function getIds() { /** * {@inheritdoc} */ - public function fields(MigrationInterface $migration = NULL) { + public function fields() { return [ 'ip' => $this->t('The blocked IP address.'), ];