Further improve regex and unit tests

Author: tvdijen

.github/workflows/php.yml

@@ -154,7 +154,7 @@ jobs:
               echo "Could not read extra.branch-alias.dev-master from composer.json" >&2
               exit 1
             fi
-            echo "COMPOSER_ROOT_VERSION=$ROOT_VERSION" >> "GITHUB_ENV"
+            echo "COMPOSER_ROOT_VERSION=$ROOT_VERSION" >> "$env:GITHUB_ENV"
 
       - name: Cache composer dependencies
         uses: actions/cache@v5

src/XMLSchema/Type/DateTimeValue.php

@@ -31,11 +31,11 @@ class DateTimeValue extends AbstractAnySimpleType
     protected function sanitizeValue(string $value): string
     {
         $normalized = static::collapseWhitespace(static::normalizeWhitespace($value));
+        $sanitized = preg_replace('/\.(\d{0,6})\d*/', '.$1', $normalized);
 
-        $sanitized = preg_replace('/\.0+/', '', $normalized);
-        $sanitized = preg_replace('/\.(?!\d)/', '', $sanitized);
-
-        return $sanitized;
+        // Remove all trailing zeros after the dot, and remove the dot if only zeros were present
+        $sanitized = preg_replace('/\.(?=\d)(?:\d*?[1-9])?\K0+(?=[^0-9]|$)/', '', $sanitized);
+        return preg_replace('/\.(?!\d)/', '', $sanitized);
     }
 
 

src/XMLSchema/Type/TimeValue.php

@@ -31,11 +31,11 @@ class TimeValue extends AbstractAnySimpleType
     protected function sanitizeValue(string $value): string
     {
         $normalized = static::collapseWhitespace(static::normalizeWhitespace($value));
+        $sanitized = preg_replace('/\.(\d{0,6})\d*/', '.$1', $normalized);
 
-        $sanitized = preg_replace('/\.0+/', '', $normalized);
-        $sanitized = preg_replace('/\.(?!\d)/', '', $sanitized);
-
-        return $sanitized;
+        // Remove all trailing zeros after the dot, and remove the dot if only zeros were present
+        $sanitized = preg_replace('/\.(?=\d)(?:\d*?[1-9])?\K0+(?=[^0-9]|$)/', '', $sanitized);
+        return preg_replace('/\.(?!\d)/', '', $sanitized);
     }
 
 

tests/XMLSchema/Type/DateTimeValueTest.php

@@ -54,6 +54,36 @@ public function testFromDateTime(): void
     }
 
 
+    /**
+     */
+    public function testSubSeconds(): void
+    {
+        // Strip sub-second trailing zero's and make sure the decimal sign is removed
+        $dateTimeValue = DateTimeValue::fromString('2001-10-26T21:32:52.00');
+        $this->assertEquals('2001-10-26T21:32:52', $dateTimeValue->getValue());
+
+        // Strip sub-second trailing zero's
+        $dateTimeValue = DateTimeValue::fromString('2001-10-26T21:32:52.12300');
+        $this->assertEquals('2001-10-26T21:32:52.123', $dateTimeValue->getValue());
+
+        // Strip sub-seconds over microsecond precision
+        $dateTimeValue = DateTimeValue::fromString('2001-10-26T21:32:52.1234567');
+        $this->assertEquals('2001-10-26T21:32:52.123456', $dateTimeValue->getValue());
+
+        // Strip sub-second trailing zero's and make sure the decimal sign is removed
+        $dateTimeValue = DateTimeValue::fromString('2001-10-26T21:32:52.00Z');
+        $this->assertEquals('2001-10-26T21:32:52Z', $dateTimeValue->getValue());
+
+        // Strip sub-seconds over microsecond precision with timezone
+        $dateTimeValue = DateTimeValue::fromString('2001-10-26T21:32:52.1234567+01:00');
+        $this->assertEquals('2001-10-26T21:32:52.123456+01:00', $dateTimeValue->getValue());
+
+        // Strip sub-seconds over microsecond precision with timezone Zulu
+        $dateTimeValue = DateTimeValue::fromString('2001-10-26T21:32:52.1234567Z');
+        $this->assertEquals('2001-10-26T21:32:52.123456Z', $dateTimeValue->getValue());
+    }
+
+
     /**
      * @return array<string, array{0: true, 1: string}>
      */

tests/XMLSchema/Type/TimeValueTest.php

@@ -58,8 +58,29 @@ public function testFromDateTime(): void
      */
     public function testSubSeconds(): void
     {
+        // Strip sub-second trailing zero's and make sure the decimal sign is removed
         $timeValue = TimeValue::fromString('21:32:52.00');
         $this->assertEquals('21:32:52', $timeValue->getValue());
+
+        // Strip sub-second trailing zero's
+        $timeValue = TimeValue::fromString('21:32:52.12300');
+        $this->assertEquals('21:32:52.123', $timeValue->getValue());
+
+        // Strip sub-seconds over microsecond precision
+        $timeValue = TimeValue::fromString('21:32:52.1234567');
+        $this->assertEquals('21:32:52.123456', $timeValue->getValue());
+
+        // Strip sub-second trailing zero's and make sure the decimal sign is removed
+        $timeValue = TimeValue::fromString('21:32:52.00Z');
+        $this->assertEquals('21:32:52Z', $timeValue->getValue());
+
+        // Strip sub-seconds over microsecond precision with timezone
+        $timeValue = TimeValue::fromString('21:32:52.1234567+01:00');
+        $this->assertEquals('21:32:52.123456+01:00', $timeValue->getValue());
+
+        // Strip sub-seconds over microsecond precision with timezone Zulu
+        $timeValue = TimeValue::fromString('21:32:52.1234567Z');
+        $this->assertEquals('21:32:52.123456Z', $timeValue->getValue());
     }