Merge pull request #8146 from antograssiot/issue-8142

Fix TimeHelper incorrectly formatting immutable datetime objects.
cakephp · Jan 31, 2016 · b38fd49 · b38fd49
2 parents b081462 + cf1993a
commit b38fd49
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/src/I18n/Time.php b/src/I18n/Time.php
@@ -17,6 +17,7 @@
 use Cake\Chronos\ChronosInterface;
 use Cake\Chronos\MutableDateTime;
 use DateTime;
+use DateTimeImmutable;
 use DateTimeZone;
 use IntlDateFormatter;
 use JsonSerializable;
@@ -102,6 +103,9 @@ class Time extends MutableDateTime implements JsonSerializable
      */
     public function __construct($time = null, $tz = null)
     {
+        if ($time instanceof DateTimeImmutable) {
+            $time = $time->toMutable();
+        }
         if ($time instanceof DateTime) {
             $tz = $time->getTimeZone();
             $time = $time->format('Y-m-d H:i:s');

diff --git a/tests/TestCase/View/Helper/TimeHelperTest.php b/tests/TestCase/View/Helper/TimeHelperTest.php
@@ -17,6 +17,7 @@
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\I18n\I18n;
 use Cake\I18n\Time;
 use Cake\TestSuite\TestCase;
 use Cake\View\Helper\TimeHelper;
@@ -42,6 +43,19 @@ public function setUp()
         $this->View = new View();
         $this->Time = new TimeHelper($this->View);
         Time::$defaultLocale = 'en_US';
+        $this->locale = I18n::locale();
+    }
+
+    /**
+     * tearDown method
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+        Time::$defaultLocale = 'en_US';
+        I18n::locale($this->locale);
     }
 
     /**
@@ -431,6 +445,13 @@ public function testFormat()
         $result = $this->Time->format('invalid date', null, 'Date invalid');
         $expected = 'Date invalid';
         $this->assertEquals($expected, $result);
+
+        I18n::locale('fr_FR');
+        Time::$defaultLocale = 'fr_FR';
+        $time = new \Cake\I18n\FrozenTime('Thu Jan 14 13:59:28 2010');
+        $result = $this->Time->format($time, \IntlDateFormatter::FULL);
+        $expected = 'jeudi 14 janvier 2010 13:59:28 UTC';
+        $this->assertTimeFormat($expected, $result);
     }
 
     /**
@@ -475,8 +496,8 @@ public function testFormatTimeInstance()
     public function assertTimeFormat($expected, $result)
     {
         return $this->assertEquals(
-            str_replace([',', '(', ')', ' at'], '', $expected),
-            str_replace([',', '(', ')', ' at'], '', $result)
+            str_replace([',', '(', ')', ' at', ' à'], '', $expected),
+            str_replace([',', '(', ')', ' at', ' à'], '', $result)
         );
     }