Merge pull request #6852 from ping-yee/refactor-replace-time-email

deptrac.yaml

@@ -162,6 +162,7 @@ parameters:
       - Entity
       - Events
     Email:
+      - I18n
       - Events
     Entity:
       - I18n

system/Email/Email.php

@@ -12,6 +12,7 @@
 namespace CodeIgniter\Email;
 
 use CodeIgniter\Events\Events;
+use CodeIgniter\I18n\Time;
 use Config\Mimes;
 use ErrorException;
 
@@ -2038,8 +2039,8 @@ protected function sendData($data)
             // See https://bugs.php.net/bug.php?id=39598 and http://php.net/manual/en/function.fwrite.php#96951
             if ($result === 0) {
                 if ($timestamp === 0) {
-                    $timestamp = time();
-                } elseif ($timestamp < (time() - $this->SMTPTimeout)) {
+                    $timestamp = Time::now()->getTimestamp();
+                } elseif ($timestamp < (Time::now()->getTimestamp() - $this->SMTPTimeout)) {
                     $result = false;
 
                     break;

system/Helpers/date_helper.php

@@ -11,11 +11,13 @@
 
 // CodeIgniter Date Helpers
 
+use CodeIgniter\I18n\Time;
+
 if (! function_exists('now')) {
     /**
      * Get "now" time
      *
-     * Returns time() based on the timezone parameter or on the
+     * Returns Time::now()->getTimestamp() based on the timezone parameter or on the
      * app_timezone() setting
      *
      * @param string $timezone
@@ -27,7 +29,7 @@ function now(?string $timezone = null): int
         $timezone = empty($timezone) ? app_timezone() : $timezone;
 
         if ($timezone === 'local' || $timezone === date_default_timezone_get()) {
-            return time();
+            return Time::now()->getTimestamp();
         }
 
         $datetime = new DateTime('now', new DateTimeZone($timezone));