diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php index 02460118d2fa44cfd296ee78ea116149f0dc67e0..18f7a0cf95e754e76aafde0018fe39553d702d6a 100644 --- a/core/lib/Drupal/Core/Config/ConfigImporter.php +++ b/core/lib/Drupal/Core/Config/ConfigImporter.php @@ -698,7 +698,7 @@ protected function processMissingContent(&$context) { $missing_content = $sandbox['missing_content']['data']; } if (!empty($missing_content)) { - $event = new MissingContentEvent($missing_content, $this); + $event = new MissingContentEvent($missing_content); // Fire an event to allow listeners to create the missing content. $this->eventDispatcher->dispatch($event, ConfigEvents::IMPORT_MISSING_CONTENT); $sandbox['missing_content']['data'] = $event->getMissingContent(); diff --git a/core/lib/Drupal/Core/Config/Importer/MissingContentEvent.php b/core/lib/Drupal/Core/Config/Importer/MissingContentEvent.php index e76cc114023210317dda8d9ef2ca3843dae940d3..4b3dce9fc40f6defcb30ec3df4882773f37e72f6 100644 --- a/core/lib/Drupal/Core/Config/Importer/MissingContentEvent.php +++ b/core/lib/Drupal/Core/Config/Importer/MissingContentEvent.php @@ -2,15 +2,14 @@ namespace Drupal\Core\Config\Importer; -use Drupal\Core\Config\ConfigImporter; -use Drupal\Core\Config\ConfigImporterEvent; +use Drupal\Component\EventDispatcher\Event; /** * Wraps a configuration event for event listeners. * * @see \Drupal\Core\Config\ConfigEvents::IMPORT_MISSING_CONTENT */ -class MissingContentEvent extends ConfigImporterEvent { +class MissingContentEvent extends Event { /** * A list of missing content dependencies. @@ -24,11 +23,8 @@ class MissingContentEvent extends ConfigImporterEvent { * * @param array $missing_content * Missing content information. - * @param \Drupal\Core\Config\ConfigImporter $config_importer - * The config importer that triggered this event. */ - public function __construct(array $missing_content, ConfigImporter $config_importer) { - parent::__construct($config_importer); + public function __construct(array $missing_content) { $this->missingContent = $missing_content; } diff --git a/core/modules/config/tests/config_import_test/src/EventSubscriber.php b/core/modules/config/tests/config_import_test/src/EventSubscriber.php index 60fd4501436f35c52dabcf98efc7a53ed7ff137e..4da76d83df698c80f958ce1b5e69e738fc161039 100644 --- a/core/modules/config/tests/config_import_test/src/EventSubscriber.php +++ b/core/modules/config/tests/config_import_test/src/EventSubscriber.php @@ -4,7 +4,6 @@ use Drupal\Core\Config\ConfigCrudEvent; use Drupal\Core\Config\ConfigEvents; -use Drupal\Core\Config\ConfigImporter; use Drupal\Core\Config\ConfigImporterEvent; use Drupal\Core\Config\Importer\MissingContentEvent; use Drupal\Core\State\StateInterface; @@ -73,9 +72,6 @@ public function onConfigImporterMissingContentOne(MissingContentEvent $event) { * The missing content event. */ public function onConfigImporterMissingContentTwo(MissingContentEvent $event) { - if (!$event->getConfigImporter() instanceof ConfigImporter) { - throw new \LogicException('\Drupal\Core\Config\Importer\MissingContentEvent is missing the ConfigImporter'); - } if ($this->state->get('config_import_test.config_import_missing_content', FALSE) && $this->state->get('config_import_test.config_import_missing_content_two', FALSE) === FALSE) { $missing = $event->getMissingContent(); $uuid = key($missing);