Migrate to xsd-types

.github/workflows/interoperability.yml

@@ -82,6 +82,12 @@ jobs:
             wget https://mds.edugain.org/edugain-v2.xml -O /tmp/metadata/edugain.xml
             wget https://technical.edugain.org/mds-v2.cer -O /tmp/metadata/edugain-pub.crt
 
+      - name: Download eduID metadata & public key
+        if: steps.cache-metadata.outputs.cache-hit != 'true'
+        run: |
+            mkdir -p /tmp/metadata
+            wget https://metadata.eduid.cz/entities/eduid -O /tmp/metadata/eduid.xml
+            wget https://www.eduid.cz/docs/eduid/metadata/metadata.eduid.cz.crt.pem -O /tmp/metadata/eduid.crt
 
       - name: Download eduID metadata & public key
         if: steps.cache-metadata.outputs.cache-hit != 'true'

composer.json

@@ -26,21 +26,21 @@
         "ext-pcre": "*",
         "ext-zlib": "*",
 
-        "nyholm/psr7": "~1.8.2",
-        "psr/clock": "~1.0.0",
+        "nyholm/psr7": "~1.8",
+        "psr/clock": "~1.0",
         "psr/http-message": "~2.0",
-        "psr/log": "~2.3.1 || ~3.0.0",
-        "simplesamlphp/assert": "~1.8.1",
-        "simplesamlphp/xml-common": "~1.25.0",
-        "simplesamlphp/xml-security": "~1.13.4",
-        "simplesamlphp/xml-soap": "~1.7.0"
+        "psr/log": "~2.3 || ~3.0",
+        "simplesamlphp/assert": "~1.9",
+        "simplesamlphp/xml-common": "~2.3",
+        "simplesamlphp/xml-security": "~2.0",
+        "simplesamlphp/xml-soap": "~2.0"
     },
     "require-dev": {
         "ext-intl": "*",
 
-        "beste/clock": "~3.0.0",
-        "mockery/mockery": "~1.6.12",
-        "simplesamlphp/simplesamlphp-test-framework": "~1.10.2"
+        "beste/clock": "~3.0",
+        "mockery/mockery": "~1.6",
+        "simplesamlphp/simplesamlphp-test-framework": "~1.10"
     },
     "suggest": {
         "ext-soap": "*"
@@ -58,7 +58,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "v6.0.x-dev"
+            "dev-master": "v5.1.x-dev"
         }
     },
     "config": {
@@ -69,5 +69,15 @@
             "phpstan/extension-installer": true,
             "simplesamlphp/composer-xmlprovider-installer": true
         }
+    },
+    "scripts": {
+        "pre-commit": [
+            "vendor/bin/phpcs -p",
+            "vendor/bin/composer-require-checker check --config-file=tools/composer-require-checker.json composer.json",
+            "vendor/bin/phpstan analyze -c phpstan.neon",
+            "vendor/bin/phpstan analyze -c phpstan-dev.neon",
+            "vendor/bin/composer-unused",
+            "vendor/bin/phpunit --no-coverage --testdox"
+        ]
     }
 }

phpcs.xml

@@ -41,6 +41,8 @@
         <exclude-pattern>tests/SAML2/XML/saml/AuthnContextTest.php</exclude-pattern>
         <exclude-pattern>tests/SAML2/XML/saml/EncryptedAssertionTest.php</exclude-pattern>
         <exclude-pattern>tests/SAML2/XML/saml/EncryptedIDTest.php</exclude-pattern>
+        <exclude-pattern>tests/SAML2/XML/saml/SubjectConfirmationTest.php</exclude-pattern>
+        <exclude-pattern>tests/SAML2/XML/samlp/AuthnRequestTest.php</exclude-pattern>
         <exclude-pattern>tests/SAML2/XML/samlp/RequestedAuthnContextTest.php</exclude-pattern>
         <exclude-pattern>tests/SAML2/XML/samlp/StatusDetailTest.php</exclude-pattern>
         <exclude-pattern>tests/SAML2/XML/shibmd/KeyAuthorityTest.php</exclude-pattern>

phpstan-baseline-dev.neon

@@ -1,5 +1,17 @@
 parameters:
 	ignoreErrors:
