WIP: Migrate to xsd-types

Author: tvdijen

phpstan-baseline.neon

@@ -90,11 +90,6 @@ parameters:
 			count: 2
 			path: src/Certificate/PrivateKeyLoader.php
 
-		-
-			message: "#^PHPDoc tag @param for parameter \\$qName with type SimpleSAML\\\\XML\\\\Type\\\\QNameValue\\|null is not subtype of native type SimpleSAML\\\\XML\\\\Type\\\\QNameValue\\.$#"
-			count: 1
-			path: src/Compat/AbstractContainer.php
-
 		-
 			message: "#^Call to method getArray\\(\\) on an unknown class SimpleSAML\\\\Configuration\\.$#"
 			count: 1
@@ -261,7 +256,7 @@ parameters:
 			path: src/XML/mdui/Keywords.php
 
 		-
-			message: "#^Call to an undefined method SimpleSAML\\\\XML\\\\Type\\\\ValueTypeInterface\\:\\:toArray\\(\\)\\.$#"
+			message: "#^Call to an undefined method SimpleSAML\\\\XMLSchema\\\\Type\\\\Interface\\\\ValueTypeInterface\\:\\:toArray\\(\\)\\.$#"
 			count: 1
 			path: src/XML/mdui/Keywords.php
 

src/Assert/SAMLStringTrait.php

