Remove unnecessary code

Author: tvdijen

src/XML/AbstractSignedXMLElement.php

@@ -179,7 +179,7 @@ private function verifyInternal(SignatureAlgorithmInterface $verifier): SignedEl
         $ref = $this->validateReference();
 
         if (
-            $verifier->verify(
+            $verifier?->verify(
                 $c14nSignedInfo, // the canonicalized ds:SignedInfo element (plaintext)
                 base64_decode($this->signature->getSignatureValue()->getRawContent()), // the actual signature
             )
@@ -240,7 +240,7 @@ public function verify(SignatureAlgorithmInterface $verifier = null): SignedElem
             throw new NoSignatureFoundException();
         }
 
-        $keyInfo = $this->signature->getKeyInfo();
+        $keyInfo = $this->signature?->getKeyInfo();
         $algId = $this->signature->getSignedInfo()->getSignatureMethod()->getAlgorithm();
         if ($verifier === null && $keyInfo === null) {
             throw new InvalidArgumentException('No key or KeyInfo available for signature verification.');

src/XML/SignedElementTrait.php

@@ -102,7 +102,7 @@ public static function fromXML(DOMElement $xml): static
     public function toXML(DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
-        $e->setAttribute('Algorithm', $this->Algorithm);
+        $e->setAttribute('Algorithm', $this->getAlgorithm());
 
         return $e;
     }

src/XML/ds/CanonicalizationMethod.php

@@ -9,6 +9,7 @@
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
@@ -19,18 +20,17 @@
  */
 final class DigestMethod extends AbstractDsElement
 {
+    use ExtendableElementTrait;
+
+    public const NAMESPACE = C::XS_ANY_NS_OTHER;
+
     /**
      * The algorithm.
      *
      * @var string
      */
     protected string $Algorithm;
 
-    /**
-     * @var \SimpleSAML\XML\Chunk[]
-     */
-    protected array $elements;
-
 
     /**
      * Initialize a DigestMethod element.
@@ -75,32 +75,6 @@ private function setAlgorithm(string $algorithm): void
     }
 
 
-    /**
-     * Collect the embedded elements
-     *
-     * @return \SimpleSAML\XML\Chunk[]
-     */
-    public function getElements(): array
-    {
-        return $this->elements;
-    }
-
-
-    /**
-     * Set the value of the elements-property
-     *
-     * @param \SimpleSAML\XML\Chunk[] $elements
-     * @throws \SimpleSAML\Assert\AssertionFailedException
-     *   if the supplied array contains anything other than Chunk objects
-     */
-    private function setElements(array $elements): void
-    {
-        Assert::allIsInstanceOf($elements, Chunk::class, InvalidArgumentException::class);
-
-        $this->elements = $elements;
-    }
-
-
     /**
      * Convert XML into a DigestMethod
      *
@@ -140,10 +114,13 @@ public static function fromXML(DOMElement $xml): static
     public function toXML(DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
-        $e->setAttribute('Algorithm', $this->Algorithm);
+        $e->setAttribute('Algorithm', $this->getAlgorithm());
 
+        /** @psalm-var \SimpleSAML\XML\SerializableElementInterface $elt */
         foreach ($this->elements as $elt) {
-            $e->appendChild($e->ownerDocument->importNode($elt->getXML(), true));
+            if (!$elt->isEmptyElement()) {
+                $elt->toXML($e);
+            }
         }
 
         return $e;

src/XML/ds/DigestMethod.php

@@ -10,6 +10,7 @@
  * Class representing a ds:DigestValue element.
  *
  * @package simplesaml/xml-security
+ * @psalm-suppress PropertyNotSetInConstructor $content
  */
 final class DigestValue extends AbstractDsElement
 {

src/XML/ds/DigestValue.php

@@ -27,6 +27,7 @@ final class DsObject extends AbstractDsElement
     /** @var string */
     public const NAMESPACE = Constants::XS_ANY_NS_ANY;
 
+
     /**
      * The Id.
      *
@@ -203,20 +204,22 @@ public function toXML(DOMElement $parent = null): DOMElement
         $e = $this->instantiateParentElement($parent);
 
         if ($this->Id !== null) {
-            $e->setAttribute('Id', $this->Id);
+            $e->setAttribute('Id', $this->getId());
         }
 
         if ($this->MimeType !== null) {
-            $e->setAttribute('MimeType', $this->MimeType);
+            $e->setAttribute('MimeType', $this->getMimeType());
         }
 
         if ($this->Encoding !== null) {
-            $e->setAttribute('Encoding', $this->Encoding);
+            $e->setAttribute('Encoding', $this->getEncoding());
         }
 
         /** @psalm-var \SimpleSAML\XML\SerializableElementInterface[] $this->elements */
         foreach ($this->elements as $elt) {
-            $elt->toXML($e);
+            if (!$elt->isEmptyElement()) {
+                $elt->toXML($e);
+            }
         }
 
         return $e;

src/XML/ds/DsObject.php

@@ -10,6 +10,7 @@
  * Class representing a ds:Exponent element.
  *
  * @package simplesaml/xml-security
+ * @psalm-suppress PropertyNotSetInConstructor $content
  */
 final class Exponent extends AbstractDsElement
 {

src/XML/ds/Exponent.php

@@ -201,7 +201,7 @@ public function toXML(DOMElement $parent = null): DOMElement
         $e = $this->instantiateParentElement($parent);
 
         if ($this->Id !== null) {
-            $e->setAttribute('Id', $this->Id);
+            $e->setAttribute('Id', $this->getId());
         }
 
         foreach ($this->info as $n) {

src/XML/ds/KeyInfo.php

@@ -131,13 +131,13 @@ public function toXML(DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 
-        if ($this->RSAKeyValue !== null) {
-            $this->RSAKeyValue->toXML($e);
-        }
+        $this->getRSAKeyValue()?->toXML($e);
 
-        /** @psalm-var \SimpleSAML\XML\SerializableElementInterface[] $this->elements */
-        foreach ($this->elements as $element) {
-            $e->appendChild($e->ownerDocument->importNode($element->toXML(), true));
+        /** @psalm-var \SimpleSAML\XML\SerializableElementInterface $elt */
+        foreach ($this->elements as $elt) {
+            if (!$elt->isEmptyElement()) {
+                $elt->toXML($e);
+            }
         }
 
         return $e;

src/XML/ds/KeyValue.php

@@ -117,11 +117,11 @@ public function toXML(DOMElement $parent = null): DOMElement
     {
         $e = $this->instantiateParentElement($parent);
 
-        if ($this->Id !== null) {
-            $e->setAttribute('Id', $this->Id);
+        if ($this->getId() !== null) {
+            $e->setAttribute('Id', $this->getId());
         }
 
-        foreach ($this->references as $reference) {
+        foreach ($this->getReferences() as $reference) {
             $reference->toXML($e);
         }