Try to weed out non time strings (#3)

* Handles non-date strings as well as yesterday and tomorrow

* code quality and linting

src/Languages.php

@@ -40,7 +40,10 @@ public function eng(): array
                 'thursday'  => [' thursday ', ' thu '],
                 'friday'    => [' friday ', ' fri '],
                 'saturday'  => [' saturday ', ' sat '],
+                'tomorrow'  => [' tomorrow '],
+                'yesterday' => [' yesterday '],
             ],
+            'now' => [' now '],
         ];
     }
 
@@ -69,7 +72,10 @@ public function esp(): array
                 'thursday'  => [' jueves ', ' j ', ' ju ', ' jue '],
                 'friday'    => [' viernes ', ' v ', ' vi ', ' vie '],
                 'saturday'  => [' sábado ', ' sabado ', ' s ', ' sá ', ' sa ', ' sab '],
+                'tomorrow'  => [' mañana ', ' manana '],
+                'yesterday' => [' ayer '],
             ],
+            'now' => [' ahora '],
         ];
     }
 }

src/NoDateOrTimeStringFoundException.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Grosv\Sundial;
+
+final class NoDateOrTimeStringFoundException extends \Exception
+{
+}

src/Parser.php

@@ -4,6 +4,8 @@
 
 namespace Grosv\Sundial;
 
+use DateTime;
+
 /**
  * @internal
  */
@@ -16,7 +18,7 @@ final class Parser
     private string $day;
     private string $date;
     private string $time;
-    private int $ts;
+    private int $ts = 0;
     private string $test;
     private array $matches;
     private array $boundary = ['start' => 1, 'end' => 2147483647];
@@ -49,12 +51,6 @@ public function loadLanguage(): self
 
     public function parse(string $string): self
     {
-        $try = strtotime($string);
-        if (abs((int) $try) > 86400) {
-            $this->ts = (int) $try;
-
-            return $this;
-        }
         $this->loadLanguage();
         $this->string = strtolower(' ' . $string . ' ');
         $this->test   = (string) preg_replace('/[\W]/', ' ', $this->string);
@@ -65,7 +61,7 @@ public function parse(string $string): self
         $this->day    = $this->day ?? $this->getDay();
         $this->time   = $this->time ?? $this->getTime();
 
-        $this->ts = (int) strtotime(implode(' ', [$this->date, $this->month, $this->year, $this->time]));
+        $this->calculateTime();
 
         return $this;
     }
@@ -124,6 +120,11 @@ public function getDay(): string
 
     public function getTime(): string
     {
+        foreach ($this->matches['now'] as $word) {
+            if (in_array(trim($word), explode(' ', $this->test), true)) {
+                return date('H:i:s');
+            }
+        }
         preg_match('/((1[0-2]|0?[1-9]):?([0-5][0-9])? ?([AaPp][Mm])) /', $this->string, $matches);
         if (is_array($matches) && sizeof($matches) > 0) {
             return $matches[0] ?? '';
@@ -159,14 +160,47 @@ public function parseNumericFormats(): void
         }
 
         if (checkdate((int) $m, (int) $d, (int) $y)) {
-            $this->month = (string) $this->matches['months'][ltrim((string) $m, '0')][0];
+            $this->month = trim((string) $this->matches['months'][ltrim((string) $m, '0')][0]);
             $this->date  = (string) $d;
             $this->year  = (string) $y;
         }
 
         return;
     }
 
+    /**
+     * @throws NoDateOrTimeStringFoundException
+     * @throws \Exception
+     */
+    public function calculateTime(): void
+    {
+        $string = null;
+
+        if ((bool) $this->time) {
+            $string = $this->time;
+        }
+
+        if ((bool) $this->day) {
+            $string = $this->day;
+        }
+
+        if ((bool) $this->day && (bool) $this->time) {
+            $string = implode(' ', [$this->day, $this->time]);
+        }
+
+        if ((bool) $this->month && (bool) $this->date) {
+            $string = implode(' ', [$this->date, $this->month, $this->year, $this->time]);
+        }
+
+        if (is_null($string)) {
+            throw new NoDateOrTimeStringFoundException('Unable to find a date or time string to parse.');
+        }
+
+        $ts = new DateTime($string);
+
+        $this->ts = $ts->getTimestamp();
+    }
+
     /**
      * @throws DateTimeOutOfRangeException
      */

tests/Feature/EnglishTest.php

@@ -1,8 +1,13 @@
 <?php
 
 use Grosv\Sundial\DateTimeOutOfRangeException;
+use Grosv\Sundial\NoDateOrTimeStringFoundException;
 use Grosv\Sundial\Parser;
 
+test('failures to the front', function () {
+    assertSame(true, true); // Just a placeholder test that makes it easy to dd() when things fail.
+});
+
 test('now as timestamp', function () {
     assertSame(time(), (new Parser())->parse('now')->toTimestamp());
 });
@@ -43,6 +48,17 @@
     assertSame('02:00 AM', (new Parser())->parse('April 20, 2020 at 2am')->toFormat('h:i A'));
 });
 
+test('it can manage yesterday and tomorrow', function () {
+    assertSame((new DateTime('12:00 am'))->add(new DateInterval('P1D'))->format('c'),
+        (new Parser())->parse('tomorrow')->toFormat('c'));
+    assertSame((new DateTime('12:00 am'))->sub(new DateInterval('P1D'))->format('c'),
+        (new Parser())->parse('yesterday')->toFormat('c'));
+    assertSame((new DateTime('14:00'))->add(new DateInterval('P1D'))->format('c'),
+        (new Parser())->parse('2:00 pm tomorrow')->toFormat('c'));
+    assertSame((new DateTime('16:00'))->sub(new DateInterval('P1D'))->format('c'),
+        (new Parser())->parse('yesterday at 4:00 pm')->toFormat('c'));
+});
+
 it('throws an exception if earlier than boundary minimum', function () {
     (new Parser())->parse('April 20, 1992')->setBetween(time(), strtotime('tomorrow'))->toFormat('Y-m-d');
 })->throws(DateTimeOutOfRangeException::class);
@@ -58,3 +74,7 @@
 it('throws an exception if timestamp later than boundary minimum', function () {
     (new Parser())->parse('April 20, 2032')->setBetween(time(), strtotime('tomorrow'))->toTimestamp();
 })->throws(DateTimeOutOfRangeException::class);
+
+it('throws an exception if the string is not date or time related', function () {
+    (new Parser())->parse('Taco salad')->toTimestamp();
+})->throws(NoDateOrTimeStringFoundException::class);