Merge pull request #136 from OpenConext/feature/fix_typo

Fix erroneous "7" instead of "^7" constraint.

Author: johanib

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 7.0.2
+- Fix version constraint error in `symfony/templating` requirement
+
+# 7.0.1 
+- Update xmlseclibs to version 3.1.4
+- Mark as incompatible with symfony/http-foundation >=8.0
+
+
 # 7.0.0
 - Add SF 7 support
 - Upgrade dev & qa tooling

ci/qa/phpstan-baseline.neon

@@ -24,42 +24,6 @@ parameters:
 			count: 5
 			path: ../../src/DependencyInjection/Configuration.php
 
-		-
-			message: '#^Method Surfnet\\SamlBundle\\DependencyInjection\\Configuration\:\:addHostedSection\(\) has parameter \$node with generic class Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition but does not specify its types\: TParent$#'
-			identifier: missingType.generics
-			count: 1
-			path: ../../src/DependencyInjection/Configuration.php
-
-		-
-			message: '#^Method Surfnet\\SamlBundle\\DependencyInjection\\Configuration\:\:addRemoteIdentityProviderConfiguration\(\) has parameter \$arrayNode with generic class Symfony\\Component\\Config\\Definition\\Builder\\NodeBuilder but does not specify its types\: TParent$#'
-			identifier: missingType.generics
-			count: 1
-			path: ../../src/DependencyInjection/Configuration.php
-
-		-
-			message: '#^Method Surfnet\\SamlBundle\\DependencyInjection\\Configuration\:\:addRemoteIdentityProviderSection\(\) has parameter \$remoteNode with generic class Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition but does not specify its types\: TParent$#'
-			identifier: missingType.generics
-			count: 1
-			path: ../../src/DependencyInjection/Configuration.php
-
-		-
-			message: '#^Method Surfnet\\SamlBundle\\DependencyInjection\\Configuration\:\:addRemoteIdentityProvidersSection\(\) has parameter \$remoteNode with generic class Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition but does not specify its types\: TParent$#'
-			identifier: missingType.generics
-			count: 1
-			path: ../../src/DependencyInjection/Configuration.php
-
-		-
-			message: '#^Method Surfnet\\SamlBundle\\DependencyInjection\\Configuration\:\:addRemoteSection\(\) has parameter \$rootNode with generic class Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition but does not specify its types\: TParent$#'
-			identifier: missingType.generics
-			count: 1
-			path: ../../src/DependencyInjection/Configuration.php
-
-		-
-			message: '#^Method Surfnet\\SamlBundle\\DependencyInjection\\Configuration\:\:addRemoteServiceProvidersSection\(\) has parameter \$remoteNode with generic class Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition but does not specify its types\: TParent$#'
-			identifier: missingType.generics
-			count: 1
-			path: ../../src/DependencyInjection/Configuration.php
-
 		-
 			message: '#^Method Surfnet\\SamlBundle\\DependencyInjection\\SurfnetSamlExtension\:\:parseCertificateData\(\) has parameter \$provider with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue

composer.json

@@ -15,7 +15,7 @@
         "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",
+        "symfony/templating": "^6.3|^7.0",
         "twig/twig": "^3"
     },
     "conflict": {

src/SAML2/Attribute/AttributeDictionary.php

@@ -75,11 +75,15 @@ public function addAttributeDefinition(AttributeDefinition $attributeDefinition)
         $this->attributeDefinitionsByName[$attributeDefinition->getName()] = $attributeDefinition;
 
         if ($attributeDefinition->hasUrnMace()) {
-            $this->attributeDefinitionsByUrn[$attributeDefinition->getUrnMace()] = $attributeDefinition;
+            $urnMace = $attributeDefinition->getUrnMace();
+            assert(is_string($urnMace));
+            $this->attributeDefinitionsByUrn[$urnMace] = $attributeDefinition;
         }
 
         if ($attributeDefinition->hasUrnOid()) {
-            $this->attributeDefinitionsByUrn[$attributeDefinition->getUrnOid()] = $attributeDefinition;
+            $urnOid = $attributeDefinition->getUrnOid();
+            assert(is_string($urnOid));
+            $this->attributeDefinitionsByUrn[$urnOid] = $attributeDefinition;
         }
     }