Merge pull request #6752 from kenjis/fix-Time-setTestNow-timezone

fix: Time::now() does not respect timezone when using setTestNow()

Author: kenjis

system/I18n/TimeTrait.php

@@ -77,8 +77,13 @@ public function __construct(?string $time = null, $timezone = null, ?string $loc
 
         // If a test instance has been provided, use it instead.
         if ($time === '' && static::$testNow instanceof self) {
-            $timezone = $timezone ?: static::$testNow->getTimezone();
-            $time     = static::$testNow->format('Y-m-d H:i:s');
+            if ($timezone !== null) {
+                $testNow = static::$testNow->setTimezone($timezone);
+                $time    = $testNow->format('Y-m-d H:i:s');
+            } else {
+                $timezone = static::$testNow->getTimezone();
+                $time     = static::$testNow->format('Y-m-d H:i:s');
+            }
         }
 
         $timezone       = $timezone ?: date_default_timezone_get();
@@ -310,7 +315,7 @@ public function toDateTime()
 
     /**
      * Creates an instance of Time that will be returned during testing
-     * when calling 'Time::now' instead of the current time.
+     * when calling 'Time::now()' instead of the current time.
      *
      * @param DateTimeInterface|self|string|null $datetime
      * @param DateTimeZone|string|null           $timezone

tests/system/I18n/TimeTest.php

@@ -1132,6 +1132,15 @@ public function testUnserializeTimeObject()
         $this->assertNotSame($time1, $time2);
     }
 
+    public function testSetTestNowWithTimeZone()
+    {
+        Time::setTestNow('2017/03/10 12:00', 'Asia/Tokyo');
+
+        $now = Time::now('UTC');
+
+        $this->assertSame('2017-03-10T03:00:00+00:00', $now->format('c'));
+    }
+
     public function testSetTestNowWithFaLocale()
     {
         Locale::setDefault('fa');