Migrate to xsd-types

Author: tvdijen

src/XML/wst_200512/AbstractBinarySecretType.php

@@ -9,8 +9,8 @@
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\TypedTextContentTrait;
 use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
+use SimpleSAML\XMLSchema\Type\AnyURIValue;
 use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
-use SimpleSAML\XMLSchema\Type\Helper\AnyURIListValue;
 use SimpleSAML\XMLSchema\XML\Constants\NS;
 
 /**
@@ -33,12 +33,12 @@ abstract class AbstractBinarySecretType extends AbstractWstElement
 
     /**
      * @param \SimpleSAML\XMLSchema\Type\Base64BinaryValue $content
-     * @param \SimpleSAML\XMLSchema\Type\Helper\AnyURIListValue|null $Type
+     * @param \SimpleSAML\XMLSchema\Type\AnyURIValue|null $Type
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
         Base64BinaryValue $content,
-        protected ?AnyURIListValue $Type = null,
+        protected ?AnyURIValue $Type = null,
         array $namespacedAttributes = [],
     ) {
         $this->setContent($content);
@@ -49,9 +49,9 @@ final public function __construct(
     /**
      * Get the Type property.
      *
-     * @return \SimpleSAML\XMLSchema\Type\Helper\AnyURIListValue|null
+     * @return \SimpleSAML\XMLSchema\Type\AnyURIValue|null
      */
-    public function getType(): ?AnyURIListValue
+    public function getType(): ?AnyURIValue
     {
         return $this->Type;
     }
@@ -73,7 +73,7 @@ public static function fromXML(DOMElement $xml): static
 
         return new static(
             Base64BinaryValue::fromString($xml->textContent),
-            self::getAttribute($xml, 'Type', AnyURIListValue::class),
+            self::getAttribute($xml, 'Type', AnyURIValue::class),
             self::getAttributesNSFromXML($xml),
         );
     }

src/XML/wst_200512/AbstractComputedKeyOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use SimpleSAML\XML\TypedTextContentTrait;
-use SimpleSAML\XMLSchema\Type\Helper\AnyURIListValue;
+use SimpleSAML\XMLSchema\Type\AnyURIValue;
 
 /**
  * A ComputedKeyOpenEnum element
@@ -20,5 +20,5 @@ abstract class AbstractComputedKeyOpenEnum extends AbstractWstElement
 
 
     /** @var string */
-    public const TEXTCONTENT_TYPE = AnyURIListValue::class;
+    public const TEXTCONTENT_TYPE = AnyURIValue::class;
 }

src/XML/wst_200512/AbstractKeyTypeOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use SimpleSAML\XML\TypedTextContentTrait;
-use SimpleSAML\XMLSchema\Type\Helper\AnyURIListValue;
+use SimpleSAML\XMLSchema\Type\AnyURIValue;
 
 /**
  * A KeyTypeOpenEnum element
@@ -20,5 +20,5 @@ abstract class AbstractKeyTypeOpenEnum extends AbstractWstElement
 
 
     /** @var string */
-    public const TEXTCONTENT_TYPE = AnyURIListValue::class;
+    public const TEXTCONTENT_TYPE = AnyURIValue::class;
 }

src/XML/wst_200512/AbstractRequestTypeOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use SimpleSAML\XML\TypedTextContentTrait;
-use SimpleSAML\XMLSchema\Type\Helper\AnyURIListValue;
+use SimpleSAML\XMLSchema\Type\AnyURIValue;
 
 /**
  * A RequestTypeOpenEnum element
@@ -20,5 +20,5 @@ abstract class AbstractRequestTypeOpenEnum extends AbstractWstElement
 
 
     /** @var string */
-    public const TEXTCONTENT_TYPE = AnyURIListValue::class;
+    public const TEXTCONTENT_TYPE = AnyURIValue::class;
 }

src/XML/wst_200512/AbstractStatusCodeOpenEnum.php

@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use SimpleSAML\XML\TypedTextContentTrait;
-use SimpleSAML\XMLSchema\Type\Helper\AnyURIListValue;
+use SimpleSAML\XMLSchema\Type\AnyURIValue;
 
 /**
  * A StatusCodeOpenEnum element
@@ -20,5 +20,5 @@ abstract class AbstractStatusCodeOpenEnum extends AbstractWstElement
 
 
     /** @var string */
-    public const TEXTCONTENT_TYPE = AnyURIListValue::class;
+    public const TEXTCONTENT_TYPE = AnyURIValue::class;
 }

tests/WSSecurity/XML/fed/ClientPseudonymTest.php

@@ -18,7 +18,7 @@
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
-use SimpleSAML\XML\Utils\XPath;
+use SimpleSAML\XPath\XPath;
 
 use function dirname;
 use function strval;

tests/WSSecurity/XML/fed/PseudonymTest.php

@@ -21,7 +21,7 @@
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
-use SimpleSAML\XML\Utils\XPath;
+use SimpleSAML\XPath\XPath;
 
 use function dirname;
 use function strval;

tests/WSSecurity/XML/fed/ReferenceDigestTest.php

@@ -14,8 +14,8 @@
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
-use SimpleSAML\XML\Type\Base64BinaryValue;
-use SimpleSAML\XML\Type\StringValue;
+use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
+use SimpleSAML\XMLSchema\Type\StringValue;
 
 use function dirname;
 

tests/WSSecurity/XML/fed/ReferenceEPRTest.php

@@ -18,8 +18,8 @@
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
-use SimpleSAML\XML\Type\AnyURIValue;
-use SimpleSAML\XML\Type\StringValue;
+use SimpleSAML\XMLSchema\Type\AnyURIValue;
+use SimpleSAML\XMLSchema\Type\StringValue;
 
 use function dirname;
 use function strval;

tests/WSSecurity/XML/fed/ReferenceToken11Test.php

@@ -16,7 +16,7 @@
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
-use SimpleSAML\XML\Type\StringValue;
+use SimpleSAML\XMLSchema\Type\StringValue;
 
 use function dirname;