@@ -6,7 +6,7 @@
 
 use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
 
 /**
  * @package simplesamlphp/saml2

src/Binding/SOAP.php

@@ -15,10 +15,10 @@
 use SimpleSAML\SAML2\XML\samlp\AbstractMessage;
 use SimpleSAML\SAML2\XML\samlp\MessageFactory;
 use SimpleSAML\SAML2\XML\samlp\Response as SAML2_Response;
-use SimpleSAML\SOAP\Utils\XPath;
-use SimpleSAML\SOAP\XML\env_200106\{Body, Envelope, Header};
+use SimpleSAML\SOAP11\Type\MustUnderstandValue;
+use SimpleSAML\SOAP11\Utils\XPath;
+use SimpleSAML\SOAP11\XML\{Body, Envelope, Header};
 use SimpleSAML\XML\DOMDocumentFactory;
-use SimpleSAML\XML\Type\BooleanValue;
 
 use function file_get_contents;
 
@@ -43,7 +43,7 @@ public function getOutputToSend(AbstractMessage $message)
         // profile, this is the Response itself.
         if ($message instanceof SAML2_Response) {
             $requestAuthenticated = new RequestAuthenticated(
-                BooleanValue::fromBoolean(true),
+                MustUnderstandValue::fromBoolean(true),
             );
 
             $destination = $this->destination ?: $message->getDestination()?->getValue();

src/Compat/AbstractContainer.php

@@ -9,7 +9,7 @@
 use SimpleSAML\SAML2\Assert\Assert;
 use SimpleSAML\SAML2\XML\ExtensionPointInterface;
 use SimpleSAML\XML\{AbstractElement, ElementInterface};
-use SimpleSAML\XML\Type\QNameValue;
+use SimpleSAML\XMLSchema\Type\QNameValue;
 use SimpleSAML\XMLSecurity\Alg\Encryption\EncryptionAlgorithmFactory;
 use SimpleSAML\XMLSecurity\Alg\KeyTransport\KeyTransportAlgorithmFactory;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
@@ -79,7 +79,7 @@ public function registerExtensionHandler(string $class): void
      * Such classes must have been registered previously by calling registerExtensionHandler(), and they must
      * extend \SimpleSAML\XML\AbstractElement.
      *
-     * @param \SimpleSAML\XML\Type\QNameValue|null $qName The qualified name of the element.
+     * @param \SimpleSAML\XMLSchema\Type\QNameValue $qName The qualified name of the element.
      *
      * @return string|null The fully-qualified name of a class extending \SimpleSAML\XML\AbstractElement and
      * implementing support for the given element, or null if no such class has been registered before.
@@ -103,7 +103,7 @@ public function getElementHandler(QNameValue $qName): ?string
      * Such classes must have been registered previously by calling registerExtensionHandler(), and they must
      * implement \SimpleSAML\SAML11\XML\saml\ExtensionPointInterface.
      *
-     * @param \SimpleSAML\XML\Type\QNameValue $qName The qualified name of the extension.
+     * @param \SimpleSAML\XMLSchema\Type\QNameValue $qName The qualified name of the extension.
      * @return string|null The fully-qualified name of a class implementing
      *  \SimpleSAML\SAML11\XML\saml\ExtensionPointInterface or null if no such class has been registered before.
      * @psalm-return class-string|null

src/SOAPClient.php

@@ -10,10 +10,8 @@
 use SimpleSAML\SAML2\Compat\ContainerSingleton;
 use SimpleSAML\SAML2\XML\samlp\AbstractMessage;
 use SimpleSAML\SAML2\XML\samlp\MessageFactory;
-use SimpleSAML\SOAP\Utils\XPath;
-use SimpleSAML\SOAP\XML\env_200106\Body;
-use SimpleSAML\SOAP\XML\env_200106\Envelope;
-use SimpleSAML\SOAP\XML\env_200106\Fault;
+use SimpleSAML\SOAP11\Utils\XPath;
+use SimpleSAML\SOAP11\XML\{Body, Envelope, Fault};
 use SimpleSAML\Utils\Config;
 use SimpleSAML\Utils\Crypto;
 use SimpleSAML\XML\Chunk;
@@ -255,7 +253,7 @@ public static function validateSSL(string $data, XMLSecurityKey $key): void
      * Extracts the SOAP Fault from SOAP message
      *
      * @param \DOMDocument $soapMessage Soap response needs to be type DOMDocument
-     * @return \SimpleSAML\SOAP\XML\env_200106\Fault|null
+     * @return \SimpleSAML\SOAP11\XML\Fault|null
      */
     private function getSOAPFault(DOMDocument $soapMessage): ?Fault
     {

src/Type/AnyURIListValue.php

@@ -7,8 +7,8 @@
 use SimpleSAML\SAML2\Assert\Assert;
 use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\SAML2\Type\SAMLAnyURIValue;
-use SimpleSAML\XML\Exception\SchemaViolationException;
-use SimpleSAML\XML\Type\ListTypeInterface;
+use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
+use SimpleSAML\XMLSchema\Type\Interface\ListTypeInterface;
 
 use function array_map;
 use function preg_split;
@@ -28,7 +28,7 @@ class AnyURIListValue extends SAMLAnyURIValue implements ListTypeInterface
      * Validate the value.
      *
      * @param string $value
-     * @throws \SimpleSAML\XML\Exception\SchemaViolationException on failure
+     * @throws \SimpleSAML\XMLSchema\Exception\SchemaViolationException on failure
      * @return void
      */
     protected function validateValue(string $value): void

src/Type/AuthnContextComparisonTypeValue.php

@@ -6,8 +6,8 @@
 
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\XML\samlp\AuthnContextComparisonTypeEnum;
-use SimpleSAML\XML\Exception\SchemaViolationException;
-use SimpleSAML\XML\Type\StringValue;
+use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
+use SimpleSAML\XMLSchema\Type\StringValue;
 
 use function array_column;
 

src/Type/DecisionTypeValue.php

@@ -6,8 +6,8 @@
 
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\XML\saml\DecisionTypeEnum;
-use SimpleSAML\XML\Exception\SchemaViolationException;
-use SimpleSAML\XML\Type\StringValue;
+use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
+use SimpleSAML\XMLSchema\Type\StringValue;
 
 use function array_column;
 

src/Type/KeyTypesValue.php

@@ -6,7 +6,7 @@
 
 use SimpleSAML\SAML2\Assert\Assert;
 use SimpleSAML\SAML2\XML\md\KeyTypesEnum;
-use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
 
 use function array_column;
 

src/Type/ListOfStringsValue.php

@@ -7,8 +7,8 @@
 use SimpleSAML\SAML2\Assert\Assert;
 use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
-use SimpleSAML\XML\Type\ListTypeInterface;
+use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
+use SimpleSAML\XMLSchema\Type\Interface\ListTypeInterface;
 
 use function array_map;
 use function preg_split;
@@ -34,7 +34,7 @@ class ListOfStringsValue extends SAMLStringValue implements ListTypeInterface
      * Validate the value.
      *
      * @param string $value
-     * @throws \SimpleSAML\XML\Exception\SchemaViolationException on failure
+     * @throws \SimpleSAML\XMLSchema\Exception\SchemaViolationException on failure
      * @return void
      */
     protected function validateValue(string $value): void