Bump xml-common and xml-security

Author: tvdijen

composer.json

@@ -17,13 +17,13 @@
 
         "psr/clock": "~1.0.0",
         "psr/log": "~2.3.1 | ~3.0.0",
-        "simplesamlphp/assert": "~1.8.1",
-        "simplesamlphp/xml-common": "dev-master",
-        "simplesamlphp/xml-security": "dev-feature/xsd-types"
+        "simplesamlphp/assert": "~1.8.2",
+        "simplesamlphp/xml-common": "~2.0.1",
+        "simplesamlphp/xml-security": "~2.0.0"
     },
     "require-dev": {
         "beste/clock": "~3.0.0",
-        "simplesamlphp/simplesamlphp-test-framework": "~1.9.2"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.9.3"
     },
     "autoload": {
         "psr-4": {

src/SAML11/Assert/SAMLStringTrait.php

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

src/SAML11/Compat/AbstractContainer.php

@@ -9,7 +9,7 @@
 use SimpleSAML\SAML11\Assert\Assert;
 use SimpleSAML\SAML11\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|null $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/SAML11/Type/DecisionTypeValue.php

@@ -6,8 +6,8 @@
 
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML11\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/SAML11/Type/SAMLAnyURIValue.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\SAML11\Type;
 
 use SimpleSAML\SAML11\Assert\Assert;
-use SimpleSAML\XML\Type\AnyURIValue;
+use SimpleSAML\XMLSchema\Type\AnyURIValue;
 
 /**
  * @package simplesaml/saml11

src/SAML11/Type/SAMLDateTimeValue.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\SAML11\Type;
 
 use SimpleSAML\SAML11\Assert\Assert;
-use SimpleSAML\XML\Type\DateTimeValue;
+use SimpleSAML\XMLSchema\Type\DateTimeValue;
 
 /**
  * @package simplesaml/saml11

src/SAML11/Type/SAMLStringValue.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\SAML11\Type;
 
 use SimpleSAML\SAML11\Assert\Assert;
-use SimpleSAML\XML\Type\StringValue;
+use SimpleSAML\XMLSchema\Type\StringValue;
 
 /**
  * @package simplesaml/saml11

src/SAML11/XML/ExtensionPointInterface.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\SAML11\XML;
 
-use SimpleSAML\XML\Type\{AnyURIValue, NCNameValue, QNameValue};
+use SimpleSAML\XMLSchema\Type\{AnyURIValue, NCNameValue, QNameValue};
 
 /**
  * Interface for several extension points objects.
@@ -16,31 +16,31 @@ interface ExtensionPointInterface
     /**
      * Get the local name for the element's xsi:type.
      *
-     * @return \SimpleSAML\XML\Type\NCNameValue
+     * @return \SimpleSAML\XMLSchema\Type\NCNameValue
      */
     public static function getXsiTypeName(): NCNameValue;
 
 
     /**
      * Get the namespace for the element's xsi:type.
      *
-     * @return \SimpleSAML\XML\Type\AnyURIValue
+     * @return \SimpleSAML\XMLSchema\Type\AnyURIValue
      */
     public static function getXsiTypeNamespaceURI(): AnyURIValue;
 
 
     /**
      * Get the namespace-prefix for the element's xsi:type.
      *
-     * @return \SimpleSAML\XML\Type\NCNameValue
+     * @return \SimpleSAML\XMLSchema\Type\NCNameValue
      */
     public static function getXsiTypePrefix(): NCNameValue;
 
 
     /**
      * Return the xsi:type value corresponding this element.
      *
-     * @return \SimpleSAML\XML\Type\QNameValue
+     * @return \SimpleSAML\XMLSchema\Type\QNameValue
      */
     public function getXsiType(): QNameValue;
 }

src/SAML11/XML/ExtensionPointTrait.php

@@ -6,7 +6,7 @@
 
 use RuntimeException;
 use SimpleSAML\SAML11\Assert\Assert;
-use SimpleSAML\XML\Type\{AnyURIValue, NCNameValue, QNameValue};
+use SimpleSAML\XMLSchema\Type\{AnyURIValue, NCNameValue, QNameValue};
 
 use function constant;
 use function defined;
@@ -20,7 +20,7 @@
 trait ExtensionPointTrait
 {
     /**
-     * @return \SimpleSAML\XML\Type\QNameValue
+     * @return \SimpleSAML\XMLSchema\Type\QNameValue
      */
     public function getXsiType(): QNameValue
     {
@@ -31,7 +31,7 @@ public function getXsiType(): QNameValue
     /**
      * Get the local name for the element's xsi:type.
      *
-     * @return \SimpleSAML\XML\Type\NCNameValue
+     * @return \SimpleSAML\XMLSchema\Type\NCNameValue
      */
     public static function getXsiTypeName(): NCNameValue
     {
@@ -49,7 +49,7 @@ public static function getXsiTypeName(): NCNameValue
     /**
      * Get the namespace for the element's xsi:type.
      *
-     * @return \SimpleSAML\XML\Type\AnyURIValue
+     * @return \SimpleSAML\XMLSchema\Type\AnyURIValue
      */
     public static function getXsiTypeNamespaceURI(): AnyURIValue
     {
@@ -67,7 +67,7 @@ public static function getXsiTypeNamespaceURI(): AnyURIValue
     /**
      * Get the namespace-prefix for the element's xsi:type.
      *
-     * @return \SimpleSAML\XML\Type\NCNameValue
+     * @return \SimpleSAML\XMLSchema\Type\NCNameValue
      */
     public static function getXsiTypePrefix(): NCNameValue
     {

src/SAML11/XML/SignableElementTrait.php

@@ -8,7 +8,7 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML11\Compat\ContainerSingleton;
 use SimpleSAML\XML\DOMDocumentFactory;
-use SimpleSAML\XML\Type\{AnyURIValue, Base64BinaryValue};
+use SimpleSAML\XMLSchema\Type\{AnyURIValue, Base64BinaryValue};
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmInterface;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\{RuntimeException, UnsupportedAlgorithmException};