Merge pull request #6825 from kenjis/replace-time-in-BaseModel

refactor: replace time() with Time in BaseModel
codeigniter4 · Nov 7, 2022 · bc38d85 · bc38d85
2 parents 172daf3 + d3a9361
commit bc38d85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/system/BaseModel.php b/system/BaseModel.php
@@ -1182,7 +1182,7 @@ protected function doProtectFields(array $data): array
      */
     protected function setDate(?int $userData = null)
     {
-        $currentDate = $userData ?? time();
+        $currentDate = $userData ?? Time::now()->getTimestamp();
 
         return $this->intToDate($currentDate);
     }

diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
@@ -45,6 +45,9 @@ protected function tearDown(): void
         parent::tearDown();
 
         Locale::setDefault($this->currentLocale);
+
+        // Reset current time.
+        Time::setTestNow();
     }
 
     public function testNewTimeNow()
@@ -224,7 +227,6 @@ public function testCreateFromFormat()
         $time = Time::createFromFormat('F j, Y', 'January 15, 2017', 'America/Chicago');
 
         $this->assertCloseEnoughString(date('2017-01-15 H:i:s', $now->getTimestamp()), $time->toDateTimeString());
-        Time::setTestNow();
     }
 
     public function testCreateFromFormatWithTimezoneString()