From 1dd699f07a7e0fb4a8e894db4186da7b31438d80 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 27 Jun 2024 17:07:00 +0300
Subject: [PATCH] Issue #3441010 by catch, longwave, larowlan, dpi, dqd,
geek-merlin, el7cosmos: Container compile crash when a service decorates a
destructable service
(cherry picked from commit e82372379de9f30fc18cc2115ab53f008711c5c7)
---
core/lib/Drupal/Core/Extension/ModuleHandler.php | 3 +--
core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index 0a70ba2b66ec..7b72f3260497 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -5,13 +5,12 @@
use Drupal\Component\Graph\Graph;
use Drupal\Component\Utility\NestedArray;
use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\DestructableInterface;
use Drupal\Core\Extension\Exception\UnknownExtensionException;
/**
* Class that manages modules in a Drupal installation.
*/
-class ModuleHandler implements ModuleHandlerInterface, DestructableInterface {
+class ModuleHandler implements ModuleHandlerInterface {
/**
* List of loaded files.
diff --git a/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php b/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
index b32c2be9082a..afaf80736838 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
@@ -2,6 +2,8 @@
namespace Drupal\Core\Extension;
+use Drupal\Core\DestructableInterface;
+
/**
* Interface for classes that manage a set of enabled modules.
*
@@ -9,7 +11,7 @@
* responsible for loading module files and maintaining information about module
* dependencies and hook implementations.
*/
-interface ModuleHandlerInterface {
+interface ModuleHandlerInterface extends DestructableInterface {
/**
* Includes a module's .module file.
--
GitLab