Revert "Update Container images to v24.6.0"

.docker/cli.dockerfile

@@ -6,7 +6,7 @@
 #
 # @see https://hub.docker.com/r/uselagoon/php-8.2-cli-drupal/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
-FROM uselagoon/php-8.2-cli-drupal:24.6.0
+FROM uselagoon/php-8.2-cli-drupal:24.5.1
 
 # Add missing variables.
 # @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

.docker/mariadb.dockerfile

@@ -8,7 +8,7 @@
 # @see https://github.com/drevops/mariadb-drupal-data
 #
 # The ARG value will be updated with a value passed from docker-compose.yml
-ARG IMAGE=uselagoon/mariadb-10.11-drupal:24.6.0
+ARG IMAGE=uselagoon/mariadb-10.11-drupal:24.5.1
 
 # hadolint ignore=DL3006
 FROM ${IMAGE}

.docker/nginx-drupal.dockerfile

@@ -9,7 +9,7 @@ FROM ${CLI_IMAGE:-cli} as cli
 
 # @see https://hub.docker.com/r/uselagoon/nginx-drupal/tags?page=1
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/nginx-drupal
-FROM uselagoon/nginx-drupal:24.6.0
+FROM uselagoon/nginx-drupal:24.5.1
 
 # Webroot is used for Nginx docroot configuration.
 ARG WEBROOT=web

.docker/php.dockerfile

@@ -10,7 +10,7 @@ FROM ${CLI_IMAGE:-cli} as cli
 
 # @see https://hub.docker.com/r/uselagoon/php-8.2-fpm/tags
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
-FROM uselagoon/php-8.2-fpm:24.6.0
+FROM uselagoon/php-8.2-fpm:24.5.1
 
 RUN apk add --no-cache tzdata
 

.docker/solr.dockerfile

@@ -5,7 +5,7 @@ FROM ${CLI_IMAGE} as cli
 
 # @see https://hub.docker.com/r/uselagoon/solr-8/tags
 # @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr/8.Dockerfile
-FROM uselagoon/solr-8:24.6.0
+FROM uselagoon/solr-8:24.5.1
 
 # Solr Jump-start config needs to be manually copied from search_api_solr module
 # /app/docroot/modules/contrib/search_api_solr/jump-start/solr8/config-set.

composer.json

@@ -12,17 +12,17 @@
         "drupal/coffee": "^1.4",
         "drupal/config_split": "^1.9",
         "drupal/config_update": "^2@alpha",
-        "drupal/core-composer-scaffold": "^10.3",
-        "drupal/core-recommended": "^10.3",
+        "drupal/core-composer-scaffold": "^10.2",
+        "drupal/core-recommended": "^10.2",
         "drupal/environment_indicator": "^4.0",
         "drupal/pathauto": "^1.12",
         "drupal/redirect": "^1.9",
         "drupal/redis": "^1.7",
-        "drupal/search_api": "^1.35",
+        "drupal/search_api": "^1.34",
         "drupal/search_api_solr": "^4.3",
         "drupal/shield": "^1.7",
         "drupal/stage_file_proxy": "^2.1",
-        "drush/drush": "^13",
+        "drush/drush": "^12.5",
         "oomphinc/composer-installers-extender": "^2.0",
         "vlucas/phpdotenv": "^5.6",
         "webflo/drupal-finder": "^1.2"
@@ -33,7 +33,7 @@
         "drevops/behat-format-progress-fail": "^1.2",
         "drevops/behat-screenshot": "^1.5",
         "drevops/behat-steps": "^2.3",
-        "drupal/core-dev": "^10.3",
+        "drupal/core-dev": "^10.2",
         "drupal/drupal-extension": "^5",
         "ergebnis/composer-normalize": "^2.42",
         "mglaman/phpstan-drupal": "^1.2",
@@ -58,7 +58,7 @@
             "url": "https://asset-packagist.org"
         }
     ],
