Upgrade Symfony 6.4 > 7.4

.github/dependabot.yml

@@ -25,6 +25,8 @@ updates:
           - "*"
   # Maintain dependencies for npm
   - package-ecosystem: "npm"
+    cooldown:
+      default-days: 14
     directories:
       - "/"
     schedule:

.github/workflows/test-integration.yml

@@ -1,5 +1,10 @@
 name: Run QA tests (static analysis, lint and unit tests)
-on: [pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
 
 jobs:
   run-qa-tests:
@@ -26,4 +31,4 @@ jobs:
         run: yarn encore prod
 
       - name: Run QA tests
-        run: composer check
+        run: composer check-ci

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 7.0.0
+- Update to Symfony 7.4
+
 ## 6.0.1
 - Ensure the correct error page is displayed when authentication fails #332
 - Upgrade of numerous NPM and Composer dependencies

ci/qa/phpcbf

@@ -3,4 +3,4 @@
 cd $(dirname $0)/../../
 
 # https://github.com/squizlabs/PHP_CodeSniffer/wiki/Fixing-Errors-Automatically
-./vendor/bin/phpcbf --standard=ci/qa/phpcs.xml $1
+./vendor/bin/phpcbf --standard=ci/qa/phpcs.xml src $1

ci/qa/phplint.yaml

@@ -1,7 +1,7 @@
 path: [./src, ./tests]
 jobs: 10
-cache: /var/qa/phplint.cache
+cache-dir: var/cache/qa/phplint.cache
 extensions:
   - php
 exclude:
-  - vendor
+  - vendor

ci/qa/phpunit.xml

@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="../../config/bootstrap.php">
-  <coverage processUncoveredFiles="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true"
+         bootstrap="../../config/bootstrap.php"
+         cacheDirectory="../../var/qa/phpunit.cache"
+
+>
+  <coverage>
+  </coverage>
+  <source>
     <include>
-      <directory suffix="Test.php">../../src</directory>
+      <directory suffix=".php">../../src</directory>
     </include>
-  </coverage>
+  </source>
   <php>
     <ini name="error_reporting" value="-1"/>
     <server name="APP_ENV" value="test" force="true"/>
     <server name="SHELL_VERBOSITY" value="-1"/>
     <server name="KERNEL_CLASS" value="\App\Kernel"/>
-    <env name="SYMFONY_DEPRECATIONS_HELPER" value="999999"/>
+    <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0&amp;max[self]=0"/>
   </php>
   <testsuites>
     <testsuite name="Project Test Suite">
       <directory suffix="Test.php">../../src</directory>
     </testsuite>
   </testsuites>
-  <listeners>
-    <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-  </listeners>
 </phpunit>

ci/qa/rector.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPaths([
+         __DIR__ . '/../../ci',
+         __DIR__ . '/../../config',
+         __DIR__ . '/../../src',
+         __DIR__ . '/../../templates',
+    ])
+    ->withPhpSets()
+    ->withAttributesSets(all: true)
+    ->withComposerBased(twig: true, doctrine: true, phpunit: true, symfony: true)
+    ->withPHPStanConfigs([__DIR__.'/phpstan.neon'])
+    ->withPreparedSets(deadCode: true)
+;

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,5 +1,5 @@
 PHP_VERSION=82
-SYMFONY_VERSION=6
+SYMFONY_VERSION=7
 ENCORE=yes
 ASSETIC=no
 NODE_VERSION=20

composer.json

@@ -1,7 +1,6 @@
 {
     "name": "surfnet/stepup-ra",
     "license": "Apache-2.0",
-    "version": "0",
     "description": "The SURFnet Step-up Registration Authority application allows Registration Authorities to vet identities by combining a real-world identity, federated identity and a token.",
     "autoload": {
         "psr-4": {
@@ -16,48 +15,48 @@
         "php": "^8.2",
         "ext-dom": "*",
         "ext-openssl": "*",
-        "doctrine/annotations": "^2.0",
-        "guzzlehttp/guzzle": "^7",
-        "incenteev/composer-parameter-handler": "~2.0",
-        "jms/translation-bundle": "^2.1",
-        "knplabs/knp-paginator-bundle": "^6.0",
-        "nelmio/security-bundle": "^3.0",
-        "openconext/monitor-bundle": "^4.2",
-        "surfnet/stepup-bundle": "^6.0",
-        "surfnet/stepup-middleware-client-bundle": "^5.3.0",
-        "surfnet/stepup-saml-bundle": "^6.0",
-        "symfony/asset": "6.4.*",
-        "symfony/expression-language": "6.4.*",
-        "symfony/flex": "^v2.4.3",
-        "symfony/form": "6.4.*",
-        "symfony/framework-bundle": "6.4.*",
-        "symfony/http-foundation": "6.4.*",
-        "symfony/monolog-bundle": "^3.5",
-        "symfony/runtime": "6.4.*",
-        "symfony/security-bundle": "6.4.*",
-        "symfony/translation": "6.4.*",
-        "symfony/twig-bundle": "6.4.*",
-        "symfony/validator": "6.4.*",
-        "symfony/webpack-encore-bundle": "^1.7",
-        "twig/extra-bundle": "^3.0",
-        "twig/twig": "^3.0"
+        "doctrine/annotations": "^2.0.2",
+        "guzzlehttp/guzzle": "^7.10",
+        "incenteev/composer-parameter-handler": "^2.3",
+        "jms/translation-bundle": "^2.6",
+        "knplabs/knp-paginator-bundle": "^6.10",
+        "nelmio/security-bundle": "^3.7",
+        "openconext/monitor-bundle": "^4.3.1",
+        "surfnet/stepup-bundle": "^7.0.1",
+        "surfnet/stepup-middleware-client-bundle": "^6.0",
+        "surfnet/stepup-saml-bundle": "^7.0.1",
+        "symfony/asset": "7.4.*",
+        "symfony/expression-language": "7.4.*",
+        "symfony/flex": "^2.10.0",
+        "symfony/form": "7.4.*",
+        "symfony/framework-bundle": "7.4.*",
+        "symfony/http-foundation": "7.4.*",
+        "symfony/monolog-bundle": "^v4.0.1",
+        "symfony/runtime": "7.4.*",
+        "symfony/security-bundle": "7.4.*",
+        "symfony/translation": "7.4.*",
+        "symfony/twig-bundle": "7.4.*",
+        "symfony/validator": "7.4.*",
+        "symfony/webpack-encore-bundle": "^2.4",
+        "twig/extra-bundle": "^3.22.2",
+        "twig/twig": "^3.22.2"
     },
     "require-dev": {
-        "malukenho/docheader": "^1.0.0",
-        "matthiasnoback/symfony-config-test": "^4.0",
-        "mockery/mockery": "^1.0",
-        "overtrue/phplint": "^9.0",
-        "phpmd/phpmd": "^2.6",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-symfony": "^1.3",
-        "phpunit/phpunit": "^9.5",
-        "rector/rector": "^1.0",
-        "slevomat/coding-standard": "^8.13",
-        "squizlabs/php_codesniffer": "^3.4",
-        "symfony/maker-bundle": "^1.19",
-        "symfony/phpunit-bridge": "6.4.*",
-        "symfony/stopwatch": "^5.1",
-        "symfony/web-profiler-bundle": "6.4.*"
+        "malukenho/docheader": "^1.1.0",
+        "matthiasnoback/symfony-config-test": "^6.1",
+        "mockery/mockery": "^1.6.12",
+        "overtrue/phplint": "^9.7.1",
+        "phpmd/phpmd": "^2.15",
+        "phpstan/phpstan": "^2.1.33",
+        "phpstan/phpstan-symfony": "^2.0.9",
+        "phpunit/phpunit": "^11.0",
+        "rector/rector": "^2.3",
+        "slevomat/coding-standard": "^8.26",
+        "squizlabs/php_codesniffer": "^4.0",
+        "symfony/maker-bundle": "^1.65.1",
+        "symfony/phpunit-bridge": "7.4.*",
+        "symfony/stopwatch": "^7.4",
+        "symfony/web-profiler-bundle": "7.4.*"
     },
     "conflict": {
         "symfony/symfony": "*"
@@ -76,10 +75,20 @@
             "@auto-scripts"
         ],
         "frontend-install": [
-            "yarn install",
-            "yarn encore production"
+            "yarn install --frozen-lockfile",
+            "yarn encore production",
+            "./bin/console cache:clear",
+            "@fix-dev-permissions"
+        ],
+        "fix-dev-permissions": [
+            "chown -R www-data:www-data /var/www/html/var/log",
+            "chown -R www-data:www-data /var/www/html/var/cache"
         ],
         "check": [
+            "@check-ci",
+            "@rector"
+        ],
+        "check-ci": [
             "@phplint",
             "@phpmd",
             "@phpcs",
@@ -90,6 +99,8 @@
         ],
         "phplint": "./ci/qa/phplint",
         "license-headers": "./ci/qa/docheader",
+        "rector": "./ci/qa/rector.sh --dry-run",
+        "rector-fix": "./ci/qa/rector.sh",
         "phpmd": "./ci/qa/phpmd",
         "phpcs": "./ci/qa/phpcs",
         "phpstan": "./ci/qa/phpstan",
@@ -137,7 +148,7 @@
         },
         "symfony": {
             "allow-contrib": false,
-            "require": "6.4.*"
+            "require": "7.4.*"
         },
         "incenteev-parameters": [
             {
@@ -150,5 +161,6 @@
                 "file": "config/openconext/global_view_parameters.yaml"
             }
         ]
-    }
+    },
+    "type": "project"
 }