Merge pull request #1924 from OpenConext/feature/sf-64

Upgrade to Symfony 6.4

Author: johanib

CHANGELOG.md

@@ -11,11 +11,16 @@ More information about our release strategy can be found in
 the [Development Guidelines](https://github.com/OpenConext/OpenConext-engineblock/wiki/Development-Guidelines#release-notes) on
 the EngineBlock wiki.
 
-## Unreleased
+## UNRELEASED 7.2.0? / 8.0.0?
+Upgrade to Symfony 6.4?
+Upgrade to `doctrine/dbal` 4
 
 Bugfixes:
 * Metadata push will now reject all metadata if any service contains invalid PHP syntax in its attribute manipulations (#1778)
 
+## 7.1.0
+SRAM integration
+
 ## 7.0.0
 Breaking changes please see: [upgrading](UPGRADING.md#700)
 

ci/qa-config/phpcs-legacy.xml

@@ -25,7 +25,7 @@
     <!-- legacy code style support -->
     <rule ref="PSR2">
         <exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
-        <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
+        <exclude name="Squiz.Classes.ValidClassName.NotPascalCase"/>
         <exclude name="PSR2.Classes.PropertyDeclaration.Underscore"/>
         <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
         <exclude name="Generic.Files.LineLength.TooLong"/>

ci/qa-config/rector.php

@@ -11,7 +11,7 @@
     ])
     ->withPhpSets()
     ->withComposerBased(doctrine: true, phpunit: true, symfony: true)
-    ->withAttributesSets(symfony: false, doctrine: true, phpunit: true)
+    ->withAttributesSets(symfony: true, doctrine: true, phpunit: true)
     ->withSkip([
         \Rector\Php53\Rector\Ternary\TernaryToElvisRector::class,
         \Rector\Php54\Rector\Array_\LongArrayToShortArrayRector::class,
@@ -29,7 +29,6 @@
         \Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector::class,
         \Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector::class,
         \Rector\Php80\Rector\FuncCall\ClassOnObjectRector::class,
-        \Rector\Php81\Rector\Array_\FirstClassCallableRector::class,
         \Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector::class,
         \Rector\Php81\Rector\Property\ReadOnlyPropertyRector::class,
         \Rector\DeadCode\Rector\StaticCall\RemoveParentCallWithoutParentRector::class,

composer.json

@@ -30,29 +30,27 @@
         "doctrine/orm": "^3.5.7",
         "guzzlehttp/guzzle": "^7.10",
         "incenteev/composer-parameter-handler": "^2.2",
-        "monolog/monolog": "^2.10",
+        "monolog/monolog": "^3.0",
         "openconext/monitor-bundle": "^4.2",
         "openconext/saml-value-object": "^3.0",
         "pimple/pimple": "^3.6",
         "ramsey/uuid": "^4.9.1",
         "robrichards/xmlseclibs": "^3.1.3",
-        "sensio/framework-extra-bundle": "^6.2.10",
         "simplesamlphp/saml2": "^4.19",
-        "symfony/asset": "^5.4.45",
-        "symfony/console": "^5.4.47",
-        "symfony/dotenv": "^5.4.48",
-        "symfony/expression-language": "^5.4.45",
+        "symfony/asset": "^6.4",
+        "symfony/console": "^6.4",
+        "symfony/dotenv": "^6.4",
+        "symfony/expression-language": "^6.4",
         "symfony/flex": "^2.9.0",
-        "symfony/form": "^5.4.45",
-        "symfony/framework-bundle": "^5.4.45",
-        "symfony/mailer": "5.4.*",
+        "symfony/form": "^6.4",
+        "symfony/framework-bundle": "^6.4",
+        "symfony/mailer": "6.4.*",
         "symfony/monolog-bundle": "^3.10",
-        "symfony/security-bundle": "^5.4.45",
-        "symfony/templating": "5.4.*",
-        "symfony/translation": "^5.4.45",
-        "symfony/twig-bundle": "^5.4.45",
-        "symfony/validator": "^5.4.48",
-        "symfony/yaml": "^5.4.45",
+        "symfony/security-bundle": "^6.4",
+        "symfony/translation": "^6.4",
+        "symfony/twig-bundle": "^6.4",
+        "symfony/validator": "^6.4",
+        "symfony/yaml": "^6.4",
         "twig/twig": "^3.22.0"
     },
     "require-dev": {
@@ -70,16 +68,15 @@
         "malukenho/docheader": "^1.1",
         "mockery/mockery": "^1.6.12",
         "phake/phake": "^4.6.1",
-        "phpcompatibility/php-compatibility": "^9.3.5",
         "phpmd/phpmd": "^2.15",
-        "phpunit/phpunit": "^10.5.58",
+        "phpunit/phpunit": "^11",
         "rector/rector": "^2.2.7",
-        "squizlabs/php_codesniffer": "^3.13.5",
-        "symfony/debug-bundle": "5.4.*",
-        "symfony/http-client": "5.4.*",
+        "squizlabs/php_codesniffer": "^4.0",
+        "symfony/debug-bundle": "6.4.*",
+        "symfony/http-client": "6.4.*",
         "symfony/phpunit-bridge": "^7.3.4",
-        "symfony/var-dumper": "5.4.*",
-        "symfony/web-profiler-bundle": "5.4.*"
+        "symfony/var-dumper": "6.4.*",
+        "symfony/web-profiler-bundle": "6.4.*"
     },
     "replace": {
         "symfony/polyfill-mbstring": "1.99",
@@ -134,13 +131,14 @@
         },
         "sort-packages": true,
         "allow-plugins": {
+            "endroid/installer": false,
             "symfony/flex": true
         }
     },
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "5.4.*"
+            "require": "6.4.*"
         },
         "symfony-var-dir": "var",
         "symfony-bin-dir": "bin",