Migrate DOM-classes to PHP 8.4's new DOM-API

Author: tvdijen

tests/SAML2/CustomBaseID.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\Test\SAML2;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\SAML2\Assert\Assert;
 use SimpleSAML\SAML2\Type\SAMLStringValue;
 use SimpleSAML\SAML2\XML\saml\AbstractBaseID;
@@ -67,7 +67,7 @@ public function getAudience(): array
     /**
      * @inheritDoc
      */
-    public static function fromXML(DOMElement $xml): static
+    public static function fromXML(Dom\Element $xml): static
     {
         Assert::same($xml->localName, 'BaseID', InvalidDOMElementException::class);
         Assert::notNull($xml->namespaceURI, InvalidDOMElementException::class);
@@ -92,7 +92,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Convert this BaseID to XML.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = parent::toXML($parent);
 

tests/SAML2/CustomCondition.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\Test\SAML2;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\SAML2\Assert\Assert;
 use SimpleSAML\SAML2\XML\saml\AbstractCondition;
 use SimpleSAML\SAML2\XML\saml\Audience;
@@ -62,7 +62,7 @@ public function getAudience(): 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, 'Condition', InvalidDOMElementException::class);
         Assert::notNull($xml->namespaceURI, InvalidDOMElementException::class);
@@ -85,7 +85,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Convert this Condition to XML.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = parent::toXML($parent);
 

tests/SAML2/CustomRoleDescriptor.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\Test\SAML2;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\SAML2\Assert\Assert;
 use SimpleSAML\SAML2\Type\SAMLAnyURIListValue;
 use SimpleSAML\SAML2\Type\SAMLAnyURIValue;
@@ -120,7 +120,7 @@ public function getChunk(): 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, 'RoleDescriptor', InvalidDOMElementException::class);
         Assert::notNull($xml->namespaceURI, InvalidDOMElementException::class);
@@ -169,7 +169,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Convert this RoleDescriptor to XML.
      */
-    public function toUnsignedXML(?DOMElement $parent = null): DOMElement
+    public function toUnsignedXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = parent::toUnsignedXML($parent);
 

tests/SAML2/CustomStatement.php

@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\Test\SAML2;
 
-use DOMElement;
+use Dom;
 use SimpleSAML\SAML2\Assert\Assert;
 use SimpleSAML\SAML2\XML\saml\AbstractStatement;
 use SimpleSAML\SAML2\XML\saml\Audience;
@@ -62,7 +62,7 @@ public function getAudience(): 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, 'Statement', InvalidDOMElementException::class);
         Assert::notNull($xml->namespaceURI, InvalidDOMElementException::class);
@@ -85,7 +85,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * Convert this Statement to XML.
      */
-    public function toXML(?DOMElement $parent = null): DOMElement
+    public function toXML(?Dom\Element $parent = null): Dom\Element
     {
         $e = parent::toXML($parent);