Merge pull request #92 from cakephp/issue-91

Fix Date constructor with relative strings.

Author: lorenzo

src/Date.php

@@ -30,7 +30,6 @@ class Date extends DateTimeImmutable implements ChronosInterface
     use Traits\FrozenTimeTrait;
     use Traits\MagicPropertyTrait;
     use Traits\ModifierTrait;
-    use Traits\RelativeKeywordTrait;
     use Traits\TestingAidTrait;
 
     /**

src/MutableDate.php

@@ -30,7 +30,6 @@ class MutableDate extends DateTime implements ChronosInterface
     use Traits\FrozenTimeTrait;
     use Traits\MagicPropertyTrait;
     use Traits\ModifierTrait;
-    use Traits\RelativeKeywordTrait;
     use Traits\TestingAidTrait;
 
     /**

src/Traits/FrozenTimeTrait.php

@@ -19,6 +19,8 @@
 trait FrozenTimeTrait
 {
 
+    use RelativeKeywordTrait;
+
     /**
      * Removes the time components from an input string.
      *
@@ -39,6 +41,9 @@ protected function stripTime($time)
         if ($time === null || $time === 'now' || $time === '') {
             return date('Y-m-d 00:00:00');
         }
+        if ($this->hasRelativeKeywords($time)) {
+            return date('Y-m-d 00:00:00', strtotime($time));
+        }
         return preg_replace('/\d{1,2}:\d{1,2}:\d{1,2}/', '00:00:00', $time);
     }
 

tests/Date/ConstructTest.php

@@ -231,9 +231,19 @@ public function testConstructWithTestNowNoMutation($class)
     {
         $class::setTestNow($class::create(2001, 1, 1));
         $date = new $class('+2 days');
-        $this->assertDateTime($date, 2001, 1, 3);
+        $this->assertDateTime($date, 2001, 1, 3, 0, 0, 0);
 
         $date = new $class();
         $this->assertNotEquals('2001-01-03', $date->format('Y-m-d'));
+        $class::setTestNow(null);
+    }
+
+    /**
+     * @dataProvider dateClassProvider
+     */
+    public function testConstructWithRelative($class)
+    {
+        $c = new $class('+7 days');
+        $this->assertEquals('00:00:00', $c->format('H:i:s'));
     }
 }