chore: upgrade to PHP 8.5

.github/workflows/build-push-test-docker-image.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Build the app
-        uses: openconext/build-and-publish-test-container/php82-node20@main
+        uses: openconext/build-and-publish-test-container/php85-node24@main
         with:
           use_yarn: true
 

.github/workflows/test-integration.yml

@@ -13,7 +13,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
 

.scrutinizer.yml

@@ -2,8 +2,8 @@ build:
     # Use Ubuntu 22.04.5 LTS (Jammy Jellyfish)
     image: default-jammy
     environment:
-        php: 8.2
-        node: v20
+        php: 8.5
+        node: v24
 
 filter:
     excluded_paths:

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+# 6.0.1
+- Upgrade Docker base images, Composer dependencies, and npm dependencies to support PHP 8.5 #533
+
 # 6.0.0
 - Upgrade code to run on Symfony 7.4
 

README.md

@@ -6,7 +6,7 @@ This component is part of "Step-up Authentication as-a Service" and requires oth
 
 ## Requirements
 
- * PHP 8.2
+ * PHP 8.5
  * [Composer](https://getcomposer.org/)
  * A web server (Apache, Nginx)
  * A working [Gateway](https://github.com/OpenConext/Stepup-Gateway)

ci/qa/rector.php

@@ -6,6 +6,7 @@
 
 return RectorConfig::configure()
     ->withPaths([
+         __DIR__ . '/../../bin',
          __DIR__ . '/../../config',
          __DIR__ . '/../../src',
          __DIR__ . '/../../templates',
@@ -15,4 +16,8 @@
     ->withComposerBased(twig: true, doctrine: true, phpunit: true, symfony: true)
     ->withPHPStanConfigs([__DIR__.'/phpstan.neon'])
 //    ->withPreparedSets(deadCode: true)
+    ->withSkip([
+        \Rector\Php84\Rector\MethodCall\NewMethodCallWithoutParenthesesRector::class,
+        \Rector\Php84\Rector\Class_\DeprecatedAnnotationToDeprecatedAttributeRector::class,
+    ])
 ;

component_info

@@ -1,7 +1,7 @@
-PHP_VERSION=82
+PHP_VERSION=85
 SYMFONY_VERSION=7
 ENCORE=yes
-NODE_VERSION=20
+NODE_VERSION=24
 ASSETIC=no
 COMPOSER_VERSION=2
 TEST_EXTRA_DIRS="ci/"

composer.json

@@ -13,7 +13,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^8.2",
+        "php": "^8.5",
         "ext-gd": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
@@ -55,7 +55,7 @@
         "phpstan/phpstan": "^2.1",
         "phpstan/phpstan-deprecation-rules": "^2.0",
         "phpunit/phpunit": "^11.5.48",
-        "rector/rector": "^2.3",
+        "rector/rector": "^2.4",
         "roave/security-advisories": "dev-latest",
         "slevomat/coding-standard": "^8.26",
         "squizlabs/php_codesniffer": "^4.0",
@@ -122,7 +122,7 @@
             "endroid/installer": false
         },
         "platform": {
-            "php": "8.2"
+            "php": "8.5"
         },
         "optimize-autoloader": true,
         "sort-packages": true