-    "minimum-stability": "beta",
+    "minimum-stability": "stable",
     "prefer-stable": true,
     "autoload": {
         "classmap": [
@@ -148,12 +148,7 @@
         "patchLevel": {
             "drupal/core": "-p2"
         },
-        "patches": {
-          "drupal/search_api": {
-            "Declaration of Drupal\\search_api_solr\\Plugin\\search_api\\backend\\SearchApiSolrBackend::__sleep() must be compatible": "https://git.drupalcode.org/project/search_api/-/merge_requests/148.patch",
-            "Declaration of Drupal\\Core\\DependencyInjection\\DependencySerializationTrait::__wakeup() must be compatible": "https://www.drupal.org/files/issues/2024-06-18/type_declaration.patch"
-          }
-        }
+        "patches": {}
     },
     "scripts": {
         "pre-install-cmd": [

docker-compose.yml

@@ -161,7 +161,7 @@ services:
       context: .
       dockerfile: .docker/mariadb.dockerfile
       args:
-        IMAGE: "${DREVOPS_DB_IMAGE:-uselagoon/mariadb-10.11-drupal:24.6.0}" # Use custom database image (if defined) or fallback to standard database image.
+        IMAGE: "${DREVOPS_DB_IMAGE:-uselagoon/mariadb-10.11-drupal:24.5.1}" # Use custom database image (if defined) or fallback to standard database image.
     <<: *default-user
     environment:
       <<: *default-environment
@@ -174,7 +174,7 @@ services:
 
   #;< REDIS
   redis:
-    image: uselagoon/redis-6:24.6.0
+    image: uselagoon/redis-6:24.5.1
     #;< LAGOON
     labels:
       lagoon.type: redis # Change to 'none' if dedicated Redis service is used. See https://docs.lagoon.sh/using-lagoon-advanced/service-types/

tests/phpunit/CircleCiConfigTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Drupal\Component\Serialization\Yaml;
+use Drupal\Core\Serialization\Yaml;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -52,7 +52,7 @@ public function testDeployBranchRegex(string $branch, bool $expected = TRUE): vo
   /**
    * Data provider for testDeployBranchRegex().
    */
-  public static function dataProviderDeployBranchRegex(): array {
+  public function dataProviderDeployBranchRegex(): array {
     return [
       // Positive branches.
       ['main'],
@@ -191,7 +191,7 @@ public function testDeployTagRegex(string $branch, bool $expected = TRUE): void
   /**
    * Data provider for testDeployTagRegex().
    */
-  public static function dataProviderDeployTagRegex(): array {
+  public function dataProviderDeployTagRegex(): array {
     return [
       // Positive tags.
       ['1.2.3'],

tests/phpunit/Drupal/DatabaseSettingsTest.php

@@ -29,7 +29,7 @@ public function testDatabases(array $vars, array $expected): void {
   /**
    * Data provider for resulting database settings.
    */
-  public static function dataProviderDatabases(): array {
+  public function dataProviderDatabases(): array {
     return [
       [
         [],

tests/phpunit/Drupal/SwitchableSettingsTest.php

@@ -92,7 +92,7 @@ public function testConfigSplit(string $env, array $expected_present, array $exp
   /**
    * Data provider for testConfigSplit().
    */
-  public static function dataProviderConfigSplit(): array {
+  public function dataProviderConfigSplit(): array {
     return [
       [
         static::ENVIRONMENT_LOCAL,
@@ -180,7 +180,7 @@ public function testEnvironmentIndicator(string $env, array $expected_present, a
   /**
    * Data provider for testEntityPrint().
    */
-  public static function dataProviderEnvironmentIndicator(): array {
+  public function dataProviderEnvironmentIndicator(): array {
     return [
       [
         static::ENVIRONMENT_LOCAL,
@@ -292,7 +292,7 @@ public function testShield(string $env, array $vars, array $expected_present, ar
   /**
    * Data provider for testShield().
    */
-  public static function dataProviderShield(): array {
+  public function dataProviderShield(): array {
     return [
       [
         static::ENVIRONMENT_LOCAL,
@@ -410,7 +410,7 @@ public function testStageFileProxy(string $env, array $vars, array $expected_pre
   /**
    * Data provider for testStageFileProxy().
    */
-  public static function dataProviderStageFileProxy(): array {
+  public function dataProviderStageFileProxy(): array {
     return [
       [
         static::ENVIRONMENT_LOCAL,

web/modules/custom/ys_core/tests/src/Kernel/ExampleTest.php

@@ -36,7 +36,7 @@ public function testAdd(int $a, int $b, int $expected, string|null $expectExcept
   /**
    * Data provider for testAdd().
    */
-  public static function dataProviderAdd(): array {
+  public function dataProviderAdd(): array {
     return [
       [0, 0, 0],
       [1, 1, 2],
@@ -64,7 +64,7 @@ public function testSubtract(int $a, int $b, int $expected, string|null $expectE
   /**
    * Data provider for testSubtract().
    */
-  public static function dataProviderSubtract(): array {
+  public function dataProviderSubtract(): array {
     return [
       [0, 0, 0],
       [1, 1, 0],
@@ -94,7 +94,7 @@ public function testMultiplication(int $a, int $b, int $expected, string|null $e
   /**
    * Data provider for testMultiplication().
    */
-  public static function dataProviderMultiplication(): array {
+  public function dataProviderMultiplication(): array {
     return [
       [0, 0, 0],
       [1, 1, 1],

web/modules/custom/ys_core/tests/src/Unit/ExampleTest.php

@@ -36,7 +36,7 @@ public function testAdd(int $a, int $b, int $expected, string|null $expectExcept
   /**
    * Data provider for testAdd().
    */
-  public static function dataProviderAdd(): array {
+  public function dataProviderAdd(): array {
     return [
       [0, 0, 0],
       [1, 1, 2],
@@ -64,7 +64,7 @@ public function testSubtract(int $a, int $b, int $expected, string|null $expectE
   /**
    * Data provider for testSubtract().
    */
-  public static function dataProviderSubtract(): array {
+  public function dataProviderSubtract(): array {
     return [
       [0, 0, 0],
       [1, 1, 0],
@@ -94,7 +94,7 @@ public function testMultiplication(int $a, int $b, int $expected, string|null $e
   /**
    * Data provider for testMultiplication().
    */
-  public static function dataProviderMultiplication(): array {
+  public function dataProviderMultiplication(): array {
     return [
       [0, 0, 0],
       [1, 1, 1],

web/sites/default/default.services.yml

@@ -1,8 +1,4 @@
 parameters:
-  # Toggles the super user access policy. If your website has at least one user
-  # with the Administrator role, it is advised to set this to false. This allows
-  # you to make user 1 a regular user, strengthening the security of your site.
-  security.enable_super_user: true
   session.storage.options:
     # Default ini options for sessions.
     #
@@ -64,11 +60,6 @@ parameters:
     # \Drupal\Core\Session\SessionConfiguration::__construct()
     # @default 6
     sid_bits_per_character: 6
-    # By default, Drupal generates a session cookie name based on the full
-    # domain name. Set the name_suffix to a short random string to ensure this
-    # session cookie name is unique on different installations on the same
-    # domain and path (for example, when migrating from Drupal 7).
-    name_suffix: ''
   twig.config:
     # Twig debugging:
     #

web/sites/default/default.settings.php

@@ -77,7 +77,7 @@
  *
  * @code
  * $databases['default']['default'] = [
- *   'database' => 'database_name',
+ *   'database' => 'databasename',
  *   'username' => 'sql_username',
  *   'password' => 'sql_password',
  *   'host' => 'localhost',
@@ -193,7 +193,7 @@
  * @code
  *   $databases['default']['default'] = [
  *     'driver' => 'pgsql',
- *     'database' => 'database_name',
+ *     'database' => 'databasename',
  *     'username' => 'sql_username',
  *     'password' => 'sql_password',
  *     'host' => 'localhost',
@@ -215,7 +215,7 @@
  *     'driver' => 'my_driver',
  *     'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
  *     'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
- *     'database' => 'database_name',
+ *     'database' => 'databasename',
  *     'username' => 'sql_username',
  *     'password' => 'sql_password',
  *     'host' => 'localhost',
@@ -230,7 +230,7 @@
  *     'driver' => 'my_driver',
  *     'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
  *     'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
- *     'database' => 'database_name',
+ *     'database' => 'databasename',
  *     'username' => 'sql_username',
  *     'password' => 'sql_password',
  *     'host' => 'localhost',
@@ -355,13 +355,14 @@
  * security, or encryption benefits. In an environment where Drupal
  * is behind a reverse proxy, the real IP address of the client should
  * be determined such that the correct client IP address is available
- * to Drupal's logging and access management systems. In the most simple
- * scenario, the proxy server will add an X-Forwarded-For header to the request
- * that contains the client IP address. However, HTTP headers are vulnerable to
- * spoofing, where a malicious client could bypass restrictions by setting the
- * X-Forwarded-For header directly. Therefore, Drupal's proxy configuration
- * requires the IP addresses of all remote proxies to be specified in
- * $settings['reverse_proxy_addresses'] to work correctly.
+ * to Drupal's logging, statistics, and access management systems. In
+ * the most simple scenario, the proxy server will add an
+ * X-Forwarded-For header to the request that contains the client IP
+ * address. However, HTTP headers are vulnerable to spoofing, where a
+ * malicious client could bypass restrictions by setting the
+ * X-Forwarded-For header directly. Therefore, Drupal's proxy
+ * configuration requires the IP addresses of all remote proxies to be
+ * specified in $settings['reverse_proxy_addresses'] to work correctly.
  *
  * Enable this setting to get Drupal to determine the client IP from the
  * X-Forwarded-For header. If you are unsure about this setting, do not have a
@@ -807,16 +808,6 @@
  */
 $settings['entity_update_backup'] = TRUE;
 
-/**
- * State caching.
- *
- * State caching uses the cache collector pattern to cache all requested keys
- * from the state API in a single cache entry, which can greatly reduce the
- * amount of database queries. However, some sites may use state with a
- * lot of dynamic keys which could result in a very large cache.
- */
-$settings['state_cache'] = TRUE;
-
 /**
  * Node migration type.
  *

web/themes/custom/your_site_theme/tests/src/Kernel/ExampleTest.php

@@ -36,7 +36,7 @@ public function testAdd(int $a, int $b, int $expected, string|null $expectExcept
   /**
    * Data provider for testAdd().
    */
-  public static function dataProviderAdd(): array {
+  public function dataProviderAdd(): array {
     return [
       [0, 0, 0],
       [1, 1, 2],
@@ -65,7 +65,7 @@ public function testSubtract(int $a, int $b, int $expected, string|null $expectE
   /**
    * Data provider for testSubtract().
    */
-  public static function dataProviderSubtract(): array {
+  public function dataProviderSubtract(): array {
     return [
       [0, 0, 0],
       [1, 1, 0],
@@ -96,7 +96,7 @@ public function testMultiplication(int $a, int $b, int $expected, string|null $e
   /**
    * Data provider for testMultiplication().
    */
-  public static function dataProviderMultiplication(): array {
+  public function dataProviderMultiplication(): array {
     return [
       [0, 0, 0],
       [1, 1, 1],

web/themes/custom/your_site_theme/tests/src/Unit/ExampleTest.php

@@ -36,7 +36,7 @@ public function testAdd(int $a, int $b, int $expected, string|null $expectExcept
   /**
    * Data provider for testAdd().
    */
-  public static function dataProviderAdd(): array {
+  public function dataProviderAdd(): array {
     return [
       [0, 0, 0],
       [1, 1, 2],
@@ -65,7 +65,7 @@ public function testSubtract(int $a, int $b, int $expected, string|null $expectE
   /**
    * Data provider for testSubtract().
    */
-  public static function dataProviderSubtract(): array {
+  public function dataProviderSubtract(): array {
     return [
       [0, 0, 0],
       [1, 1, 0],
@@ -96,7 +96,7 @@ public function testMultiplication(int $a, int $b, int $expected, string|null $e
   /**
    * Data provider for testMultiplication().
    */
-  public static function dataProviderMultiplication(): array {
+  public function dataProviderMultiplication(): array {
     return [
       [0, 0, 0],
       [1, 1, 1],