Upgrade simplesamlphp/saml2 to ^4.20.3 and fix moved Chunk namespace

.github/workflows/test-integration.yml

@@ -6,7 +6,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        php-versions: [ '8.2', '8.4']
+        php-versions: [ '8.3', '8.4']
         experimental: [false]
     timeout-minutes: 15
     name: PHP ${{ matrix.php-versions }} on Ubuntu latest. Experimental == ${{ matrix.experimental }}

ci/qa/phpstan-baseline.neon

@@ -486,12 +486,6 @@ parameters:
 			count: 1
 			path: ../../src/SAML2/AuthnRequest.php
 
-		-
-			message: '#^Method Surfnet\\SamlBundle\\SAML2\\AuthnRequest\:\:getAuthenticationContextClassRef\(\) should return string\|null but returns mixed\.$#'
-			identifier: return.type
-			count: 1
-			path: ../../src/SAML2/AuthnRequest.php
-
 		-
 			message: '#^Method Surfnet\\SamlBundle\\SAML2\\AuthnRequest\:\:getDestination\(\) should return string but returns string\|null\.$#'
 			identifier: return.type
@@ -528,12 +522,6 @@ parameters:
 			count: 1
 			path: ../../src/SAML2/AuthnRequest.php
 
-		-
-			message: '#^Parameter \#1 \$array of function reset expects array\|object, mixed given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../src/SAML2/AuthnRequest.php
-
 		-
 			message: '#^Parameter \#1 \$string of function base64_encode expects string, string\|false given\.$#'
 			identifier: argument.type
@@ -678,12 +666,6 @@ parameters:
 			count: 1
 			path: ../../src/SAML2/ReceivedAuthnRequest.php
 
-		-
-			message: '#^Method Surfnet\\SamlBundle\\SAML2\\ReceivedAuthnRequest\:\:getAuthenticationContextClassRef\(\) should return string\|null but returns mixed\.$#'
-			identifier: return.type
-			count: 1
-			path: ../../src/SAML2/ReceivedAuthnRequest.php
-
 		-
 			message: '#^Method Surfnet\\SamlBundle\\SAML2\\ReceivedAuthnRequest\:\:getScopingRequesterIds\(\) return type has no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -708,12 +690,6 @@ parameters:
 			count: 1
 			path: ../../src/SAML2/ReceivedAuthnRequest.php
 
-		-
-			message: '#^Parameter \#1 \$array of function reset expects array\|object, mixed given\.$#'
-			identifier: argument.type
-			count: 1
-			path: ../../src/SAML2/ReceivedAuthnRequest.php
-
 		-
 			message: '#^Parameter \#1 \$xml of static method SAML2\\Message\:\:fromXML\(\) expects DOMElement, DOMNode given\.$#'
 			identifier: argument.type

composer.json

@@ -6,12 +6,12 @@
     "license": "Apache-2.0",
     "minimum-stability": "stable",
     "require": {
-        "php": "^8.1",
+        "php": "^8.3",
         "ext-dom": "*",
         "ext-openssl": "*",
         "psr/log": "^3.0",
         "robrichards/xmlseclibs": "^3.1.4",
-        "simplesamlphp/saml2": "^4.6",
+        "simplesamlphp/saml2": "^4.20.3",
         "symfony/dependency-injection": "^6.3|^7.0",
         "symfony/framework-bundle": "^6.3|^7.0",
         "symfony/security-bundle": "^6.3|^7.0",
@@ -24,7 +24,6 @@
     "require-dev": {
         "ext-libxml": "*",
         "ext-zlib": "*",
-        "irstea/phpcpd-shim": "^6.0",
         "malukenho/docheader": "^1.1",
         "mockery/mockery": "^1.5",
         "overtrue/phplint": "*",
@@ -36,6 +35,7 @@
         "sebastian/exporter": "^6.3",
         "slevomat/coding-standard": "^8.24",
         "squizlabs/php_codesniffer": "^4.0",
+        "systemsdk/phpcpd": "8.0.0",
         "symfony/phpunit-bridge": "^7.3.4"
     },
     "scripts": {

src/SAML2/BridgeContainer.php

@@ -50,7 +50,7 @@ public function generateId(): string
         return '_' . bin2hex(openssl_random_pseudo_bytes(30));
     }
 
-    public function debugMessage($message, $type): void
+    public function debugMessage($message, string $type): void
     {
         if ($message instanceof DOMElement) {
             $message = $message->ownerDocument->saveXML($message);
@@ -63,12 +63,12 @@ public function debugMessage($message, $type): void
         $this->logger->debug($message, ['type' => $type]);
     }
 
-    public function redirect($url, $data = []): void
+    public function redirect(string $url, array $data = []): void
     {
         $this->notSupported(__METHOD__);
     }
 
-    public function postRedirect($url, $data = []): void
+    public function postRedirect(string $url, array $data = []): void
     {
         $this->notSupported(__METHOD__);
     }
@@ -77,15 +77,14 @@ public function postRedirect($url, $data = []): void
     public function getTempDir(): string
     {
         $this->notSupported(__METHOD__);
-        return '';
     }
 
     public function writeFile(string $filename, string $data, ?int $mode = null): void
     {
         $this->notSupported(__METHOD__);
     }
 
-    public function notSupported(string $method): void
+    public function notSupported(string $method): never
     {
         throw new BadMethodCallException(sprintf(
             "%s:%s may not be called in the Surfnet\\SamlBundle",

src/SAML2/Extensions/ExtensionsMapperTrait.php

@@ -18,7 +18,7 @@
 
 namespace Surfnet\SamlBundle\SAML2\Extensions;
 
-use SAML2\XML\Chunk as SAML2Chunk;
+use SimpleSAML\XML\Chunk as SAML2Chunk;
 
 trait ExtensionsMapperTrait
 {