s/Base64StringElementTrait/Base64ElementTrait

Author: tvdijen

src/Base64StringElementTrait.php src/Base64ElementTrait.phpsrc/Base64StringElementTrait.php renamed to src/Base64ElementTrait.php

@@ -17,7 +17,7 @@
  *
  * @package simplesamlphp/xml-common
  */
-trait Base64StringElementTrait
+trait Base64ElementTrait
 {
     /** @var string */
     protected string $content;

src/SerializableElementTrait.php

@@ -36,10 +36,11 @@ trait SerializableElementTrait
     public function __toString(): string
     {
         $xml = $this->toXML();
-        /** @psalm-var \DOMDocument $xml->ownerDocument */
-        $xml->ownerDocument->formatOutput = $this->formatOutput;
 
-        return $xml->ownerDocument->saveXML($xml);
+        $doc = DOMDocumentFactory::fromString($xml->ownerDocument->saveXML());
+        $doc->formatOutput = $this->formatOutput;
+
+        return $doc->saveXML($doc->firstChild);
     }
 
 
@@ -112,14 +113,4 @@ public function toArray(): array
      * @return \DOMElement
      */
     abstract public function toXML(DOMElement $parent = null): DOMElement;
-
-
-    /**
-     * Create a class from XML
-     *
-     * @param \DOMElement $xml
-     * @return static
-     * @psalm-suppress MethodSignatureMismatch
-     */
-    abstract public static function fromXML(DOMElement $xml): static;
 }

tests/Utils/Base64StringElement.php tests/Utils/Base64Element.phptests/Utils/Base64StringElement.php renamed to tests/Utils/Base64Element.php

@@ -5,16 +5,16 @@
 namespace SimpleSAML\Test\XML;
 
 use SimpleSAML\XML\AbstractElement;
-use SimpleSAML\XML\Base64StringElementTrait;
+use SimpleSAML\XML\Base64ElementTrait;
 
 /**
- * Empty shell class for testing Base64StringElement.
+ * Empty shell class for testing Base64Element.
  *
  * @package simplesaml/xml-common
  */
-final class Base64StringElement extends AbstractElement
+final class Base64Element extends AbstractElement
 {
-    use Base64StringElementTrait;
+    use Base64ElementTrait;
 
     /** @var string */
     public const NS = 'urn:x-simplesamlphp:namespace';

tests/resources/xml/ssp_Base64Element.xml

@@ -0,0 +1 @@
+<ssp:Base64Element xmlns:ssp="urn:x-simplesamlphp:namespace">/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=</ssp:Base64Element>

tests/resources/xml/ssp_Base64StringElement.xml

@@ -11,41 +11,41 @@
 use SimpleSAML\Test\XML\XMLDumper;
 use SimpleSAML\XML\AbstractElement;
 use SimpleSAML\XML\DOMDocumentFactory;
-use SimpleSAML\XML\Base64StringElementTrait;
+use SimpleSAML\XML\Base64ElementTrait;
 
 use function dirname;
 use function strval;
 
 /**
- * Class \SimpleSAML\XML\Base64StringElementTraitTest
+ * Class \SimpleSAML\XML\Base64ElementTraitTest
  *
- * @covers \SimpleSAML\XML\Base64StringElementTrait
+ * @covers \SimpleSAML\XML\Base64ElementTrait
  * @covers \SimpleSAML\XML\StringElementTrait
  * @covers \SimpleSAML\XML\AbstractElement
  * @covers \SimpleSAML\XML\AbstractSerializableElement
  *
  * @package simplesamlphp\xml-common
  */
-final class Base64StringElementTraitTest extends TestCase
+final class Base64ElementTraitTest extends TestCase
 {
     use SerializableElementTestTrait;
 
     /**
      */
     public function setup(): void
     {
-        $this->testedClass = Base64StringElement::class;
+        $this->testedClass = Base64Element::class;
 
         $this->xmlRepresentation = DOMDocumentFactory::fromFile(
-            dirname(dirname(__FILE__)) . '/resources/xml/ssp_Base64StringElement.xml',
+            dirname(dirname(__FILE__)) . '/resources/xml/ssp_Base64Element.xml',
         );
     }
 
     /**
      */
     public function testMarshalling(): void
     {
-        $base64Element = new Base64StringElement('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=');
+        $base64Element = new Base64Element('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=');
 
         $this->assertEquals(
             XMLDumper::dumpDOMDocumentXMLWithBase64Content($this->xmlRepresentation),
@@ -58,7 +58,7 @@ public function testMarshalling(): void
      */
     public function testUnmarshalling(): void
     {
-        $base64Element = Base64StringElement::fromXML($this->xmlRepresentation->documentElement);
+        $base64Element = Base64Element::fromXML($this->xmlRepresentation->documentElement);
 
         $this->assertEquals('/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=', $base64Element->getContent());
     }
@@ -72,7 +72,7 @@ public function testBase64Cases(string $xml): void
     {
         $xmlRepresentation = DOMDocumentFactory::fromString($xml);
 
-        $xmlElement = Base64StringElement::fromXML($xmlRepresentation->documentElement);
+        $xmlElement = Base64Element::fromXML($xmlRepresentation->documentElement);
 
         $this->assertStringContainsString($xmlElement->getRawContent(), $xml);
     }
@@ -82,18 +82,18 @@ public function provideBase64Cases(): array
         return [
             'inline' => [
                 <<<XML
-<ssp:Base64StringElement xmlns:ssp="urn:x-simplesamlphp:namespace">/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=</ssp:Base64StringElement>
+<ssp:Base64Element xmlns:ssp="urn:x-simplesamlphp:namespace">/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=</ssp:Base64Element>
 XML
             ],
             'multiline' => [
                 <<<XML
-<ssp:Base64StringElement xmlns:ssp="urn:x-simplesamlphp:namespace">
+<ssp:Base64Element xmlns:ssp="urn:x-simplesamlphp:namespace">
 j14G9v6AnsOiEJYgkTg864DG3e/KLqoGpuybPGSGblVTn7ST6M/BsvP7YiVZjLqJEuEvWmf2mW4D
 Pb+pbArzzDcsLWEtNveMrw+FkWehDUQV9oe20iepo+W46wmj7zB/eWL+Z8MrGvlycoTndJU6CVwH
 TLsB+dq2FDa7JV4pAPjMY32JZTbiwKhzqw3nEi/eVrujJE4YRrlW28D+rXhITfoUAGGvsqPzcwGz
 p02lnMe2SmXADY1u9lbVjOhUrJpgvWfn9YuiCR+wjvaGMwIwzfJxChLJZOBV+1ad1CyNTiu6qAbl
 xZ4F8cWlMWJ7f0KkWvtw66HOf2VNR6Qan2Ra7Q==
-</ssp:Base64StringElement>
+</ssp:Base64Element>
 XML
             ],
         ];