chore: upgrade to PHP 8.5

.github/workflows/daily-security-check.yml

@@ -33,7 +33,7 @@ jobs:
         if: steps.check_node_yarn.outputs.files_exists == 'true'
         uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 24
       - name: Yarn Audit
         if: steps.check_node_yarn.outputs.files_exists == 'true'
         run: yarn audit --level high --groups dependencies optionalDependencies
@@ -48,7 +48,7 @@ jobs:
         if: steps.check_node_npm.outputs.files_exists == 'true'
         uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 24
       - name: npm audit
         if: steps.check_node_npm.outputs.files_exists == 'true'
         run: npm audit --audit-level=high

.github/workflows/test-integration.yml

@@ -8,7 +8,7 @@ jobs:
       run:
         working-directory: /var/www/html/
     container:
-      image:  ghcr.io/openconext/openconext-basecontainers/php82-apache2-node20-composer2:latest
+      image:  ghcr.io/openconext/openconext-basecontainers/php85-apache2-node24:latest
       volumes:
         - .:/var/www/html
 

CHANGELOG.md

@@ -1,4 +1,6 @@
 # Next release
+* Upgrade the runtime and build toolchain to PHP 8.5 and Node.js 24.
+* Refresh the CI Docker base image plus Composer and npm dependencies for the PHP 8.5 build.
 
 # 4.1.4
 * Update saml2 library.

README.md

@@ -17,11 +17,13 @@ from the IdP (OpenConext Engineblock) and requests and displays additional
 information via EngineBlock's internal API.
 
 ## Requirements
-- PHP 8.2
+- PHP 8.5
 - EngineBlock 5.6 >= 5.6.7 
 - EngineBlock 5.7 >= 5.7.1
 - EngineBlock must be configured to release an unspecified NameID to Profile
 
+Upgrade notes for runtime and dependency bumps are tracked in [CHANGELOG.md](CHANGELOG.md).
+
 ## Development
 
 You can use docker to start a development environment.

ci/qa/rector.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPaths([__DIR__.'/../../bin', __DIR__.'/../../config', __DIR__.'/../../src', __DIR__.'/../../tests'])
+    ->withPhpSets()
+    ->withComposerBased(symfony: true, phpunit: true)
+    ->withAttributesSets(symfony: true, phpunit: true)
+    ->withSkip([
+        \Rector\Php84\Rector\MethodCall\NewMethodCallWithoutParenthesesRector::class,
+        \Rector\Php84\Rector\Class_\DeprecatedAnnotationToDeprecatedAttributeRector::class,
+        // Converts getFilters()/getFunctions() to #[AsTwigFilter]/#[AsTwigFunction] attributes,
+        // which requires symfony/twig-bundle 7.3+. This app runs 6.4.*, where the resulting
+        // classes no longer implement Twig\Extension\ExtensionInterface (since they stop
+        // extending AbstractExtension), which fatals the Twig environment at boot.
+        \Rector\Symfony\Symfony73\Rector\Class_\GetFiltersAndFunctionsToAsTwigAttributeRector::class,
+    ]);

ci/qa/rector.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+# Ensure we run from project root
+cd "$(dirname "$0")/../../" || exit 1
+./vendor/bin/rector --config=ci/qa/rector.php "$@"

component_info

@@ -1,6 +1,6 @@
-PHP_VERSION=82
+PHP_VERSION=85
 SYMFONY_VERSION=6
 ENCORE=yes
-NODE_VERSION=20
+NODE_VERSION=24
 ASSETIC=no
 COMPOSER_VERSION=2

composer.json

@@ -9,7 +9,7 @@
     }
   },
   "require": {
-    "php": "^8.2",
+    "php": "^8.5",
     "ext-json": "*",
     "beberlei/assert": "^3.0",
     "doctrine/annotations": "^2.0.1",
@@ -42,11 +42,11 @@
     "overtrue/phplint": "^9.1.2",
     "phpdocumentor/reflection-docblock": "^5.2",
     "phpmd/phpmd": "^2.8",
-    "phpstan/phpstan": "^1.10",
-    "phpstan/phpstan-deprecation-rules": "^1.1",
-    "phpstan/phpstan-symfony": "^1.3",
+    "phpstan/phpstan": "^2.1",
+    "phpstan/phpstan-deprecation-rules": "^2.0",
+    "phpstan/phpstan-symfony": "^2.0",
     "phpunit/phpunit": "^9.5",
-    "rector/rector": "^1.0",
+    "rector/rector": "^2.4",
     "sebastian/phpcpd": "^6.0.3",
     "slevomat/coding-standard": "^8.15",
     "squizlabs/php_codesniffer": "^3.1",
@@ -76,6 +76,8 @@
     "phpstan-baseline": "./ci/qa/phpstan-update-baseline",
     "phpcbf": "./ci/qa/phpcbf",
     "test": "./ci/qa/phpunit",
+    "rector": "./ci/qa/rector.sh --dry-run",
+    "rector-fix": "./ci/qa/rector.sh",
     "frontend-install": [
       "yarn install --frozen-lockfile",
       "yarn encore production"
@@ -97,13 +99,14 @@
   "config": {
     "optimize-autoloader": true,
     "platform": {
-      "php": "8.2.17"
+      "php": "8.5.2"
     },
     "sort-packages": true,
     "allow-plugins": {
       "symfony/flex": true,
       "symfony/runtime": true,
-      "dealerdirect/phpcodesniffer-composer-installer": true
+      "dealerdirect/phpcodesniffer-composer-installer": true,
+      "endroid/installer": false
     }
   },
   "archive": {