Merge pull request #557 from OpenConext/feature/updates-nov25

Upgrade to symfony 7.4

Author: johanib

.github/workflows/test-integration.yml

@@ -22,4 +22,6 @@ jobs:
         run: composer install
 
       - name: Run QA tests
-        run: composer check
+        run: composer check-ci
+        env:
+          SYMFONY_DEPRECATIONS_HELPER: 999999

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.github/*.md
 /web/bundles/
 /web/app_dev.php
 /web/app_test.php

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+# 7.0.0 - unreleased
+**Notable Changes**
+- Upgrade to Symfony 7.4 (from 6.4)
+- Upgrade to PHPUnit 10 (from 9.x)
+- Upgrade to PHPStan 2.0 (from 1.x)
+- Migrate from annotations to attributes (PHP 8 attributes)
+
+**Important for System Administrators**
+Ensure the `database_server_version` parameter contains the correct MariaDB version. e.g. `10.6.23-MariaDB`
+
+
+**Improvements**
+- Upgrade all Symfony components to 7.4
+- Upgrade Stepup-Bundle to 7.0
+- Modernize codebase with PHP 8+ features
+- Fix various Symfony and Doctrine deprecations
+- Improved code quality with updated tooling
+
 # 6.0.2
 - Repair deprovisioning API calls
 - Restore deprovisioned user on new login (returing users)

README.md

@@ -7,19 +7,19 @@ This component is part of "Step-up Authentication as-a Service". See [Stepup-Dep
 
 ## Requirements
 
- * PHP 5.6+ or PHP7
+ * PHP 8.2
  * [Composer](https://getcomposer.org/)
  * A web server (Apache, Nginx)
- * MariaDB 10
+ * MariaDB 10.6
  * A working [Gateway](https://github.com/OpenConext/Stepup-Gateway)
 
 ## Installation
 
 Clone the repository or download the archive to a directory. Install the dependencies by running `composer install` and fill out the database credentials et cetera.
 
-Make sure to run database migrations using `bin/console middleware:migrations:migrate`.
+Make sure to run database migrations using `bin/console doctrine:migrations:migrate`.
 
-When using 'Stepup-Deploy' the 'deploy' entity manager should be used in order to use the correct credentials e.g. `bin/console middleware:migrations:migrate --em=deploy`
+When using 'Stepup-Deploy' the 'deploy' entity manager should be used in order to use the correct credentials e.g. `bin/console doctrine:migrations:migrate --em=deploy`
 
 ## Management API
 
@@ -31,6 +31,9 @@ Some of the configuration of the components is static (i.e. stored in parametere
 
 ## Development Notes
 
+### Technical debt
+ * https://github.com/broadway/event-store-dbal blocks upgrade to `doctrine/dbal:^4.0`
+
 ### Adding new events
 
 Whenever adding a new event, be sure to update `bin/config/events.yml`.

ci/qa/phpcs.xml

@@ -6,10 +6,7 @@
     </description>
 
     <exclude-pattern>src/*/*Bundle/Resources</exclude-pattern>
-    <exclude-pattern>src/*/*Bundle/Tests</exclude-pattern>
     <exclude-pattern>src/*/Bundle/*Bundle/Resources</exclude-pattern>
-    <exclude-pattern>src/*/Bundle/*Bundle/Tests</exclude-pattern>
-    <exclude-pattern>*/Tests/*</exclude-pattern>
     <exclude-pattern>*/Migrations/*</exclude-pattern>
 
     <!-- This is the rule we inherit from. If you want to exlude some specific rules, see the docs on how to do that -->
@@ -21,5 +18,18 @@
             <property name="lineLimit" value="120"/>
             <property name="absoluteLineLimit" value="150"/>
         </properties>
+      <exclude-pattern>*/Tests/*</exclude-pattern>
     </rule>
+
+    <rule ref="PSR1.Methods.CamelCapsMethodName">
+      <exclude-pattern>*/Tests/*</exclude-pattern>
+    </rule>
+
+    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
+    <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
+      <properties>
+        <property name="searchAnnotations" type="bool" value="true"/>
+      </properties>
+    </rule>
+    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
 </ruleset>

ci/qa/phplint.yaml

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

ci/qa/phpstan-baseline.neon

@@ -5,6 +5,7 @@ includes:
     - ../../vendor/phpstan/phpstan-symfony/extension.neon
 
 parameters:
+	treatPhpDocTypesAsCertain: false
 	level: 9
 	paths:
 		- ../../src

ci/qa/phpstan.neon

@@ -7,5 +7,5 @@ cd $(dirname $0)/../../
 
 # PHPUnit Bridge should always be used in Symfony applications. (https://symfony.com/doc/current/components/phpunit_bridge.html)
 # This will create a phpunit executable in /bin/ instead of /vendor/bin/
-./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --coverage-text --stop-on-error $1
+./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --stop-on-error $@
 ./vendor/bin/phpunit --configuration=ci/qa/phpunit.xml --testsuite=database

ci/qa/phpunit

@@ -1,18 +1,19 @@
 <?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="../../tests/bootstrap.php">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix="Test.php">../../src</directory>
-    </include>
-  </coverage>
+<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="../../tests/bootstrap.php"
+    cacheDirectory="../../var/qa/phpunit.cache"
+>
   <php>
     <ini name="error_reporting" value="-1"/>
     <ini name="memory_limit" value="256M"/>
     <server name="APP_ENV" value="test" force="true"/>
     <server name="SHELL_VERBOSITY" value="-1"/>
     <server name="KERNEL_CLASS" value="\Surfnet\StepupMiddleware\Kernel"/>
-    <env name="SYMFONY_DEPRECATIONS_HELPER" value="999999"/>
     <env name="APP_ENV" value="test" force="true"/>
   </php>
   <testsuites>
@@ -23,8 +24,4 @@
       <directory suffix="Test.php">../../tests/database</directory>
     </testsuite>
   </testsuites>
-  <listeners>
-    <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    <listener class="\Mockery\Adapter\Phpunit\TestListener"/>
-  </listeners>
 </phpunit>