Browse Source

Merge pull request #13243 from andrii-pukhalevych/3.next

Resolves #13232
Mark Story 6 years ago
parent
commit
0b34e5826e
2 changed files with 3 additions and 3 deletions
  1. 1 1
      src/I18n/DateFormatTrait.php
  2. 2 2
      tests/TestCase/I18n/TimeTest.php

+ 1 - 1
src/I18n/DateFormatTrait.php

@@ -56,7 +56,7 @@ trait DateFormatTrait
      * @var string|array|int
      * @see \Cake\I18n\Time::i18nFormat()
      */
-    protected static $_jsonEncodeFormat = "yyyy-MM-dd'T'HH:mm:ssxxx";
+    protected static $_jsonEncodeFormat = "yyyy-MM-dd'T'HH':'mm':'ssxxx";
 
     /**
      * Caches whether or not this class is a subclass of a Date or MutableDate

+ 2 - 2
tests/TestCase/I18n/TimeTest.php

@@ -49,11 +49,11 @@ class TimeTest extends TestCase
         Time::setTestNow($this->now);
         Time::setDefaultLocale($this->locale);
         Time::resetToStringFormat();
-        Time::setJsonEncodeFormat("yyyy-MM-dd'T'HH:mm:ssxxx");
+        Time::setJsonEncodeFormat("yyyy-MM-dd'T'HH':'mm':'ssxxx");
 
         FrozenTime::setDefaultLocale($this->locale);
         FrozenTime::resetToStringFormat();
-        FrozenTime::setJsonEncodeFormat("yyyy-MM-dd'T'HH:mm:ssxxx");
+        FrozenTime::setJsonEncodeFormat("yyyy-MM-dd'T'HH':'mm':'ssxxx");
 
         date_default_timezone_set('UTC');
         I18n::setLocale(I18n::DEFAULT_LOCALE);