From 4f22397cc27f97f2e71544c2df00f5540001a21d Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Wed, 21 Feb 2024 15:40:11 +0000
Subject: [PATCH] Revert "Issue #3414993 by alexpott: Add ConfigImporter to
\Drupal\Core\Config\Importer\MissingContentEvent"
This reverts commit 476e65a1e15ab24ef644b08b6acfb56d1c5d6ab7.
---
core/lib/Drupal/Core/Config/ConfigImporter.php | 2 +-
.../Core/Config/Importer/MissingContentEvent.php | 10 +++-------
.../tests/config_import_test/src/EventSubscriber.php | 4 ----
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php
index 02460118d2fa..18f7a0cf95e7 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 e76cc1140232..4b3dce9fc40f 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 60fd4501436f..4da76d83df69 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);
--
GitLab