Merge pull request #463 from OpenConext/feature/updates

Upgrade Symfony 6.4 > 7.4

Author: johanib

.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/phpstan-baseline.php

@@ -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/phpunit.xml

@@ -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.php

@@ -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 "$@"

ci/qa/rector.sh

@@ -1,5 +1,5 @@
 PHP_VERSION=82
-SYMFONY_VERSION=6
+SYMFONY_VERSION=7
 ENCORE=yes
 ASSETIC=no
 NODE_VERSION=20