+		-
+			message: '#^Dead catch \- SimpleSAML\\Assert\\AssertionFailedException is never thrown in the try block\.$#'
+			identifier: catch.neverThrown
+			count: 1
+			path: tests/InterOperability/EntityDescriptorTest.php
+
+		-
+			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\SAML2\\\\Utilities\\\\ArrayCollection'' and SimpleSAML\\SAML2\\Utilities\\ArrayCollection will always evaluate to true\.$#'
+			identifier: staticMethod.alreadyNarrowedType
+			count: 1
+			path: tests/SAML2/Assertion/ProcessorTest.php
+
 		-
 			message: '#^PHPDoc tag @var for property SimpleSAML\\Test\\SAML2\\Assertion\\Transformer\\NameIdDecryptionTransformerTest\:\:\$validator with type SimpleSAML\\SAML2\\Response\\Validation\\Validator is incompatible with native type SimpleSAML\\SAML2\\Signature\\Validator\.$#'
 			identifier: property.phpDocType
@@ -30,12 +42,24 @@ parameters:
 			count: 1
 			path: tests/SAML2/Assertion/Validation/AssertionValidatorTest.php
 
+		-
+			message: '#^Missing call to parent\:\:setUp\(\) method\.$#'
+			identifier: phpunit.callParent
+			count: 1
+			path: tests/SAML2/Assertion/Validation/ConstraintValidator/SpIsValidAudienceTest.php
+
 		-
 			message: '#^Parameter \#1 \$serviceProvider of method SimpleSAML\\SAML2\\Assertion\\Validation\\ConstraintValidator\\SpIsValidAudience\:\:setServiceProvider\(\) expects SimpleSAML\\SAML2\\Configuration\\ServiceProvider, Mockery\\MockInterface given\.$#'
 			identifier: argument.type
 			count: 3
 			path: tests/SAML2/Assertion/Validation/ConstraintValidator/SpIsValidAudienceTest.php
 
+		-
+			message: '#^Missing call to parent\:\:setUp\(\) method\.$#'
+			identifier: phpunit.callParent
+			count: 1
+			path: tests/SAML2/Assertion/Validation/ConstraintValidator/SubjectConfirmationResponseToMatchesTest.php
+
 		-
 			message: '#^Parameter \#1 \$response of class SimpleSAML\\SAML2\\Assertion\\Validation\\ConstraintValidator\\SubjectConfirmationResponseToMatches constructor expects SimpleSAML\\SAML2\\XML\\samlp\\Response, Mockery\\MockInterface given\.$#'
 			identifier: argument.type
@@ -60,32 +84,122 @@ parameters:
 			count: 3
 			path: tests/SAML2/Certificate/KeyLoaderTest.php
 
+		-
+			message: '#^Missing call to parent\:\:setUp\(\) method\.$#'
+			identifier: phpunit.callParent
+			count: 1
+			path: tests/SAML2/Certificate/KeyLoaderTest.php
+
 		-
 			message: '#^Parameter \#1 \$config of method SimpleSAML\\SAML2\\Certificate\\KeyLoader\:\:loadKeysFromConfiguration\(\) expects SimpleSAML\\SAML2\\Configuration\\CertificateProvider, Mockery\\MockInterface given\.$#'
 			identifier: argument.type
 			count: 3
 			path: tests/SAML2/Certificate/KeyLoaderTest.php
 
+		-
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\XMLSecurity\\\\Key\\\\PrivateKey'' and SimpleSAML\\XMLSecurity\\Key\\PrivateKey will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
+			count: 1
+			path: tests/SAML2/Certificate/PrivateKeyLoaderTest.php
+
+		-
+			message: '#^Missing call to parent\:\:setUp\(\) method\.$#'
+			identifier: phpunit.callParent
+			count: 1
+			path: tests/SAML2/Response/SignatureValidationTest.php
+
+		-
+			message: '#^Missing call to parent\:\:setUp\(\) method\.$#'
+			identifier: phpunit.callParent
+			count: 1
+			path: tests/SAML2/Response/Validation/ConstraintValidator/DestinationMatchesTest.php
+
 		-
 			message: '#^Parameter \#1 \$response of method SimpleSAML\\SAML2\\Response\\Validation\\ConstraintValidator\\DestinationMatches\:\:validate\(\) expects SimpleSAML\\SAML2\\XML\\samlp\\Response, Mockery\\MockInterface given\.$#'
 			identifier: argument.type
 			count: 2
 			path: tests/SAML2/Response/Validation/ConstraintValidator/DestinationMatchesTest.php
 
+		-
+			message: '#^Missing call to parent\:\:setUp\(\) method\.$#'
+			identifier: phpunit.callParent
+			count: 1
+			path: tests/SAML2/Response/Validation/ConstraintValidator/IsSuccessfulTest.php
+
 		-
 			message: '#^Parameter \#1 \$response of method SimpleSAML\\SAML2\\Response\\Validation\\ConstraintValidator\\IsSuccessful\:\:validate\(\) expects SimpleSAML\\SAML2\\XML\\samlp\\Response, Mockery\\MockInterface given\.$#'
 			identifier: argument.type
 			count: 2
 			path: tests/SAML2/Response/Validation/ConstraintValidator/IsSuccessfulTest.php
 
 		-
