Migrate to new PHP 8.4 DOM-API

composer.json

@@ -13,13 +13,13 @@
         "php": "^8.5",
         "ext-dom": "*",
 
-        "simplesamlphp/assert": "~2.0",
-        "simplesamlphp/saml2": "~6.1",
-        "simplesamlphp/xml-common": "~2.8",
-        "simplesamlphp/xml-security": "~2.3",
-        "simplesamlphp/xml-ws-addressing": "~1.3",
-        "simplesamlphp/xml-ws-security-policy": "~1.2",
-        "simplesamlphp/xml-wss-core": "~1.3"
+        "simplesamlphp/assert": "~3.0",
+        "simplesamlphp/saml2": "~7.0@RC",
+        "simplesamlphp/xml-common": "~3.0",
+        "simplesamlphp/xml-security": "~3.0",
+        "simplesamlphp/xml-ws-addressing": "~2.0",
+        "simplesamlphp/xml-ws-security-policy": " ~2.0",
+        "simplesamlphp/xml-wss-core": "~2.0"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp-test-framework": "~2.0"

src/Utils/XPath.php

@@ -4,8 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\Utils;
 
-use DOMNode;
-use DOMXPath;
+use Dom;
 use SimpleSAML\WebServices\Federation\Constants as C;
 
 /**
@@ -18,13 +17,13 @@ class XPath extends \SimpleSAML\WebServices\Security\Utils\XPath
     /*
      * Get a DOMXPath object that can be used to search for WS Federation elements.
      *
-     * @param \DOMNode $node The document to associate to the DOMXPath object.
+     * @param \Dom\Node $node The document to associate to the \Dom\XPath object.
      * @param bool $autoregister Whether to auto-register all namespaces used in the document
      *
-     * @return \DOMXPath A DOMXPath object ready to use in the given document, with several
+     * @return \Dom\XPath A \Dom\XPath object ready to use in the given document, with several
      *   ws-related namespaces already registered.
      */
-    public static function getXPath(DOMNode $node, bool $autoregister = false): DOMXPath
+    public static function getXPath(Dom\Node $node, bool $autoregister = false): Dom\XPath
     {
         $xp = parent::getXPath($node, $autoregister);
 

src/XML/auth/AbstractAdditionalContextType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\WebServices\Federation\XML\auth\ContextItem;
 use SimpleSAML\XML\ExtendableAttributesTrait;
@@ -64,7 +64,7 @@ public function getContextItem(): array
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
@@ -83,7 +83,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Add this AdditionalContext to an XML element.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/auth/AbstractClaimType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\WebServices\Federation\XML\auth\ConstrainedValue;
 use SimpleSAML\WebServices\Federation\XML\auth\Description;
@@ -168,7 +168,7 @@ public function getOptional(): ?BooleanValue
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
@@ -212,7 +212,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Add this ClaimType to an XML element.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/auth/AbstractConstrainedManyValueType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
 
@@ -70,7 +70,7 @@ public function isEmptyElement(): bool
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
@@ -88,7 +88,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Convert this element to XML.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/auth/AbstractConstrainedSingleValueType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
 use SimpleSAML\XMLSchema\Exception\TooManyElementsException;
@@ -73,7 +73,7 @@ public function isEmptyElement(): bool
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
@@ -94,7 +94,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Convert this element to XML.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/auth/AbstractConstrainedValueType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
@@ -74,7 +74,7 @@ public function getAssertConstraint(): ?BooleanValue
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
@@ -108,7 +108,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Add this ConstrainedValueType to an XML element.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/auth/AbstractContextItemType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
@@ -101,7 +101,7 @@ public function getScope(): ?AnyURIValue
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
@@ -125,7 +125,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Add this ContextItemType to an XML element.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/auth/AbstractDescriptionType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\TypedTextContentTrait;
@@ -48,19 +48,23 @@ final public function __construct(StringValue $value, array $namespacedAttribute
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
 
-        return new static(StringValue::fromString($xml->textContent), self::getAttributesNSFromXML($xml));
+        /** @var string $textContent */
+        $textContent = $xml->textContent;
+        Assert::notNull($textContent);
+
+        return new static(StringValue::fromString($textContent), self::getAttributesNSFromXML($xml));
     }
 
 
     /**
      * Convert this element to XML.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = $this->instantiateParentElement($parent);
         $e->textContent = $this->getContent()->getValue();

src/XML/auth/AbstractDisplayNameType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\TypedTextContentTrait;
@@ -48,19 +48,23 @@ final public function __construct(StringValue $value, array $namespacedAttribute
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
 
-        return new static(StringValue::fromString($xml->textContent), self::getAttributesNSFromXML($xml));
+        /** @var string $textContent */
+        $textContent = $xml->textContent;
+        Assert::notNull($textContent);
+
+        return new static(StringValue::fromString($textContent), self::getAttributesNSFromXML($xml));
     }
 
 
     /**
      * Convert this element to XML.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = $this->instantiateParentElement($parent);
         $e->textContent = $this->getContent()->getValue();

src/XML/auth/AbstractDisplayValueType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\TypedTextContentTrait;
@@ -48,19 +48,23 @@ final public function __construct(StringValue $value, array $namespacedAttribute
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
 
-        return new static(StringValue::fromString($xml->textContent), self::getAttributesNSFromXML($xml));
+        /** @var string $textContent */
+        $textContent = $xml->textContent;
+        Assert::notNull($textContent);
+
+        return new static(StringValue::fromString($textContent), self::getAttributesNSFromXML($xml));
     }
 
 
     /**
      * Convert this element to XML.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = $this->instantiateParentElement($parent);
         $e->textContent = $this->getContent()->getValue();

src/XML/auth/AbstractEncryptedValueType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
 use SimpleSAML\XMLSchema\Exception\MissingElementException;
@@ -60,7 +60,7 @@ public function getEncryptedData(): EncryptedData
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   If the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
@@ -79,7 +79,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Convert this element to XML.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/auth/AbstractStructuredValueType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
@@ -53,7 +53,7 @@ final public function __construct(
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
@@ -68,7 +68,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Add this StructuredValueType to an XML element.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = parent::instantiateParentElement($parent);
 

src/XML/auth/AbstractValueInRangeType.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WebServices\Federation\XML\auth;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\WebServices\Federation\Assert\Assert;
 use SimpleSAML\XMLSchema\Exception\InvalidDOMElementException;
 use SimpleSAML\XMLSchema\Exception\MissingElementException;
@@ -36,7 +36,7 @@ final public function __construct(
      * @throws \SimpleSAML\XMLSchema\Exception\InvalidDOMElementException
      *   if the qualified name of the supplied element is wrong
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
@@ -81,7 +81,7 @@ public function getValueLowerBound(): ValueLowerBound
     /**
      * Add this ValueInRangeType to an XML element.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = parent::instantiateParentElement($parent);