Merge branch 'develop' into 'main'

Merging develop into main

See merge request !381

defaults/curated.json

@@ -43,7 +43,7 @@
   "DDQG-unsupported-drupal-schema_diff-1.0.0.0-alpha2",
   "DDQG-unsupported-drupal-services-5.0.0.0-beta10",
   "DDQG-unsupported-drupal-shs-2.0.0.0-RC12",
-  "DDQG-unsupported-drupal-simple_oauth-6.0.0.0-beta7",
+  "DDQG-unsupported-drupal-simple_oauth-6.0.0.0-beta8",
   "DDQG-unsupported-drupal-slick-2.9.0.0",
   "DDQG-unsupported-drupal-slick-2.11.0.0",
   "DDQG-unsupported-drupal-slick_views-2.7.0.0",

patches/d10-4.json

@@ -82,7 +82,7 @@
       "#2849279 Inconsistent changed timestamps when moderated entity": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/2849279.patch",
       "#3043725 Provide a Entity Handler for user cancellation": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3043725-104.diff",
       "#3473763 locale_string_is_safe should accept \"<front>\" as being safe": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3473763.diff",
-      "#3492453 Memory leak in DrupalKernel when installing modules": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3492453.diff"
+      "#3492453 Memory leak in DrupalKernel when installing modules": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3492453.diff?v=2"
     },
     "drupal/dashboards": {
       "#3366586 Shortcut error": "https://git.drupalcode.org/project/dashboards/-/merge_requests/26.diff"

patches/d10/3492453.diff

@@ -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);
 +  }
 +
  }