Refactor X509SerialNumber

Author: tvdijen

composer.json

@@ -44,7 +44,7 @@
         "ext-spl": "*",
 
         "simplesamlphp/assert": "^1.3",
-        "simplesamlphp/xml-common": "^1.18.5"
+        "simplesamlphp/xml-common": "^1.19.0"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp-test-framework": "^1.7"

src/XML/ds/X509SerialNumber.php

@@ -8,7 +8,7 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
-use SimpleSAML\XML\StringElementTrait;
+use SimpleSAML\XML\IntegerElementTrait;
 
 /**
  * Class representing a ds:X509SerialNumber element.
@@ -17,60 +17,14 @@
  */
 final class X509SerialNumber extends AbstractDsElement
 {
-    use StringElementTrait;
+    use IntegerElementTrait;
 
 
     /**
-     * @param string $content
+     * @param int $content
      */
-    public function __construct(string $content)
+    public function __construct(int $content)
     {
         $this->setContent($content);
     }
-
-
-    /**
-     * Validate the content of the element.
-     *
-     * @param string $content  The value to go in the XML textContent
-     * @throws \Exception on failure
-     * @return void
-     */
-    protected function validateContent(/** @scrutinizer ignore-unused */ string $content): void
-    {
-        Assert::numeric($content, SchemaViolationException::class);
-    }
-
-
-    /**
-     * Convert XML into a X509SerialNumber
-     *
-     * @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, 'X509SerialNumber', InvalidDOMElementException::class);
-        Assert::same($xml->namespaceURI, X509SerialNumber::NS, InvalidDOMElementException::class);
-
-        return new static($xml->textContent);
-    }
-
-
-    /**
-     * Convert this X509SerialNumber element to XML.
-     *
-     * @param \DOMElement|null $parent The element we should append this X509SerialNumber element to.
-     * @return \DOMElement
-     */
-    public function toXML(DOMElement $parent = null): DOMElement
-    {
-        $e = $this->instantiateParentElement($parent);
-        $e->textContent = $this->getContent();
-
-        return $e;
-    }
 }

tests/XML/ds/X509DataTest.php

@@ -111,7 +111,7 @@ public function testMarshalling(): void
                         'C=US,ST=Hawaii,L=Honolulu,O=SimpleSAMLphp HQ,CN=SimpleSAMLphp Testing CA,emailAddress=%s',
                         '[email protected]',
                     )),
-                    new X509SerialNumber('2'),
+                    new X509SerialNumber(2),
                 ),
                 new X509SubjectName(self::$certData['name']),
                 new X509Digest(self::$digest, C::DIGEST_SHA256),

tests/XML/ds/X509IssuerSerialTest.php

@@ -57,7 +57,7 @@ public function setUp(): void
         /** @var string[] $details */
         $details = self::$key->getCertificateDetails();
         self::$issuer = new X509IssuerName(CertificateUtils::parseIssuer($details['issuer']));
-        self::$serial = new X509SerialNumber($details['serialNumber']);
+        self::$serial = new X509SerialNumber(intval($details['serialNumber']));
     }
 
 

tests/XML/ds/X509SerialNumberTest.php

@@ -43,7 +43,7 @@ public static function setUpBeforeClass(): void
      */
     public function testMarshalling(): void
     {
-        $serialNumber = new X509SerialNumber('123456');
+        $serialNumber = new X509SerialNumber(123456);
 
         $this->assertEquals(
             self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),