Make SignedElement*::fromXML generic

Author: tvdijen

src/XML/AbstractSignedXMLElement.php

@@ -5,6 +5,9 @@
 namespace SimpleSAML\XMLSecurity\XML;
 
 use DOMElement;
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Exception\MissingElementException;
+use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XMLSecurity\XML\ds\Signature;
 
 /**
@@ -39,7 +42,6 @@ abstract class AbstractSignedXMLElement implements SignedElementInterface
      */
     protected function __construct(DOMElement $xml, Signature $signature)
     {
-//        $this->element = $elt;
         $this->setStructure($xml);
         $this->setSignature($signature);
     }
@@ -96,5 +98,12 @@ public function toXML(DOMElement $parent = null): DOMElement
      * @param \DOMElement $xml
      * @return self
      */
-    abstract public static function fromXML(DOMElement $xml): object;
+    public static function fromXML(DOMElement $xml): object
+    {
+        $signature = Signature::getChildrenOfClass($xml);
+        Assert::minCount($signature, 1, MissingElementException::class);
+        Assert::maxCount($signature, 1, TooManyElementsException::class);
+
+        return new self($xml, array_pop($signature));
+    }
 }

tests/XML/CustomSigned.php

@@ -4,37 +4,12 @@
 
 namespace SimpleSAML\XMLSecurity\Test\XML;
 
-use DOMElement;
-use SimpleSAML\Assert\Assert;
-use SimpleSAML\XML\Chunk;
-use SimpleSAML\XML\Exception\MissingElementException;
-use SimpleSAML\XML\Exception\TooManyElementsException;
-use SimpleSAML\XML\Utils as XMLUtils;
-use SimpleSAML\XMLSecurity\XML\ds\Signature;
 use SimpleSAML\XMLSecurity\XML\AbstractSignedXMLElement;
-use SimpleSAML\XMLSecurity\XML\SignedElementInterface;
 use SimpleSAML\XMLSecurity\XML\SignedElementTrait;
 
 /**
  * @package simplesamlphp\saml2
  */
 final class CustomSigned extends AbstractSignedXMLElement
 {
-    use SignedElementTrait;
-
-
-    /**
-     * Create a class from XML
-     *
-     * @param \DOMElement $xml
-     * @return self
-     */
-    public static function fromXML(DOMElement $xml): object
-    {
-        $signature = Signature::getChildrenOfClass($xml);
-        Assert::minCount($signature, 1, MissingElementException::class);
-        Assert::maxCount($signature, 1, TooManyElementsException::class);
-
-        return new self($xml, array_pop($signature));
-    }
 }