-			message: '#^Parameter \#1 \$xml of static method SimpleSAML\\SAML2\\XML\\saml\\Assertion\:\:fromXML\(\) expects DOMElement, DOMNode\|null given\.$#'
-			identifier: argument.type
+			message: '#^Missing call to parent\:\:setUp\(\) method\.$#'
+			identifier: phpunit.callParent
+			count: 1
+			path: tests/SAML2/Signature/PublicKeyValidatorTest.php
+
+		-
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''ArrayIterator'' and ArrayIterator will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
+			count: 1
+			path: tests/SAML2/Utilities/ArrayCollectionTest.php
+
+		-
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\SAML2\\\\Utilities\\\\ArrayCollection'' and SimpleSAML\\SAML2\\Utilities\\ArrayCollection will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
 			count: 2
-			path: tests/SAML2/Response/XmlSignatureWrappingTest.php
+			path: tests/SAML2/Utilities/ArrayCollectionTest.php
 
 		-
-			message: '#^Parameter \#1 \$requestedAuthnContexts of class SimpleSAML\\SAML2\\XML\\samlp\\RequestedAuthnContext constructor expects array\<SimpleSAML\\SAML2\\XML\\saml\\AuthnContextClassRef\|SimpleSAML\\SAML2\\XML\\saml\\AuthnContextDeclRef\>, array\<int, DOMDocument\|SimpleSAML\\SAML2\\XML\\saml\\AuthnContextDeclRef\> given\.$#'
-			identifier: argument.type
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\SAML2\\\\XML\\\\md\\\\AdditionalMetadataLocation'' and SimpleSAML\\SAML2\\XML\\md\\AdditionalMetadataLocation will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
+			count: 2
+			path: tests/SAML2/XML/md/EntityDescriptorTest.php
+
+		-
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\SAML2\\\\XML\\\\md\\\\ContactPerson'' and SimpleSAML\\SAML2\\XML\\md\\ContactPerson will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
+			count: 3
+			path: tests/SAML2/XML/md/EntityDescriptorTest.php
+
+		-
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\SAML2\\\\XML\\\\md\\\\SingleSignOnService'' and SimpleSAML\\SAML2\\XML\\md\\SingleSignOnService will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
+			count: 1
+			path: tests/SAML2/XML/md/IDPSSODescriptorTest.php
+
+		-
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\SAML2\\\\XML\\\\md\\\\AbstractRoleDescriptor'' and SimpleSAML\\SAML2\\XML\\md\\AbstractRoleDescriptor will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
+			count: 1
+			path: tests/SAML2/XML/md/RoleDescriptorTest.php
+
+		-
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\SAML2\\\\XML\\\\md\\\\ContactPerson'' and SimpleSAML\\SAML2\\XML\\md\\ContactPerson will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
+			count: 4
+			path: tests/SAML2/XML/md/RoleDescriptorTest.php
+
+		-
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\SAML2\\\\XML\\\\md\\\\KeyDescriptor'' and SimpleSAML\\SAML2\\XML\\md\\KeyDescriptor will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
+			count: 4
+			path: tests/SAML2/XML/md/RoleDescriptorTest.php
+
+		-
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\SAML2\\\\XML\\\\saml\\\\NameID'' and SimpleSAML\\SAML2\\XML\\saml\\NameID will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
+			count: 1
+			path: tests/SAML2/XML/saml/AssertionTest.php
+
+		-
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\SAML2\\\\XML\\\\saml\\\\NameID'' and array\<SimpleSAML\\SAML2\\XML\\saml\\AttributeValue\|SimpleSAML\\SAML2\\XML\\saml\\IdentifierInterface\> will always evaluate to false\.$#'
+			identifier: method.impossibleType
+			count: 4
+			path: tests/SAML2/XML/saml/AssertionTest.php
+
+		-
+			message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''SimpleSAML\\\\Test\\\\SAML2\\\\CustomStatement'' and SimpleSAML\\Test\\SAML2\\CustomStatement will always evaluate to true\.$#'
+			identifier: method.alreadyNarrowedType
 			count: 1
-			path: tests/SAML2/XML/samlp/RequestedAuthnContextTest.php
+			path: tests/SAML2/XML/saml/StatementTest.php