Remove getter/setter for element

Author: tvdijen

src/XML/AbstractSignedXMLElement.php

@@ -40,8 +40,8 @@ abstract class AbstractSignedXMLElement implements SignedElementInterface
      */
     protected function __construct(DOMElement $xml, SignableElementInterface $elt, Signature $signature)
     {
+        $this->element = $elt;
         $this->setStructure($xml);
-        $this->setElement($elt);
         $this->setSignature($signature);
     }
 
@@ -57,28 +57,6 @@ public function __toString(): string
     }
 
 
-    /**
-     * Collect the value of the unsigned element
-     *
-     * @return \SimpleSAML\XMLSecurity\XML\SignableElementInterface
-     */
-    public function getElement(): SignableElementInterface
-    {
-        return $this->element;
-    }
-
-
-    /**
-     * Set the value of the elment-property
-     *
-     * @param \SimpleSAML\XMLSecurity\XML\SignableElementInterface $elt
-     */
-    private function setElement(SignableElementInterface $elt): void
-    {
-        $this->element = $elt;
-    }
-
-
     /**
      * Collect the value of the structure-property
      *

tests/XML/CustomSigned.php

@@ -34,21 +34,21 @@ public static function fromXML(DOMElement $xml): object
         Assert::same($xml->localName, 'CustomSignable', InvalidDOMElementException::class);
         Assert::same($xml->namespaceURI, CustomSignable::NS, InvalidDOMElementException::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);
+//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);
+        $clone = clone $signatureElement[0];
+        $signature = Signature::fromXML($clone);
 
         return new self(
             $xml,
             CustomSignable::fromXML($xml),
-            array_pop($signature)
+            $signature
         );
     }
 }

tests/XML/CustomSignedTest.php

@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\Test\XML;
+
+use DOMDocument;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\Chunk;
+use SimpleSAML\XMLSecurity\Test\XML\CustomSigned;
+
+/**
+ * Class \SimpleSAML\XMLSecurity\XML\CustomSignedTest
+ *
+ * @covers \SimpleSAML\XMLSecurity\XML\AbstractSignedXMLElement
+ * @covers \SimpleSAML\XMLSecurity\XML\SignedElementTrait
+ * @covers \SimpleSAML\XMLSecurity\Test\XML\CustomSigned
+ *
+ * @package simplesamlphp/xml-security
+ */
+final class SignedElementTest extends TestCase
+{
+    /** @var \DOMDocument */
+    private DOMDocument $document;
+
+
+    /**
+     */
+    public function setUp(): void
+    {
+        $this->document = DOMDocumentFactory::fromFile(
+            dirname(dirname(__FILE__)) . '/resources/xml/custom_CustomSigned.xml'
+        );
+    }
+
+
+    /**
+    public function testMarshalling(): void
+    {
+        $document = DOMDocumentFactory::fromString(
+            '<some>Chunk</some>'
+        );
+
+        $customSignable = new CustomSignable(new Chunk($document->documentElement));
+        $this->assertFalse($customSignable->isEmptyElement());
+        $this->assertEquals(
+            $this->document->saveXML($this->document->documentElement),
+            strval($customSignable)
+        );
+    }
+     */
+
+
+    /**
+    public function testUnmarshalling(): void
+    {
+        $customSignable = CustomSignable::fromXML($this->document->documentElement);
+
+        $customSignableElement = $customSignable->getElement();
+        $customSignableElement = $customSignableElement->getXML();
+
+        $this->assertEquals('some', $customSignableElement->tagName);
+        $this->assertEquals(
+            'Chunk',
+            $customSignableElement->textContent
+        );
+   }
+     */
+
+
+    /**
+     * Test serialization / unserialization
+     */
+    public function testSerialization(): void
+    {
+        $this->assertEquals(
+            $this->document->saveXML($this->document->documentElement),
+            strval(unserialize(serialize(CustomSigned::fromXML($this->document->documentElement))))
+        );
+    }
+}
+