only in patch2: unchanged: --- a/core/modules/migrate_drupal/src/MigrationStorage.php +++ b/core/modules/migrate_drupal/src/MigrationStorage.php @@ -11,6 +11,7 @@ use Drupal\Component\Uuid\UuidInterface; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityStorageException; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Language\LanguageManagerInterface; @@ -51,8 +52,8 @@ class MigrationStorage extends BaseMigrationStorage { * @param \Drupal\migrate_drupal\Plugin\MigratePluginManager * The cckfield plugin manager. */ - public function __construct(EntityTypeInterface $entity_type, ConfigFactoryInterface $config_factory, UuidInterface $uuid_service, LanguageManagerInterface $language_manager, MigratePluginManager $cck_plugin_manager) { - parent::__construct($entity_type, $config_factory, $uuid_service, $language_manager); + public function __construct(EntityTypeInterface $entity_type, ConfigFactoryInterface $config_factory, UuidInterface $uuid_service, LanguageManagerInterface $language_manager, EntityStorageInterface $migration_group_storage, MigratePluginManager $cck_plugin_manager) { + parent::__construct($entity_type, $config_factory, $uuid_service, $language_manager, $migration_group_storage); $this->cckPluginManager = $cck_plugin_manager; } @@ -65,6 +66,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI $container->get('config.factory'), $container->get('uuid'), $container->get('language_manager'), + $container->get('entity.manager')->getStorage('migration_group'), $container->get('plugin.manager.migrate.cckfield') ); }