Explicit nullable type

src/XML/EncryptedElementTrait.php

@@ -179,7 +179,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $this->encryptedData->toXML($e);
@@ -196,7 +196,7 @@ public function toXML(DOMElement $parent = null): DOMElement
      * @param \DOMElement|null $parent The element we should append to.
      * @return \DOMElement
      */
-    abstract public function instantiateParentElement(DOMElement $parent = null): DOMElement;
+    abstract public function instantiateParentElement(?DOMElement $parent = null): DOMElement;
 
 
     /**

src/XML/ds/AbstractKeyInfoType.php

@@ -100,7 +100,7 @@ public function getInfo(): array
      * @param \DOMElement|null $parent The element we should append this KeyInfo to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/AbstractSPKIDataType.php

@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\ds;
+
+use DOMElement;
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Exception\InvalidDOMElementException;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XML\Exception\TooManyElementsException;
+use SimpleSAML\XML\SerializableElementInterface;
+use SimpleSAML\XML\XsNamespace as NS;
+use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
+
+/**
+ * Abstract class representing the SPKIDataType.
+ *
+ * @package simplesamlphp/xml-security
+ */
+abstract class AbstractSPKIDataType extends AbstractDsElement
+{
+    /**
+     * Initialize a SPKIData element.
+     *
+     * @param array<\SimpleSAML\XMLSecurity\XML\ds\SPKISexp, SimpleSAML\XML\SerializableElementInterface|null> $tuples
+     */
+    final public function __construct(
+        protected array $tuples,
+    ) {
+        Assert::allIsArray($tuples, SchemaViolationException::class);
+
+        foreach ($tuples as $tuple) {
+            list($spkisExp, $other) = $tuple;
+            Assert::instanceOf($spkisExp, SPKISexp::class, SchemaViolationException::class);
+            Assert::instanceOf($other, SerializableElementInterface::class, SchemaViolationException::class);
+        }
+    }
+
+
+    /**
+     * Collect the value of the SPKISexp-property
+     *
+     * @return array<\SimpleSAML\XMLSecurity\XML\ds\SPKISexp, SimpleSAML\XML\SerializableElementInterface|null>
+     */
+    public function getTuples(): array
+    {
+        return $this->tuples;
+    }
+
+
+    /**
+     * Convert XML into a SPKIData
+     *
+     * @param \DOMElement $xml The XML element we should load
+     * @return static
+     *
+     * @throws \SimpleSAML\XML\Exception\InvalidDOMElementException
+     *   If the qualified name of the supplied element is wrong
+     */
+    public static function fromXML(DOMElement $xml): static
+    {
+        Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
+        Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
+
+        $tuples = [];
+
+        return new static($tuples);
+    }
+
+
+    /**
+     * Convert this SPKIData to XML.
+     *
+     * @param \DOMElement|null $parent The element we should append this SPKIData to.
+     * @return \DOMElement
+     */
+    public function toXML(?DOMElement $parent = null): DOMElement
+    {
+        $e = $this->instantiateParentElement($parent);
+
+        foreach ($this->getTuples() as $tuple) {
+            list($spkisExp, $other) = $tuple;
+
+            $spkisExp->toXML($e);
+            $other?->toXML($e);
+        }
+
+        return $e;
+    }
+}

src/XML/ds/CanonicalizationMethod.php

@@ -78,7 +78,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this KeyName element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Algorithm', $this->getAlgorithm());

src/XML/ds/DigestMethod.php

@@ -84,7 +84,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this DigestMethod element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Algorithm', $this->getAlgorithm());

src/XML/ds/DsObject.php

@@ -123,7 +123,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this ds:Object element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/KeyValue.php

@@ -100,7 +100,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this KeyValue element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/Manifest.php

@@ -88,7 +88,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this Manifest element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/RSAKeyValue.php

@@ -104,7 +104,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this RSAKeyValue element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/Reference.php

@@ -167,7 +167,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this Reference element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         if ($this->getId() !== null) {

src/XML/ds/RetrievalMethod.php

@@ -100,7 +100,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this RetrievalMethod element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('URI', $this->getURI());

src/XML/ds/Signature.php

@@ -161,7 +161,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this Signature element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/SignatureMethod.php

@@ -76,7 +76,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this SignatureMethod element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Algorithm', $this->getAlgorithm());

src/XML/ds/SignatureProperties.php

@@ -89,7 +89,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this SignatureProperties element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/SignatureProperty.php

@@ -102,7 +102,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this SignatureProperty element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Target', $this->getTarget());

src/XML/ds/SignatureValue.php

@@ -70,7 +70,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this SignatureValue element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->textContent = $this->getContent();

src/XML/ds/SignedInfo.php

@@ -172,7 +172,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this SignedInfo element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/Transform.php

@@ -127,7 +127,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this Transform element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/Transforms.php

@@ -76,7 +76,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this Transforms element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/X509Data.php

@@ -98,7 +98,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this X509Data element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/X509IssuerSerial.php

@@ -90,7 +90,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this X509IssuerSerial element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/ds/X509SerialNumber.php

@@ -66,7 +66,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this X509SerialNumber element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->textContent = $this->getContent();

src/XML/ds/XPath.php

@@ -88,7 +88,7 @@ public static function fromXML(DOMElement $xml): static
      * @param DOMElement|null $parent
      * @return DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->textContent = $this->getExpression();

src/XML/dsig11/KeyInfoReference.php

@@ -80,7 +80,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this KeyInfoReference element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('URI', $this->getURI());

src/XML/dsig11/X509Digest.php

@@ -81,7 +81,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this X509Digest element to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->textContent = $this->getContent();

src/XML/ec/InclusiveNamespaces.php

@@ -68,7 +68,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this InclusiveNamespaces to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/xenc/AbstractAgreementMethodType.php

@@ -140,7 +140,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this AgreementMethod to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Algorithm', $this->getAlgorithm());

src/XML/xenc/AbstractDHKeyValueType.php

@@ -172,7 +172,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this DHKeyValue to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/xenc/AbstractEncryptedType.php

@@ -125,7 +125,7 @@ public function getType(): ?string
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/xenc/AbstractEncryptionMethod.php

@@ -118,7 +118,7 @@ public static function fromXML(DOMElement $xml): static
      * @param \DOMElement|null $parent The element we should append this EncryptionMethod to.
      * @return \DOMElement
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('Algorithm', $this->getAlgorithm());

src/XML/xenc/AbstractEncryptionPropertiesType.php

@@ -75,7 +75,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/xenc/AbstractEncryptionPropertyType.php

@@ -99,7 +99,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 

src/XML/xenc/AbstractReference.php

@@ -74,7 +74,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
         $e->setAttribute('URI', $this->getUri());

src/XML/xenc/CipherData.php

@@ -100,7 +100,7 @@ public static function fromXML(DOMElement $xml): static
     /**
      * @inheritDoc
      */
-    public function toXML(DOMElement $parent = null): DOMElement
+    public function toXML(?DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);