Update baseline

Add return type

Update basle without composer.lock

Add symfony/flex to restrict sub-packages to 6.4 as well

Revert "Add symfony/flex to restrict sub-packages to 6.4 as well"

This reverts commit e1b56b1.

Fix http-foundation to 6.x

Remove 8.1 from matrix

Remove 8.1 from matrix and to experimental

Remove 8.1 from matrix and to experimental

Remove 8.1 from matrix and to experimental

Remove 8.1 from matrix and to experimental

Author: parijke

.github/workflows/test-integration.yml

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

ci/qa/phpstan-baseline.neon

@@ -21,7 +21,7 @@ parameters:
 			path: ../../src/DependencyInjection/Configuration.php
 
 		-
-			message: "#^Cannot call method scalarNode\\(\\) on Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeParentInterface\\|null\\.$#"
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeParentInterface\\:\\:scalarNode\\(\\)\\.$#"
 			count: 1
 			path: ../../src/DependencyInjection/Configuration.php
 
@@ -110,11 +110,6 @@ parameters:
 			count: 2
 			path: ../../src/Entity/HostedEntities.php
 
-		-
-			message: "#^Parameter \\#2 \\$array of function array_key_exists expects array, array\\|null given\\.$#"
-			count: 1
-			path: ../../src/Entity/HostedEntities.php
-
 		-
 			message: "#^Method Surfnet\\\\SamlBundle\\\\Entity\\\\IdentityProvider\\:\\:getSsoUrl\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -325,11 +320,41 @@ parameters:
 			count: 1
 			path: ../../src/Metadata/Metadata.php
 
+		-
+			message: "#^Property Surfnet\\\\SamlBundle\\\\Metadata\\\\MetadataConfiguration\\:\\:\\$assertionConsumerRoute type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: ../../src/Metadata/MetadataConfiguration.php
+
+		-
+			message: "#^Property Surfnet\\\\SamlBundle\\\\Metadata\\\\MetadataConfiguration\\:\\:\\$entityIdRoute type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: ../../src/Metadata/MetadataConfiguration.php
+
+		-
+			message: "#^Property Surfnet\\\\SamlBundle\\\\Metadata\\\\MetadataConfiguration\\:\\:\\$ssoRoute type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: ../../src/Metadata/MetadataConfiguration.php
+
 		-
 			message: "#^Method Surfnet\\\\SamlBundle\\\\Metadata\\\\MetadataFactory\\:\\:getUrl\\(\\) has parameter \\$routeDefinition with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: ../../src/Metadata/MetadataFactory.php
 
+		-
+			message: "#^Parameter \\#1 \\$publicKeyFile of method Surfnet\\\\SamlBundle\\\\Metadata\\\\MetadataFactory\\:\\:getCertificateData\\(\\) expects string, string\\|null given\\.$#"
+			count: 1
+			path: ../../src/Metadata/MetadataFactory.php
+
+		-
+			message: "#^Property Surfnet\\\\SamlBundle\\\\Signing\\\\KeyPair\\:\\:\\$privateKeyFile \\(string\\) does not accept string\\|null\\.$#"
+			count: 1
+			path: ../../src/Metadata/MetadataFactory.php
+
+		-
+			message: "#^Property Surfnet\\\\SamlBundle\\\\Signing\\\\KeyPair\\:\\:\\$publicKeyFile \\(string\\) does not accept string\\|null\\.$#"
+			count: 1
+			path: ../../src/Metadata/MetadataFactory.php
+
 		-
 			message: "#^Method Surfnet\\\\SamlBundle\\\\Monolog\\\\SamlAuthenticationLogger\\:\\:modifyContext\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -590,6 +615,11 @@ parameters:
 			count: 1
 			path: ../../src/Security/Authentication/AuthenticatedSessionStateHandler.php
 
+		-
+			message: "#^Cannot call method notice\\(\\) on Psr\\\\Log\\\\LoggerInterface\\|null\\.$#"
+			count: 1
+			path: ../../src/Security/Authentication/Handler/FailureHandler.php
+
 		-
 			message: "#^Method Surfnet\\\\SamlBundle\\\\Security\\\\Authentication\\\\Passport\\\\Badge\\\\SamlAttributesBadge\\:\\:__construct\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#"
 			count: 1

composer.json

@@ -12,6 +12,7 @@
         "robrichards/xmlseclibs": "^3.1.1",
         "simplesamlphp/saml2": "^4.6",
         "symfony/dependency-injection": "^6.3",
+        "symfony/http-foundation": "^6.3",
         "symfony/framework-bundle": "^6.3",
         "symfony/security-bundle": "^6.3",
         "symfony/templating": "^6.3",

src/DependencyInjection/Configuration.php

@@ -33,7 +33,7 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('surfnet_saml');
         $rootNode = $treeBuilder->getRootNode();