Update symfony 6 > 7

johanib · johanib · commit 64925e053ba2 · 2025-11-17T12:23:46.000+01:00
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -6,16 +6,9 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        php-versions: [ '8.2']
+        php-versions: [ '8.2', '8.4']
         experimental: [false]
-        include:
-          - php-versions: '8.1'
-            experimental: true
-          - php-versions: '8.3'
-            experimental: true
-          - php-versions: '8.4'
-            experimental: true
-    timeout-minutes: 30
+    timeout-minutes: 15
     name: PHP ${{ matrix.php-versions }} on Ubuntu latest. Experimental == ${{ matrix.experimental }}
     steps:
       - name: Install PHP
@@ -29,7 +22,7 @@ jobs:
         continue-on-error: ${{ matrix.experimental }}
       - id: checks
         name: Run CI tests
-        run: composer check
+        run: composer check-ci
         continue-on-error: ${{ matrix.experimental }}
       - name: Output log files on failure
         if: failure()
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 7.0.0
+- Add SF 7 support
+- Upgrade dev & qa tooling
+
 # 6.0.0
 - Add SF 6 support
 - Require PHP 8.1
diff --git a/ci/qa/docheader b/ci/qa/docheader
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+cd $(dirname $0)/../../
+
+./vendor/bin/docheader --no-ansi --docheader=ci/qa/docheader.template check src/
+
diff --git a/ci/qa/docheader.template b/ci/qa/docheader.template
@@ -0,0 +1,16 @@
+/**
+ * Copyright %regexp:\d{4}% SURFnet %regexp:(B.V.|bv)%
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
diff --git a/ci/qa/phpcpd b/ci/qa/phpcpd
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+cd $(dirname $0)/../../
+
+# https://github.com/sebastianbergmann/phpcpd
+vendor/bin/phpcpd ./src
diff --git a/ci/qa/phpunit.xml b/ci/qa/phpunit.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.6/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/11.5/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="../../vendor/autoload.php"
+         cacheDirectory="../../var/qa/phpunit.cache"
 >
     <php>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
@@ -18,16 +19,4 @@
             <directory>../../src/Tests/Component</directory>
         </testsuite>
     </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory>../../src</directory>
-        </include>
-        <exclude>
-            <directory>../../src/Tests</directory>
-        </exclude>
-    </coverage>
-    <listeners>
-        <listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-        <listener class="\Mockery\Adapter\Phpunit\TestListener"/>
-    </listeners>
 </phpunit>
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "surfnet/stepup-saml-bundle",
     "type": "symfony-bundle",
-    "description": "A Symfony 6 bundle that integrates the simplesamlphp\\saml2 library with Symfony.",
+    "description": "A Symfony 7 bundle that integrates the simplesamlphp\\saml2 library with Symfony.",
     "keywords": ["surfnet", "StepUp", "simplesamlphp", "SAML", "SAML2"],
     "license": "Apache-2.0",
     "minimum-stability": "stable",
@@ -12,15 +12,17 @@
         "psr/log": "^3.0",
         "robrichards/xmlseclibs": "^3.1.1",
         "simplesamlphp/saml2": "^4.6",
-        "symfony/dependency-injection": "^6.3",
-        "symfony/framework-bundle": "^6.3",
-        "symfony/security-bundle": "^6.3",
-        "symfony/templating": "^6.3",
+        "symfony/dependency-injection": "^6.3|^7.0",
+        "symfony/framework-bundle": "^6.3|^7.0",
+        "symfony/security-bundle": "^6.3|^7.0",
+        "symfony/templating": "^6.3|7.0",
         "twig/twig": "^3"
     },
     "require-dev": {
         "ext-libxml": "*",
         "ext-zlib": "*",
+        "irstea/phpcpd-shim": "^6.0",
+        "malukenho/docheader": "^1.1",
         "mockery/mockery": "^1.5",
         "overtrue/phplint": "*",
         "phpmd/phpmd": "^2.6",
@@ -31,16 +33,23 @@
         "sebastian/exporter": "^6.3",
         "slevomat/coding-standard": "^8.24",
         "squizlabs/php_codesniffer": "^4.0",
-        "symfony/phpunit-bridge": "^6.3"
+        "symfony/phpunit-bridge": "^7.3.4"
     },
     "scripts": {
         "check": [
-            "@composer-validate",
-            "@phplint",
-            "@phpcs",
-            "@phpmd",
-            "@phpstan",
-            "@test"
+          "@check-ci",
+          "@rector"
+        ],
+        "check-ci": [
+          "@composer-validate",
+          "@license-headers",
+          "@phplint",
+          "@phpcpd",
+          "@phpcs",
+          "@phpmd",
+          "@test",
+          "@phpstan",
+          "@composer audit"
         ],
         "composer-validate": "./ci/qa/validate",
         "phplint": "./ci/qa/phplint",
@@ -50,6 +59,7 @@
         "phpstan": "./ci/qa/phpstan",
         "phpstan-baseline": "./ci/qa/phpstan-update-baseline",
         "test": "./ci/qa/phpunit",
+        "license-headers": "./ci/qa/docheader",
         "phpcbf": "./ci/qa/phpcbf",
         "rector":  "./ci/qa/rector.sh --dry-run",
         "rector-fix":  "./ci/qa/rector.sh"
@@ -70,7 +80,8 @@
         "sort-packages": true,
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "simplesamlphp/composer-xmlprovider-installer": true
         }
     }
 }
diff --git a/src/SAML2/Attribute/ConfigurableAttributeSetFactory.php b/src/SAML2/Attribute/ConfigurableAttributeSetFactory.php
@@ -31,7 +31,7 @@ public static function configureWhichAttributeSetToCreate(mixed $attributeSetCla
             throw InvalidArgumentException::invalidType('non-empty string', 'attributeSetClassName', $attributeSetClassName);
         }
 
-        if (!is_a($attributeSetClassName, '\Surfnet\SamlBundle\SAML2\Attribute\AttributeSetFactory', true)) {
+        if (!is_a($attributeSetClassName, AttributeSetFactory::class, true)) {
             throw new InvalidArgumentException(sprintf(
                 'Cannot use class "%s": it must implement "%s"',
                 $attributeSetClassName,
diff --git a/src/SAML2/Extensions/Chunk.php b/src/SAML2/Extensions/Chunk.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2021 SURF B.V.
+ * Copyright 2025 SURFnet bv
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/SAML2/Extensions/Extensions.php b/src/SAML2/Extensions/Extensions.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2021 SURF B.V.
+ * Copyright 2025 SURFnet bv
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+
 namespace Surfnet\SamlBundle\SAML2\Extensions;
 
 class Extensions
diff --git a/src/SAML2/Extensions/GsspUserAttributesChunk.php b/src/SAML2/Extensions/GsspUserAttributesChunk.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2021 SURF B.V.
+ * Copyright 2025 SURFnet bv
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/Tests/Component/Extensions/AuthnRequestExtensionsTest.php b/src/Tests/Component/Extensions/AuthnRequestExtensionsTest.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /**
- * Copyright 2021 SURF B.V.
+ * Copyright 2025 SURFnet bv
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+
 namespace Surfnet\SamlBundle\Tests\Component\Extensions;
 
 use DOMDocument;
diff --git a/src/Tests/Component/Extensions/ChunkSerializationTest.php b/src/Tests/Component/Extensions/ChunkSerializationTest.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /**
- * Copyright 2021 SURF B.V.
+ * Copyright 2025 SURFnet bv
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/Tests/Component/Metadata/MetadataFactoryTest.php b/src/Tests/Component/Metadata/MetadataFactoryTest.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /**
- * Copyright 2021 SURF B.V.
+ * Copyright 2025 SURFnet bv
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,9 +59,6 @@ public function setUp(): void
         $this->xsdValidator = new XsdValidator();
     }
 
-    /**
-     * Helper method to assert XML document is valid against XSD schema
-     */
     private function assertXmlIsValidAgainstXsd(DOMDocument $document, string $xsdPath): void
     {
         $errors = $this->xsdValidator->validate($document, $xsdPath);
diff --git a/src/Tests/Component/Metadata/XsdValidator.php b/src/Tests/Component/Metadata/XsdValidator.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /**
- * Copyright 2021 SURF B.V.
+ * Copyright 2025 SURFnet bv
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,18 +20,8 @@
 
 use DOMDocument;
 
-/**
- * Validates XML documents against XSD schemas
- */
 class XsdValidator
 {
-    /**
-     * Validate an XML document against an XSD schema
-     *
-     * @param DOMDocument $document The XML document to validate
-     * @param string $xsdPath Path to the XSD schema file
-     * @return array Empty array if valid, array of error messages if invalid
-     */
     public function validate(DOMDocument $document, string $xsdPath): array
     {
         if (!file_exists($xsdPath)) {
@@ -59,13 +49,6 @@ public function validate(DOMDocument $document, string $xsdPath): array
         return [];
     }
 
-    /**
-     * Check if an XML document is valid against an XSD schema
-     *
-     * @param DOMDocument $document The XML document to validate
-     * @param string $xsdPath Path to the XSD schema file
-     * @return bool True if valid, false otherwise
-     */
     public function isValid(DOMDocument $document, string $xsdPath): bool
     {
         return empty($this->validate($document, $xsdPath));
diff --git a/src/Tests/Component/Metadata/XsdValidatorTest.php b/src/Tests/Component/Metadata/XsdValidatorTest.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /**
- * Copyright 2026 SURF B.V.
+ * Copyright 2025 SURFnet bv
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/Tests/Unit/Metadata/MetadataFactoryTest.php b/src/Tests/Unit/Metadata/MetadataFactoryTest.php
@@ -1,5 +1,20 @@
 <?php
 
+/**
+ * Copyright 2025 SURFnet bv
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 namespace Surfnet\SamlBundle\Tests\Unit\Metadata;
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public static function configureWhichAttributeSetToCreate(mixed $attributeSetCla`
`31`	`31`	`throw InvalidArgumentException::invalidType('non-empty string', 'attributeSetClassName', $attributeSetClassName);`
`32`	`32`	`}`
`33`	`33`
`34`		`- if (!is_a($attributeSetClassName, '\Surfnet\SamlBundle\SAML2\Attribute\AttributeSetFactory', true)) {`
	`34`	`+ if (!is_a($attributeSetClassName, AttributeSetFactory::class, true)) {`
`35`	`35`	`throw new InvalidArgumentException(sprintf(`
`36`	`36`	`'Cannot use class "%s": it must implement "%s"',`
`37`	`37`	`$attributeSetClassName,`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`/**`
`4`		`- * Copyright 2021 SURF B.V.`
	`4`	`+ * Copyright 2025 SURFnet bv`
`5`	`5`	`*`
`6`	`6`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`7`	`7`	`* you may not use this file except in compliance with the License.`