Regression fix

Coder-Spirit · Jun 3, 2016 · 99cdbf4 · 99cdbf4
1 parent d3dbffa
commit 99cdbf4
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/UniversalTimestamp.php b/src/UniversalTimestamp.php
@@ -84,10 +84,15 @@ public static function fromDateTimeInterface(\DateTimeInterface $dateTime)
      */
     public static function fromStringTimestamp($strTimestamp, $tz = 'UTC')
     {
-        return self::fromDateTimeInterface(new \DateTimeImmutable(
-            $strTimestamp,
-            ($tz instanceof \DateTimeZone) ? $tz : new \DateTimeZone($tz)
-        ));
+        try {
+            $dt = new \DateTimeImmutable(
+                $strTimestamp,
+                ($tz instanceof \DateTimeZone) ? $tz : new \DateTimeZone($tz)
+            );
+        } catch (\Exception $e) {
+            throw new JiffyException('The provided value cannot be interpreted as a timestamp');
+        }
+        return self::fromDateTimeInterface($dt);
     }
 
     /**