Merge tag '24.8.0' into develop

24.8.0
drevops · Aug 29, 2024 · 6dcad19 · 6dcad19 · github-actions · Aug 29, 2024
2 parents 450bfdc + ad770a7
commit 6dcad19
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -148,7 +148,7 @@ jobs:
             echo "${DREVOPS_CI_DB_CACHE_FALLBACK/no/${CIRCLE_BUILD_NUM}}" | tee /tmp/db_cache_fallback
             echo "$(date ${DREVOPS_CI_DB_CACHE_TIMESTAMP})" | tee /tmp/db_cache_timestamp
             echo "yes" | tee /tmp/db_cache_fallback_yes
-            echo 'v1.22.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-{{ checksum "/tmp/db_cache_timestamp" }}'
+            echo 'v24.8.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-{{ checksum "/tmp/db_cache_timestamp" }}'
 
       - restore_cache:
           keys:
@@ -157,10 +157,10 @@ jobs:
             # Change 'v1' to 'v2', 'v3' etc., commit and push to force cache reset.
             # Lookup cache based on the default branch and a timestamp. Allows
             # to use cache from the very first build on the day (sanitized database dump, for example).
-            - v1.22.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-{{ checksum "/tmp/db_cache_timestamp" }}
+            - v24.8.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-{{ checksum "/tmp/db_cache_timestamp" }}
             # Fallback to caching by default branch name only. Allows to use
             # cache from the branch build on the previous day.
-            - v1.22.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-
+            - v24.8.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-
 
       - run:
           name: Download DB
@@ -190,7 +190,7 @@ jobs:
           # The cache will not be saved if it already exists.
           # Note that the cache fallback flag is enabled for this case in order
           # to save cache even if the fallback is not used when restoring it.
-          key: v1.22.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
+          key: v24.8.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
           paths:
             - /root/project/.data
 
@@ -234,8 +234,8 @@ jobs:
           keys:
             # Use cached artifacts from previous builds of this branch.
             # @see https://circleci.com/docs/2.0/caching/#restoring-cache
-            - v1.22.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
-            - v1.22.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-
+            - v24.8.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
+            - v24.8.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-
       #;> !PROVISION_USE_PROFILE
 
       - run:

diff --git a/.scaffold/docs/content/contributing/maintenance/release.mdx b/.scaffold/docs/content/contributing/maintenance/release.mdx
@@ -9,7 +9,7 @@ renovate --schedule= --force-cli=true drevops/scaffold
 2. Update container images to the latest versions and check that `@see` links are working.
 3. Update PHP version in `composer.json` for `config.platform`.
 4. Update PHP version in `phpcs.xml` for `testVersion`.
-5. Update PHP version in `phpstan.neon` for `phpVersion`.
+5. Update PHP version in `phpstan.neon` for `phpVersion`. Run `php -r "echo PHP_VERSION_ID . PHP_EOL;"` in the container to get the current PHP version.
 6. Increment minor version of all packages in `composer.json`.
 7. Update minor version of dependencies in theme's `package.json`.
 8. Increment the cache version in `.circleci/config.yml`.

diff --git a/composer.json b/composer.json
@@ -5,42 +5,42 @@
     "type": "project",
     "require": {
         "php": ">=8.3",
-        "composer/installers": "^2.2",
+        "composer/installers": "^2.3",
         "cweagans/composer-patches": "^1.7",
-        "drupal/admin_toolbar": "^3.4",
+        "drupal/admin_toolbar": "^3.5",
         "drupal/clamav": "^2.0",
         "drupal/coffee": "^1.4",
         "drupal/config_split": "^1.9",
         "drupal/config_update": "^2@alpha",
-        "drupal/core-composer-scaffold": "~10.3.0",
-        "drupal/core-recommended": "~10.3.0",
+        "drupal/core-composer-scaffold": "~10.3.2",
+        "drupal/core-recommended": "~10.3.2",
         "drupal/environment_indicator": "^4.0",
-        "drupal/pathauto": "^1.12",
-        "drupal/redirect": "^1.9",
-        "drupal/redis": "^1.7",
+        "drupal/pathauto": "^1.13",
+        "drupal/redirect": "^1.10",
+        "drupal/redis": "^1.8",
         "drupal/search_api": "^1.35",
         "drupal/search_api_solr": "^4.3",
-        "drupal/shield": "^1.7",
+        "drupal/shield": "^1.8",
         "drupal/stage_file_proxy": "^2.1",
-        "drush/drush": "~13.0",
-        "oomphinc/composer-installers-extender": "^2.0",
-        "webflo/drupal-finder": "^1.2"
+        "drush/drush": "^13",
+        "oomphinc/composer-installers-extender": "^2",
+        "webflo/drupal-finder": "^1.3"
     },
     "require-dev": {
         "behat/behat": "^3.14",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
         "drevops/behat-format-progress-fail": "^1.2",
         "drevops/behat-screenshot": "^1.5",
         "drevops/behat-steps": "^2.4",
-        "drupal/core-dev": "~10.3.0",
+        "drupal/core-dev": "~10.3.2",
         "drupal/drupal-extension": "^5",
-        "ergebnis/composer-normalize": "^2.42",
+        "ergebnis/composer-normalize": "^2.43",
         "mglaman/phpstan-drupal": "^1.2",
         "palantirnet/drupal-rector": "^0.20",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.15",
         "phpspec/prophecy-phpunit": "^2.2",
-        "phpstan/extension-installer": "^1.3",
+        "phpstan/extension-installer": "^1.4",
         "pyrech/composer-changelogs": "^1.8",
         "vincentlanglet/twig-cs-fixer": "^3"
     },
@@ -83,7 +83,7 @@
         },
         "discard-changes": true,
         "platform": {
-            "php": "8.3.9"
+            "php": "8.3.10"
         },
         "sort-packages": true
     },

diff --git a/phpstan.neon b/phpstan.neon
@@ -11,7 +11,7 @@ parameters:
 
   level: 7
 
-  phpVersion: 80300
+  phpVersion: 80310
 
   paths:
     - web/modules/custom