Create assertion and type-class for xs:unsignedShort

Author: tvdijen

src/Assert/Assert.php

@@ -47,6 +47,7 @@
  * @method static void validToken(mixed $value, string $message = '', string $exception = '')
  * @method static void validUnsignedInt(mixed $value, string $message = '', string $exception = '')
  * @method static void validUnsignedLong(mixed $value, string $message = '', string $exception = '')
+ * @method static void validUnsignedShort(mixed $value, string $message = '', string $exception = '')
  * @method static void validYearMonth(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidAnyURI(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidBase64Binary(mixed $value, string $message = '', string $exception = '')
@@ -86,6 +87,7 @@
  * @method static void nullOrValidToken(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidUnsignedInt(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidUnsignedLong(mixed $value, string $message = '', string $exception = '')
+ * @method static void nullOrValidUnsignedShort(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidYearMonth(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidAnyURI(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidBase64Binary(mixed $value, string $message = '', string $exception = '')
@@ -125,6 +127,7 @@
  * @method static void allValidToken(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidUnsignedInt(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidUnsignedLong(mixed $value, string $message = '', string $exception = '')
+ * @method static void allValidUnsignedShort(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidYearMonth(mixed $value, string $message = '', string $exception = '')
  */
 class Assert extends BaseAssert
@@ -167,5 +170,6 @@ class Assert extends BaseAssert
     use TokenTrait;
     use UnsignedIntTrait;
     use UnsignedLongTrait;
+    use UnsignedShortTrait;
     use YearMonthTrait;
 }

src/Assert/UnsignedShortTrait.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XML\Assert;
+
+use InvalidArgumentException;
+
+/**
+ * @package simplesamlphp/xml-common
+ */
+trait UnsignedShortTrait
+{
+    /** @var string */
+    private static string $unsignedShort_regex = '/^(([+]?0*)(?:[1-9]|[1-9]\d{1,3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])|0)$/D';
+
+
+    /**
+     * @param string $value
+     * @param string $message
+     */
+    protected static function validUnsignedShort(string $value, string $message = ''): void
+    {
+        parent::regex(
+            $value,
+            self::$unsignedShort_regex,
+            $message ?: '%s is not a valid xs:unsignedShort',
+            InvalidArgumentException::class,
+        );
+    }
+}

src/Type/UnsignedShortValue.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XML\Type;
+
+use SimpleSAML\XML\Assert\Assert;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+
+/**
+ * @package simplesaml/xml-common
+ */
+class UnsignedShortValue extends IntegerValue
+{
+    /**
+     * Validate the value.
+     *
+     * @param string $value
+     * @throws \SimpleSAML\XML\Exception\SchemaViolationException on failure
+     * @return void
+     */
+    protected function validateValue(string $value): void
+    {
+        Assert::validUnsignedShort($this->sanitizeValue($value), SchemaViolationException::class);
+    }
+}

tests/Assert/UnsignedShortTest.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\Test\XML\Assert;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\Assert\AssertionFailedException;
+use SimpleSAML\XML\Assert\Assert;
+
+/**
+ * Class \SimpleSAML\Test\XML\Assert\UnsignedShortTest
+ *
+ * @package simplesamlphp/xml-common
+ */
+#[CoversClass(Assert::class)]
+final class UnsignedShortTest extends TestCase
+{
+    /**
+     * @param boolean $shouldPass
+     * @param string $unsignedShort
+     */
+    #[DataProvider('provideUnsignedShort')]
+    public function testValidUnsignedShort(bool $shouldPass, string $unsignedShort): void
+    {
+        try {
+            Assert::validUnsignedShort($unsignedShort);
+            $this->assertTrue($shouldPass);
+        } catch (AssertionFailedException $e) {
+            $this->assertFalse($shouldPass);
+        }
+    }
+
+
+    /**
+     * @return array<string, array{0: bool, 1: string}>
+     */
+    public static function provideUnsignedShort(): array
+    {
+        return [
+            'empty' => [false, ''],
+            'valid positive short' => [true, '65535'],
+            'invalid positive out-of-bounds' => [false, '65536'],
+            'valid signed positive short' => [true, '+65535'],
+            'valid zero' => [true, '0'],
+            'valid negative leading zeros' => [true, '0000000000000000000005'],
+            'invalid with fractional' => [false, '1.'],
+            'invalid with space' => [false, '12 34'],
+            'invalid negative' => [false, '-1'],
+            'invalid with thousands-delimiter' => [false, '1,234'],
+        ];
+    }
+}

tests/Type/UnsignedShortValueTest.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\Test\XML\Type;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XML\Type\UnsignedShortValue;
+
+/**
+ * Class \SimpleSAML\Test\Type\UnsignedShortValueTest
+ *
+ * @package simplesamlphp/xml-common
+ */
+#[CoversClass(UnsignedShortValue::class)]
+final class UnsignedShortValueTest extends TestCase
+{
+    /**
+     * @param boolean $shouldPass
+     * @param string $unsignedShort
+     */
+    #[DataProvider('provideUnsignedShort')]
+    public function testUnsignedShort(bool $shouldPass, string $unsignedShort): void
+    {
+        try {
+            UnsignedShortValue::fromString($unsignedShort);
+            $this->assertTrue($shouldPass);
+        } catch (SchemaViolationException $e) {
+            $this->assertFalse($shouldPass);
+        }
+    }
+
+
+    /**
+     * @return array<string, array{0: bool, 1: string}>
+     */
+    public static function provideUnsignedShort(): array
+    {
+        return [
+            'empty' => [false, ''],
+            'valid positive short' => [true, '65535'],
+            'invalid positive out-of-bounds' => [false, '65536'],
+            'valid signed positive short' => [true, '+65535'],
+            'valid zero' => [true, '0'],
+            'valid negative leading zeros' => [true, '0000000000000000000005'],
+            'invalid with fractional' => [false, '1.'],
+            'valid with whitespace collapse' => [true, " 1 234 \n"],
+            'invalid negative' => [false, '-1'],
+            'invalid with thousands-delimiter' => [false, '1,234'],
+        ];
+    }
+}