Fix Formatter:decodeTime() implementation (#24)

* Revert "Fix formatter decode time return type"

Signed-off-by: Graham Campbell <[email protected]>

* Throw ValueError when timestamp invalid

Signed-off-by: Graham Campbell <[email protected]>

Author: GrahamCampbell

src/CloudEvents/Serializers/Formatters/Formatter.php

@@ -27,11 +27,19 @@ public function encodeTime(?DateTimeInterface $time): ?string
 
     public function decodeTime(?string $time): ?DateTimeInterface
     {
-        $parsed = DateTimeImmutable::createFromFormat(self::TIME_FORMAT, $time, new DateTimeZone(self::TIME_ZONE));
+        if ($time === null) {
+            return null;
+        }
+
+        $decoded = DateTimeImmutable::createFromFormat(self::TIME_FORMAT, $time, new DateTimeZone(self::TIME_ZONE));
+
+        if ($decoded === false) {
+              throw new ValueError(
+                \sprintf('%s::decodeTime(): Argument #1 ($time) is not a valid RFC3339 timestamp', self::class)
+            );
+        }
 
-        return $parsed === false
-            ? null
-            : $parsed;
+        return $decoded;
     }
 
     /**

tests/CloudEvents/Serializers/Formatters/FormatterTest.php

@@ -5,6 +5,7 @@
 use CloudEvents\Serializers\Formatters\Formatter;
 use DateTimeImmutable;
 use PHPUnit\Framework\TestCase;
+use ValueError;
 
 /**
  * @coversDefaultClass \CloudEvents\Serializers\Formmaters\Formatter
@@ -22,6 +23,17 @@ public function testTime(): void
         $this->assertEquals(new DateTimeImmutable('2018-04-05T17:31:00Z'), $formatter->decodeTime('2018-04-05T17:31:00Z'));
     }
 
+    /**
+     * @covers ::decodeTime
+     */
+    public function testDecodeInvalidTime(): void
+    {
+        $formatter = new Formatter();
+        $this->expectException(ValueError::class);
+        $this->expectExceptionMessage('CloudEvents\\Serializers\\Formatters\\Formatter::decodeTime(): Argument #1 ($time) is not a valid RFC3339 timestamp');
+        $formatter->decodeTime('2018asdsdsafd');
+    }
+
     /**
      * @covers ::encodeData
      * @covers ::decodeData