move the check to the Time class

cakephp · Jan 31, 2016 · cf1993a · cf1993a
1 parent 3e9121b
commit cf1993a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 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/src/View/Helper/TimeHelper.php b/src/View/Helper/TimeHelper.php
@@ -333,10 +333,6 @@ public function i18nFormat($date, $format = null, $invalid = false, $timezone =
             return $invalid;
         }
 
-        if ($date instanceof \DateTimeImmutable) {
-            $date = $date->toMutable();
-        }
-
         try {
             $time = new Time($date);
             return $time->i18nFormat($format, $timezone);