Skip to content
Snippets Groups Projects

Merging develop into main

Merged GitLab CI requested to merge develop into main
2 files
+ 6
5
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 5
4
@@ -4,16 +4,16 @@ index 8f4f1c760dee0882ad0cff4f29dd8a5c3fe5d9c8..23f329eff551b67d86f8e2c69ebe7d26
+++ b/core/lib/Drupal/Core/Installer/InstallerKernel.php
@@ -3,6 +3,7 @@
namespace Drupal\Core\Installer;
use Drupal\Core\DrupalKernel;
+use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Extend DrupalKernel to handle force some kernel behaviors.
@@ -83,4 +84,17 @@ public static function installationAttempted() {
@@ -83,4 +84,18 @@ public static function installationAttempted() {
return isset($GLOBALS['install_state']) && empty($GLOBALS['install_state']['installation_finished']);
}
+ /**
+ * {@inheritdoc}
+ */
@@ -25,6 +25,7 @@ index 8f4f1c760dee0882ad0cff4f29dd8a5c3fe5d9c8..23f329eff551b67d86f8e2c69ebe7d26
+ // when multiple modules are being installed.
+ // @todo Move this to the parent class after https://www.drupal.org/i/2066993
+ $this->container?->reset();
+ $container->set('kernel', $this);
+ }
+
}
Loading