Merge pull request #90 from cakephp/fix-relative-time

Adding today as a relative keyword pattern
cakephp · Mar 21, 2016 · 4e1dacb · 4e1dacb
2 parents b8970b6 + 4ec5a26
commit 4e1dacb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Traits/RelativeKeywordTrait.php b/src/Traits/RelativeKeywordTrait.php
@@ -18,7 +18,7 @@
  */
 trait RelativeKeywordTrait
 {
-    protected static $relativePattern = '/this|next|last|tomorrow|yesterday|[+-]|first|last|ago/i';
+    protected static $relativePattern = '/this|next|last|tomorrow|yesterday|today|[+-]|first|last|ago/i';
 
     /**
      * Determine if there is a relative keyword in the time string, this is to

diff --git a/tests/DateTime/TestingAidsTest.php b/tests/DateTime/TestingAidsTest.php
@@ -100,6 +100,7 @@ public function testParseRelativeWithTestValueSet($class)
         $this->assertSame('2013-08-25 05:15:05', $class::parse('1 week ago')->toDateTimeString());
 
         $this->assertSame('2013-09-02 00:00:00', $class::parse('tomorrow')->toDateTimeString());
+        $this->assertSame('2013-09-01 00:00:00', $class::parse('today')->toDateTimeString());
         $this->assertSame('2013-08-31 00:00:00', $class::parse('yesterday')->toDateTimeString());
 
         $this->assertSame('2013-09-02 05:15:05', $class::parse('+1 day')->toDateTimeString());