Merge remote-tracking branch 'origin/develop' into develop

.gitlab-ci.yml

 include:
-  - project: 'gitlab-ci-cd/composer-packages'
+  - project: 'gitlab-ci-cd/drupal'
     ref: main
-    file: '/composer-packages.yml'
+    file: '/private-modules.yml'

composer.json

@@ -45,17 +45,20 @@
     "ext-json": "*",
     "composer-plugin-api": "^2",
     "henrywhitaker3/healthchecks-io": "^1.0",
-    "lakedrops/ahoy": "^1.7||dev-develop",
-    "lakedrops/composer-json-utils": "^2.4||dev-develop",
-    "lakedrops/docker-traefik": "^3.2||dev-develop"
+    "lakedrops/ahoy": "^1.8||dev-develop",
+    "lakedrops/composer-json-utils": "^2.5||dev-develop",
+    "lakedrops/docker-traefik": "^3.3||dev-develop"
   },
   "require-dev": {
     "composer/composer": "^2",
-    "lakedrops/drupal-development-environment": "^3.2||dev-develop",
+    "lakedrops/drupal-environment": "^3.2||dev-develop",
     "roave/security-advisories": "dev-latest"
   },
-  "minimum-stability": "dev",
-  "prefer-stable": true,
+  "config": {
+    "allow-plugins": {
+      "lakedrops/*": false
+    }
+  },
   "autoload": {
     "psr-4": {
       "LakeDrops\\Docker4Drupal\\": "src/"
@@ -63,14 +66,5 @@
   },
   "extra": {
     "class": "LakeDrops\\Docker4Drupal\\Plugin"
-  },
-  "config": {
-    "allow-plugins": {
-      "dealerdirect/phpcodesniffer-composer-installer": true,
-      "drupal/core-composer-scaffold": false,
-      "lakedrops/*": false,
-      "php-http/discovery": false,
-      "phpstan/extension-installer": true
-    }
   }
 }

phpstan.neon

+parameters:
+  level: 6
+  checkMissingIterableValueType: false
+  checkGenericClassInNonGenericObjectType: false
+  treatPhpDocTypesAsCertain: false

src/Handler.php

@@ -523,7 +523,7 @@ class Handler extends BaseHandler {
     $this->gitIgnore('tests/backstop/backstop-script-*');
     $this->gitIgnore('tests/backstop/backstop_data/bitmaps_test');
     $this->gitIgnore('tests/backstop/backstop_data/html_report');
-    $this->gitLFS('tests/backstop/**/*.png');
+    $this->gitLfs('tests/backstop/**/*.png');
 
     // Ignore some Cypress directories.
     $this->gitIgnore('tests/cypress/downloads');

src/Plugin.php

@@ -46,11 +46,10 @@ class Plugin extends BasePlugin {
    *   The event that triggered the call of this function.
    */
   public function configureProject(Event $event): void {
-    /** @var Handler $handler */
+    /** @var \LakeDrops\Docker4Drupal\Handler $handler */
     $handler = $this->handler;
-    $handler
-      ->setEvent($event)
-      ->configureProject();
+    $handler->setEvent($event);
+    $handler->configureProject();
   }
 
   /**
@@ -60,11 +59,10 @@ class Plugin extends BasePlugin {
    *   The event that triggered the call of this function.
    */
   public function updateProject(Event $event): void {
-    /** @var Handler $handler */
+    /** @var \LakeDrops\Docker4Drupal\Handler $handler */
     $handler = $this->handler;
-    $handler
-      ->setEvent($event)
-      ->updateProject();
+    $handler->setEvent($event);
+    $handler->updateProject();
   }
 
 }

templates/wkhtmltox.sh.twig

@@ -9,7 +9,7 @@ sudo apk add --no-cache \
         libx11 \
         libxrender \
         libxext \
-        libssl1.1 \
+        libssl3 \
         ca-certificates \
         fontconfig \
         freetype \