Merge branch 'main' into feature/update-actions

Author: linawolf

.ddev/config.yaml

@@ -1,7 +1,7 @@
 name: render-guides
 type: php
 docroot: Documentation-GENERATED-temp
-php_version: "8.1"
+php_version: "8.2"
 webserver_type: nginx-fpm
 router_http_port: "80"
 router_https_port: "443"
@@ -13,7 +13,7 @@ webimage_extra_packages: [build-essential]
 use_dns_when_possible: true
 composer_version: "2"
 web_environment: []
-nodejs_version: "18"
+nodejs_version: "20"
 
 # Key features of DDEV's config.yaml:
 

.github/workflows/docker-test.yaml

@@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
 name: "Test Dockerfile"
 
 env:
-  DEFAULT_PHP_VERSION: "8.1"
+  DEFAULT_PHP_VERSION: "8.2"
   RUN_ENVIRONMENT: "local"
 
 jobs:

.github/workflows/main.yaml

@@ -7,7 +7,7 @@ on: # yamllint disable-line rule:truthy
       - "main"
 
 env:
-  DEFAULT_PHP_VERSION: "8.1"
+  DEFAULT_PHP_VERSION: "8.2"
   RUN_ENVIRONMENT: "local"
 
 jobs:
@@ -18,7 +18,6 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '8.1'
           - '8.2'
           - '8.3'
           - '8.4'
@@ -34,10 +33,19 @@ jobs:
           php-version: "${{ matrix.php }}"
           extensions: 'inotify, pcntl'
 
-      - name: "Install dependencies with Composer"
-        uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520
+      - name: "Get Composer cache directory"
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
+
+      - name: "Cache Composer dependencies"
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
-          dependency-versions: "locked"
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: php-${{ matrix.php }}-composer-
+
+      - name: "Install dependencies with Composer"
+        run: composer install --no-interaction --no-progress --prefer-dist
 
       - name: "Run unit tests"
         run: "make test-unit ENV=${{ env.RUN_ENVIRONMENT }}"
@@ -59,10 +67,19 @@ jobs:
           php-version: "${{ env.DEFAULT_PHP_VERSION }}"
           extensions: 'inotify, pcntl'
 
-      - name: "Install dependencies with Composer"
-        uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520
+      - name: "Get Composer cache directory"
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
+
+      - name: "Cache Composer dependencies"
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
-          dependency-versions: "locked"
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: php-${{ env.DEFAULT_PHP_VERSION }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: php-${{ env.DEFAULT_PHP_VERSION }}-composer-
+
+      - name: "Install dependencies with Composer"
+        run: composer install --no-interaction --no-progress --prefer-dist
 
       - name: "Check for normalized composer.json"
         run: "composer normalize --dry-run"
@@ -96,10 +113,19 @@ jobs:
           php-version: "${{ env.DEFAULT_PHP_VERSION }}"
           extensions: 'inotify, pcntl'
 
-      - name: "Install dependencies with Composer"
-        uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520
+      - name: "Get Composer cache directory"
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
+
+      - name: "Cache Composer dependencies"
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
-          dependency-versions: "locked"
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: php-${{ env.DEFAULT_PHP_VERSION }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: php-${{ env.DEFAULT_PHP_VERSION }}-composer-
+
+      - name: "Install dependencies with Composer"
+        run: composer install --no-interaction --no-progress --prefer-dist
 
       - name: "Validate monorepo"
         run: "make test-monorepo ENV=${{ env.RUN_ENVIRONMENT }}"

.php-cs-fixer.dist.php

@@ -12,7 +12,7 @@
     ->setCacheFile('.cache/.php-cs-fixer.cache')
     ->setRules([
         '@PER-CS1.0' => true,
-        '@PHP81Migration' => true,
+        '@PHP82Migration' => true,
 
         // Already implemented PER-CS2 rules we opt-in explicitly
         // @todo: Can be dropped once we enable @PER-CS2.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.1-cli-alpine AS builder
+FROM php:8.2-cli-alpine AS builder
 
 COPY --from=ghcr.io/php/pie:bin /pie /usr/bin/pie
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
@@ -12,7 +12,7 @@ COPY . /opt/guides
 RUN composer install --no-dev --no-interaction --no-progress  \
     --no-suggest --optimize-autoloader --classmap-authoritative
 
-FROM php:8.1-cli-alpine
+FROM php:8.2-cli-alpine
 
 COPY --from=ghcr.io/php/pie:bin /pie /usr/bin/pie
 RUN apk add --update $PHPIZE_DEPS

composer.json

@@ -3,7 +3,7 @@
     "description": "phpDocumentor-based Documentation rendering for docs.typo3.org or custom extensions.",
     "license": "OPL-1.0",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-libxml": "*",
@@ -42,6 +42,7 @@
     "replace": {
         "symfony/polyfill-php80": "*",
         "symfony/polyfill-php81": "*",
+        "symfony/polyfill-php82": "*",
         "t3docs/typo3-api": "self.version",
         "t3docs/typo3-docs-theme": "self.version",
         "t3docs/typo3-guides-cli": "self.version",
@@ -69,7 +70,7 @@
             "phpstan/extension-installer": true
         },
         "platform": {
-            "php": "8.1.27"
+            "php": "8.2.28"
         },
         "sort-packages": true
     },