Fix

Author: tvdijen

src/XML/AbstractSignedXMLElement.php

@@ -35,10 +35,9 @@ abstract class AbstractSignedXMLElement implements SignedElementInterface
      * Create/parse an alg:SigningMethod element.
      *
      * @param \DOMElement $xml
-     * @param \SimpleSAML\XMLSecurity\XML\SignableElementInterface $elt
      * @param \SimpleSAML\XMLSecurity\XML\ds\Signature $signature
      */
-    protected function __construct(DOMElement $xml, SignableElementInterface $elt, Signature $signature)
+    protected function __construct(DOMElement $xml, Signature $signature)
     {
         $this->element = $elt;
         $this->setStructure($xml);

tests/XML/CustomSigned.php

@@ -31,24 +31,10 @@ final class CustomSigned extends AbstractSignedXMLElement
      */
     public static function fromXML(DOMElement $xml): object
     {
-        Assert::same($xml->localName, 'CustomSignable', InvalidDOMElementException::class);
-        Assert::same($xml->namespaceURI, CustomSignable::NS, InvalidDOMElementException::class);
+        $signature = Signature::getChildrenOfClass($xml);
+        Assert::minCount($signature, 1, MissingElementException::class);
+        Assert::maxCount($signature, 1, TooManyElementsException::class);
 
-//var_dump($xml->ownerDocument->saveXML());
-        $signatureElement = XMLUtils::xpQuery($xml, './ds:Signature');
-        Assert::minCount($signatureElement, 1, MissingElementException::class);
-        Assert::minCount($signatureElement, 1, TooManyElementsException::class);
-//        $signature = Signature::getChildrenOfClass($xml);
-//        Assert::minCount($signature, 1, MissingElementException::class);
-//        Assert::minCount($signature, 1, TooManyElementsException::class);
-
-        $clone = clone $signatureElement[0];
-        $signature = Signature::fromXML($clone);
-
-        return new self(
-            $xml,
-            CustomSignable::fromXML($xml),
-            $signature
-        );
+        return new self($xml, $signature);
     }
 }