Refactor CoFactor-element to native integer

Author: tvdijen

src/XML/dsig11/CoFactor.php

@@ -4,7 +4,13 @@
 
 namespace SimpleSAML\XMLSecurity\XML\dsig11;
 
-use SimpleSAML\XML\IntegerElementTrait;
+use DOMElement;
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Exception\InvalidDOMElementException;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+
+use function intval;
+use function strval;
 
 /**
  * Class representing a dsig11:CoFactor element.
@@ -13,17 +19,55 @@
  */
 final class CoFactor extends AbstractDsig11Element
 {
-    use IntegerElementTrait;
+    /**
+     * @param int $value
+     */
+    public function __construct(
+        protected int $value,
+    ) {
+        Assert::positiveInteger($value, SchemaViolationException::class);
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getValue(): int
+    {
+        return $this->value;
+    }
 
 
     /**
-     * Initialize a CoFactor element.
+     * Convert XML into a class instance
      *
-     * @param string $value
+     * @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 function __construct(
-        string $value,
-    ) {
-        $this->setContent($value);
+    public static function fromXML(DOMElement $xml): static
+    {
+        Assert::same($xml->localName, static::getLocalName(), InvalidDOMElementException::class);
+        Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
+        Assert::numeric($xml->textContent);
+
+        return new static(intval($xml->textContent));
+    }
+
+
+    /**
+     * Convert this element to XML.
+     *
+     * @param \DOMElement|null $parent The element we should append this element to.
+     * @return \DOMElement
+     */
+    public function toXML(?DOMElement $parent = null): DOMElement
+    {
+        $e = $this->instantiateParentElement($parent);
+        $e->textContent = strval($this->getValue());
+
+        return $e;
     }
 }

tests/XML/dsig11/CoFactorTest.php

@@ -42,7 +42,7 @@ public static function setUpBeforeClass(): void
      */
     public function testMarshalling(): void
     {
-        $coFactor = new CoFactor('128');
+        $coFactor = new CoFactor(128);
 
         $this->assertEquals(
             self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),

tests/XML/dsig11/ECKeyValueTest.php

@@ -102,7 +102,7 @@ public function testMarshalling(): void
         $order = new Order('6tN39Q9d6IevlAWLeM7lQGazUnVlJOe1wCk3sro2rfE=');
 
         // Build CoFactor
-        $coFactor = new CoFactor('128');
+        $coFactor = new CoFactor(128);
 
         // Build ValidationData
         $seed = new Seed('6tN39Q9d6IevlAWLeM7lQGazUnVlJOe1wCk3sro2rfE=');

tests/XML/dsig11/ECParametersTest.php

@@ -98,7 +98,7 @@ public function testMarshalling(): void
         $order = new Order('6tN39Q9d6IevlAWLeM7lQGazUnVlJOe1wCk3sro2rfE=');
 
         // Build CoFactor
-        $coFactor = new CoFactor('128');
+        $coFactor = new CoFactor(128);
 
         // Build ValidationData
         $seed = new Seed('6tN39Q9d6IevlAWLeM7lQGazUnVlJOe1wCk3sro2rfE=');