diff --git a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php index 2d7d329..127c846 100644 --- a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php +++ b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php @@ -175,6 +175,8 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition } $this->moduleHandler = $module_handler; + + $this->cache = $cache; } /** diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php b/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php index b9d003c..b7bf7d4 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php +++ b/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php @@ -84,17 +84,6 @@ * {@inheritdoc} */ protected function setUp() { - // Mock container services so the plugin can instantiate itself. - $container = new ContainerBuilder(); - $container - ->set('module_handler', $this->getMock(ModuleHandlerInterface::class)); - $container - ->set('cache.migrate', $this->getMock(CacheBackendInterface::class)); - $container - ->set('state', $this->getMock(StateInterface::class)); - $container - ->set('entity.manager', $this->getMock(EntityManagerInterface::class)); - // Mock a key-value store to return high-water values. $key_value = $this->getMock(KeyValueStoreInterface::class); @@ -114,6 +103,14 @@ protected function setUp() { $container = new ContainerBuilder(); } $container->set('keyvalue', $key_value_factory); + $container + ->set('module_handler', $this->getMock(ModuleHandlerInterface::class)); + $container + ->set('cache.migrate', $this->getMock(CacheBackendInterface::class)); + $container + ->set('state', $this->getMock(StateInterface::class)); + $container + ->set('entity.manager', $this->getMock(EntityManagerInterface::class)); \Drupal::setContainer($container); $migration = $this->getMigration(); diff --git a/core/modules/node/src/Plugin/migrate/source/d6/Node.php b/core/modules/node/src/Plugin/migrate/source/d6/Node.php index 2e4d1a6..8ef24f6 100644 --- a/core/modules/node/src/Plugin/migrate/source/d6/Node.php +++ b/core/modules/node/src/Plugin/migrate/source/d6/Node.php @@ -2,6 +2,7 @@ namespace Drupal\node\Plugin\migrate\source\d6; +use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Database\Query\SelectInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Extension\ModuleHandler; @@ -49,8 +50,8 @@ class Node extends DrupalSqlBase { /** * {@inheritdoc} */ - public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, StateInterface $state, EntityManagerInterface $entity_manager, ModuleHandler $module_handler) { - parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $state, $entity_manager); + public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, StateInterface $state, EntityManagerInterface $entity_manager, ModuleHandler $module_handler, CacheBackendInterface $cache) { + parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $module_handler, $cache, $state, $entity_manager); $this->moduleHandler = $module_handler; } @@ -65,7 +66,8 @@ public static function create(ContainerInterface $container, array $configuratio $migration, $container->get('state'), $container->get('entity.manager'), - $container->get('module_handler') + $container->get('module_handler'), + $container->get('cache.migrate') ); }