Create assertion and type-class for xs:Name

Author: tvdijen

src/Assert/NameTrait.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XML\Assert;
+
+use InvalidArgumentException;
+
+/**
+ * @package simplesamlphp/xml-common
+ */
+trait NameTrait
+{
+    /** @var string */
+    private static string $name_regex = '/^[a-zA-Z:-][\w.:-]+$/Du';
+
+
+    /**
+     * @param string $value
+     * @param string $message
+     */
+    protected static function validName(string $value, string $message = ''): void
+    {
+        parent::regex(
+            $value,
+            self::$name_regex,
+            $message ?: '%s is not a valid xs:Name',
+            InvalidArgumentException::class,
+        );
+    }
+}

src/Type/NameValue.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XML\Type;
+
+use SimpleSAML\XML\Assert\Assert;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+
+/**
+ * @package simplesaml/xml-common
+ */
+class NameValue extends TokenValue
+{
+    /**
+     * Validate the value.
+     *
+     * @param string $value
+     * @throws \SimpleSAML\XML\Exception\SchemaViolationException on failure
+     * @return void
+     */
+    protected function validateValue(string $value): void
+    {
+        // Note: value must already be sanitized before validating
+        Assert::validName($this->sanitizeValue($value), SchemaViolationException::class);
+    }
+}

tests/Assert/NameTest.php

@@ -0,0 +1,59 @@
+<?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\NameTest
+ *
+ * @package simplesamlphp/xml-common
+ */
+#[CoversClass(Assert::class)]
+final class NameTest extends TestCase
+{
+    /**
+     * @param boolean $shouldPass
+     * @param string $name
+     */
+    #[DataProvider('provideName')]
+    public function testValidToken(bool $shouldPass, string $name): void
+    {
+        try {
+            Assert::validName($name);
+            $this->assertTrue($shouldPass);
+        } catch (AssertionFailedException $e) {
+            $this->assertFalse($shouldPass);
+        }
+    }
+
+
+    /**
+     * @return array<int, array{0: bool, 1: string}>
+     */
+    public static function provideName(): array
+    {
+        return [
+            [true, 'Snoopy'],
+            [true, ':CMS'],
+            [true, 'fööbár'],
+            [true, '-1950-10-04'],
+            // The empty string is not valid
+            [false, ''],
+            // Must start with a letter, a dash or a colon
+            [false, '0836217462'],
+            // Spaces are forbidden
+            [false, 'foo bar'],
+            // Commas are forbidden
+            [false, 'foo,bar'],
+            // Trailing newlines are forbidden
+            [false, "foobar\n"],
+        ];
+    }
+}

tests/Type/NameValueTest.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\NameValue;
+
+/**
+ * Class \SimpleSAML\Test\Type\NameValueTest
+ *
+ * @package simplesamlphp/xml-common
+ */
+#[CoversClass(NameValue::class)]
+final class NameValueTest extends TestCase
+{
+    /**
+     * @param boolean $shouldPass
+     * @param string $name
+     */
+    #[DataProvider('provideName')]
+    public function testName(bool $shouldPass, string $name): void
+    {
+        try {
+            NameValue::fromString($name);
+            $this->assertTrue($shouldPass);
+        } catch (SchemaViolationException $e) {
+            $this->assertFalse($shouldPass);
+        }
+    }
+
+
+    /**
+     * @return array<string, array{0: bool, 1: string}>
+     */
+    public static function provideName(): array
+    {
+        return [
+            'valid' => [true, 'Snoopy'],
+            'diacritical' => [true, 'fööbár'],
+            'start with colon' => [true, ':CMS'],
+            'start with dash' => [true, '-1950-10-04'],
+            'invalid first char' => [false, '0836217462'],
+            'empty string' => [false, ''],
+            'space' => [false, 'foo bar'],
+            'comma' => [false, 'foo,bar'],
+            'whitespace collapse' => [true, "foobar\n"],
+            'normalization' => [true, ' foobar '],
+        ];
+    }
+}