Add dsig11:Curve-element

Author: tvdijen

src/XML/dsig11/AbstractCurveType.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\dsig11;
+
+use DOMElement;
+
+/**
+ * Abstract class representing a dsig11:CurveType
+ *
+ * @package simplesaml/xml-security
+ */
+abstract class AbstractCurveType extends AbstractDsig11Element
+{
+    /**
+     * Initialize a CurveType element.
+     *
+     * @param \SimpleSAML\XMLSecurity\XML\dsig11\A $a
+     * @param \SimpleSAML\XMLSecurity\XML\dsig11\B $b
+     */
+    public function __construct(
+        protected A $a,
+        protected B $b,
+    ) {
+    }
+
+
+    /**
+     * Collect the value of the a-property
+     *
+     * @return \SimpleSAML\XMLSecurity\XML\dsig11\A
+     */
+    public function getA(): A
+    {
+        return $this->a;
+    }
+
+
+    /**
+     * Collect the value of the b-property
+     *
+     * @return \SimpleSAML\XMLSecurity\XML\dsig11\B
+     */
+    public function getB(): B
+    {
+        return $this->b;
+    }
+
+
+    /**
+     * Convert this CurveType element to XML.
+     *
+     * @param \DOMElement|null $parent The element we should append this CurveType element to.
+     * @return \DOMElement
+     */
+    public function toXML(?DOMElement $parent = null): DOMElement
+    {
+        $e = $this->instantiateParentElement($parent);
+
+        $this->getA()->toXML($e);
+        $this->getB()->toXML($e);
+
+        return $e;
+    }
+}

src/XML/dsig11/Curve.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\dsig11;
+
+use DOMElement;
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Exception\InvalidDOMElementException;
+use SimpleSAML\XML\Exception\MissingElementException;
+use SimpleSAML\XML\Exception\TooManyElementsException;
+use SimpleSAML\XMLSecurity\XML\dsig11\A;
+use SimpleSAML\XMLSecurity\XML\dsig11\B;
+
+/**
+ * Class representing a dsig11:Curve element.
+ *
+ * @package simplesaml/xml-security
+ */
+final class Curve extends AbstractCurveType
+{
+    /**
+     * Convert XML into a class instance
+     *
+     * @param \DOMElement $xml The XML element we should load
+     * @return static
+     *
+     * @throws \SimpleSAML\XML\Exception\InvalidDOMElementException
+     *   If the qualified name of the supplied element is wrong
+     */
+    public static function fromXML(DOMElement $xml): static
+    {
+        Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
+        Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
+
+        $a = A::getChildrenOfClass($xml);
+        Assert::minCount($a, 1, MissingElementException::class);
+        Assert::maxCount($a, 1, TooManyElementsException::class);
+
+        $b = B::getChildrenOfClass($xml);
+        Assert::minCount($b, 1, MissingElementException::class);
+        Assert::maxCount($b, 1, TooManyElementsException::class);
+
+        return new static(
+            array_pop($a),
+            array_pop($b),
+        );
+    }
+}

tests/XML/dsig11/CurveTest.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\Test\XML\dsig11;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
+use SimpleSAML\XMLSecurity\XML\dsig11\A;
+use SimpleSAML\XMLSecurity\XML\dsig11\AbstractCurveType;
+use SimpleSAML\XMLSecurity\XML\dsig11\AbstractDsig11Element;
+use SimpleSAML\XMLSecurity\XML\dsig11\B;
+use SimpleSAML\XMLSecurity\XML\dsig11\Curve;
+
+use function dirname;
+use function strval;
+
+/**
+ * Class \SimpleSAML\XMLSecurity\Test\XML\dsig11\CurveTest
+ *
+ * @package simplesamlphp/xml-security
+ */
+#[CoversClass(AbstractDsig11Element::class)]
+#[CoversClass(AbstractCurveType::class)]
+#[CoversClass(Curve::class)]
+final class CurveTest extends TestCase
+{
+    use SerializableElementTestTrait;
+
+
+    /**
+     */
+    public static function setUpBeforeClass(): void
+    {
+        self::$testedClass = Curve::class;
+
+        self::$xmlRepresentation = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 3) . '/resources/xml/dsig11_Curve.xml',
+        );
+    }
+
+
+    /**
+     */
+    public function testMarshalling(): void
+    {
+        $a = new A('6tN39Q9d6IevlAWLeM7lQGazUnVlJOe1wCk3sro2rfE=');
+        $b = new B('6tN39Q9d6IevlAWLeM7lQGazUnVlJOe1wCk3sro2rfE=');
+        $curve = new Curve($a, $b);
+
+        $this->assertEquals(
+            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
+            strval($curve),
+        );
+    }
+}

tests/resources/xml/dsig11_Curve.xml

@@ -0,0 +1,4 @@
+<dsig11:Curve xmlns:dsig11="http://www.w3.org/2009/xmldsig11#">
+  <dsig11:A>6tN39Q9d6IevlAWLeM7lQGazUnVlJOe1wCk3sro2rfE=</dsig11:A>
+  <dsig11:B>6tN39Q9d6IevlAWLeM7lQGazUnVlJOe1wCk3sro2rfE=</dsig11:B>
+</dsig11:Curve>