Migrate to value types

composer.json

@@ -44,7 +44,7 @@
         "ext-spl": "*",
 
         "simplesamlphp/assert": "~1.8.0",
-        "simplesamlphp/xml-common": "~1.24.0"
+        "simplesamlphp/xml-common": "dev-feature/xsd-types"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp-test-framework": "~1.8.0"

src/Exception/ProtocolViolationException.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\Exception;
+
+/**
+ * This exception may be raised when a violation of the xmldsig specification is detected
+ *
+ * @package simplesamlphp/xml-security
+ */
+class ProtocolViolationException extends RuntimeException
+{
+    /**
+     * @param string|null $message
+     */
+    public function __construct(?string $message = null)
+    {
+        if ($message === null) {
+            if (defined('static::DEFAULT_MESSAGE')) {
+                $message = static::DEFAULT_MESSAGE;
+            } else {
+                $message = 'A violation of the XML Signature Syntax and Processing specification occurred.';
+            }
+        }
+
+        parent::__construct($message);
+    }
+}

src/XML/ds/AbstractDSAKeyValueType.php

@@ -9,8 +9,7 @@
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
-use SimpleSAML\XML\SchemaValidatableElementInterface;
-use SimpleSAML\XML\SchemaValidatableElementTrait;
+use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 
 use function array_pop;
 

src/XML/ds/AbstractKeyInfoType.php

@@ -8,12 +8,15 @@
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\SerializableElementInterface;
+use SimpleSAML\XML\Type\IDValue;
 use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XMLSecurity\Assert\Assert;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
 
