Test all use-cases + fix

Author: tvdijen

src/XMLSchema/Type/DateTimeValue.php

@@ -33,15 +33,18 @@ class DateTimeValue extends AbstractAnySimpleType
     protected function sanitizeValue(string $value): string
     {
         $normalized = static::collapseWhitespace(static::normalizeWhitespace($value));
-
         // Trim any trailing zero's from the sub-seconds
         $decimal = strrpos($normalized, '.');
         if ($decimal !== false) {
-            $timezone = strrpos($normalized, '+') ?? strrpos($normalized, '-') ?? strrpos($normalized, 'Z');
+            @list($dateValue, $timeValue) = explode('T', $normalized);
+            Assert::notNull($dateValue);
+            Assert::notNull($timeValue);
+
+            $timezone = strrpos($timeValue, '+') ?: strrpos($timeValue, '-') ?: strrpos($timeValue, 'Z');
             if ($timezone !== false) {
-                $subseconds = substr($normalized, $decimal + 1, strlen($normalized) - $timezone);
+                $subseconds = substr($timeValue, $decimal + $timezone, strlen($timeValue) - $timezone);
             } else {
-                $subseconds = substr($normalized, $decimal + 1);
+                $subseconds = substr($timeValue, $decimal + 1);
             }
 
             $subseconds = rtrim($subseconds, '0');

src/XMLSchema/Type/TimeValue.php

@@ -32,9 +32,9 @@ protected function sanitizeValue(string $value): string
         // Trim any trailing zero's from the sub-seconds
         $decimal = strrpos($normalized, '.');
         if ($decimal !== false) {
-            $timezone = strrpos($normalized, '+') ?? strrpos($normalized, '-') ?? strrpos($normalized, 'Z');
+            $timezone = strrpos($normalized, '+') ?: strrpos($normalized, '-') ?: strrpos($normalized, 'Z');
             if ($timezone !== false) {
-                $subseconds = substr($normalized, $decimal + 1, strlen($normalized) - $timezone);
+                $subseconds = substr($normalized, $decimal + $timezone, strlen($normalized) - $timezone);
             } else {
                 $subseconds = substr($normalized, $decimal + 1);
             }

tests/XMLSchema/Type/DateTimeValueTest.php

@@ -62,7 +62,11 @@ public static function provideValidDateTime(): array
         return [
             'whitespace collapse' => [true, ' 2001-10-26T21:32:52 '],
             'trailing sub-second zero' => [true, '2001-10-26T21:32:52.1230'],
+            'trailing sub-second zero with timezone' => [true, '2001-10-26T21:32:52.1230+00:00'],
+            'trailing sub-second zero with timezone Zulu' => [true, '2001-10-26T21:32:52.1230Z'],
             'all trailing sub-second zero' => [true, '2001-10-26T21:32:52.00'],
+            'all trailing sub-second zero with timezone' => [true, '2001-10-26T21:32:52.00+00:00'],
+            'all trailing sub-second zero with timezone Zulu' => [true, '2001-10-26T21:32:52.00Z'],
         ];
     }
 

tests/XMLSchema/Type/TimeValueTest.php

@@ -48,7 +48,11 @@ public static function provideValidTime(): array
         return [
             'whitespace collapse' =>  [true, "\n  21:32:52.12679\t "],
             'trailing sub-second zero' => [true, '21:32:52.1230'],
-            'all trailing sub-second zero' => [true, '21:32:52.00'],
+            'trailing sub-second zero with timezone' => [true, '21:32:52.1230+00:00'],
+            'trailing sub-second zero with timezone Zulu' => [true, '21:32:52.1230Z'],
+            'all trailing sub-second all zero' => [true, '21:32:52.00'],
+            'all trailing sub-second all zero with timezone' => [true, '21:32:52.00+00:00'],
+            'all trailing sub-second all zero with timezone Zulu' => [true, '21:32:52.00Z'],
         ];
     }