+use function strval;
+
 /**
  * Abstract class representing the KeyInfoType.
  *
@@ -44,7 +47,7 @@ abstract class AbstractKeyInfoType extends AbstractDsElement
      */
     final public function __construct(
         protected array $info,
-        protected ?string $Id = null,
+        protected ?IDValue $Id = null,
     ) {
         Assert::notEmpty(
             $info,
@@ -61,7 +64,6 @@ final public function __construct(
             SerializableElementInterface::class,
             InvalidArgumentException::class,
         );
-        Assert::nullOrValidNCName($Id);
 
         foreach ($info as $item) {
             if ($item instanceof AbstractDsElement) {
@@ -86,9 +88,9 @@ final public function __construct(
     /**
      * Collect the value of the Id-property
      *
-     * @return string|null
+     * @return \SimpleSAML\XML\Type\IDValue|null
      */
-    public function getId(): ?string
+    public function getId(): ?IDValue
     {
         return $this->Id;
     }
@@ -116,7 +118,7 @@ public function toXML(?DOMElement $parent = null): DOMElement
         $e = $this->instantiateParentElement($parent);
 
         if ($this->getId() !== null) {
-            $e->setAttribute('Id', $this->getId());
+            $e->setAttribute('Id', strval($this->getId()));
         }
 
         foreach ($this->getInfo() as $elt) {

src/XML/ds/AbstractPGPDataType.php

@@ -10,8 +10,7 @@
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableElementTrait;
-use SimpleSAML\XML\SchemaValidatableElementInterface;
-use SimpleSAML\XML\SchemaValidatableElementTrait;
+use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
 

src/XML/ds/AbstractSPKIDataType.php

@@ -11,8 +11,7 @@
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Registry\ElementRegistry;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
-use SimpleSAML\XML\SchemaValidatableElementTrait;
-use SimpleSAML\XML\SerializableElementInterface;
+use SimpleSAML\XML\{SchemaValidatableElementTrait, SerializableElementInterface};
 use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
 
 /**

src/XML/ds/CanonicalizationMethod.php

@@ -8,11 +8,13 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
-use SimpleSAML\XML\SchemaValidatableElementInterface;
-use SimpleSAML\XML\SchemaValidatableElementTrait;
+use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
+use SimpleSAML\XML\Type\AnyURIValue;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
+use function strval;
+
 /**
  * Class representing a ds:CanonicalizationMethod element.
  *
@@ -25,12 +27,11 @@ final class CanonicalizationMethod extends AbstractDsElement implements SchemaVa
     /**
      * Initialize a CanonicalizationMethod element.
      *
-     * @param string $Algorithm
+     * @param \SimpleSAML\XML\Type\AnyURIValue $Algorithm
      */
     public function __construct(
-        protected string $Algorithm,
+        protected AnyURIValue $Algorithm,
     ) {
-        Assert::validURI($Algorithm, SchemaViolationException::class);
         Assert::oneOf(
             $Algorithm,
             [
@@ -48,9 +49,9 @@ public function __construct(
     /**
      * Collect the value of the Algorithm-property
      *
-     * @return string
+     * @return \SimpleSAML\XML\Type\AnyURIValue
      */
-    public function getAlgorithm(): string
+    public function getAlgorithm(): AnyURIValue
     {
         return $this->Algorithm;
     }
@@ -70,7 +71,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::same($xml->localName, 'CanonicalizationMethod', InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, CanonicalizationMethod::NS, InvalidDOMElementException::class);
 
-        $Algorithm = CanonicalizationMethod::getAttribute($xml, 'Algorithm');
+        $Algorithm = self::getAttribute($xml, 'Algorithm', AnyURIValue::class);
 
         return new static($Algorithm);
     }
@@ -85,7 +86,7 @@ public static function fromXML(DOMElement $xml): static
     public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
-        $e->setAttribute('Algorithm', $this->getAlgorithm());
+        $e->setAttribute('Algorithm', strval($this->getAlgorithm()));
 
         return $e;
     }

src/XML/ds/DigestMethod.php

@@ -9,8 +9,8 @@
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableElementTrait;
-use SimpleSAML\XML\SchemaValidatableElementInterface;
-use SimpleSAML\XML\SchemaValidatableElementTrait;
+use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
+use SimpleSAML\XML\Type\AnyURIType;
 use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
@@ -30,14 +30,13 @@ final class DigestMethod extends AbstractDsElement implements SchemaValidatableE
     /**
      * Initialize a DigestMethod element.
      *
-     * @param string $Algorithm
+     * @param \SimpleSAML\XML\Type\AnyURIValuestring $Algorithm
      * @param list<\SimpleSAML\XML\SerializableElementInterface> $elements
      */
     public function __construct(
-        protected string $Algorithm,
+        protected AnyURIValue $Algorithm,
         array $elements = [],
     ) {
-        Assert::validURI($Algorithm, SchemaViolationException::class);
         Assert::oneOf(
             $Algorithm,
             array_keys(C::$DIGEST_ALGORITHMS),
@@ -52,9 +51,9 @@ public function __construct(
     /**
      * Collect the value of the Algorithm-property
      *
-     * @return string
+     * @return \SimpleSAML\XML\Type\AnyURIValue
      */
-    public function getAlgorithm(): string
+    public function getAlgorithm(): AnyURIValue
     {
         return $this->Algorithm;
     }
@@ -74,7 +73,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::same($xml->localName, 'DigestMethod', InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, DigestMethod::NS, InvalidDOMElementException::class);
 
-        $Algorithm = DigestMethod::getAttribute($xml, 'Algorithm');
+        $Algorithm = self::getAttribute($xml, 'Algorithm', AnyURIValue::class);
         $elements = self::getChildElementsFromXML($xml);
 
         return new static($Algorithm, $elements);
@@ -90,7 +89,7 @@ public static function fromXML(DOMElement $xml): static
     public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
-        $e->setAttribute('Algorithm', $this->getAlgorithm());
+        $e->setAttribute('Algorithm', strval($this->getAlgorithm()));
 
         foreach ($this->elements as $elt) {
             if (!$elt->isEmptyElement()) {

src/XML/ds/DigestValue.php

@@ -4,9 +4,9 @@
 
 namespace SimpleSAML\XMLSecurity\XML\ds;
 
-use SimpleSAML\XML\Base64ElementTrait;
-use SimpleSAML\XML\SchemaValidatableElementInterface;
-use SimpleSAML\XML\SchemaValidatableElementTrait;
+use SimpleSAML\XML\Type\Base64BinaryValue;
+use SimpleSAML\XML\TypedTextContentTrait;
+use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 
 /**
  * Class representing a ds:DigestValue element.
@@ -15,15 +15,9 @@
  */
 final class DigestValue extends AbstractDsElement implements SchemaValidatableElementInterface
 {
-    use Base64ElementTrait;
     use SchemaValidatableElementTrait;
+    use TypedTextContentTrait;
 
-
-    /**
-     * @param string $content
-     */
-    public function __construct(string $content)
-    {
-        $this->setContent($content);
-    }
+    /** @var string */
+    public const TEXTCONTENT_TYPE = Base64BinaryValue::class;
 }