Abstract WP's current_time() function in the code base

lib/API/JSON/v1/Newsletters.php

@@ -19,6 +19,7 @@ use MailPoet\Newsletter\Renderer\Renderer;
 use MailPoet\Newsletter\Scheduler\Scheduler;
 use MailPoet\Newsletter\Url as NewsletterUrl;
 use MailPoet\WP\Hooks;
+use MailPoet\WP\Functions as WPFunctions;
 
 if(!defined('ABSPATH')) exit;
 
@@ -169,7 +170,7 @@ class Newsletters extends APIEndpoint {
       $queue = $newsletter->queue()->findOne();
       if($queue) {
         $queue->task()
-          ->whereLte('scheduled_at', Carbon::createFromTimestamp(current_time('timestamp')))
+          ->whereLte('scheduled_at', Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp')))
           ->where('status', SendingQueue::STATUS_SCHEDULED)
           ->findResultSet()
           ->set('scheduled_at', $next_run_date)
@@ -414,7 +415,7 @@ class Newsletters extends APIEndpoint {
       'groups' => $listing_data['groups'],
       'mta_log' => Setting::getValue('mta_log'),
       'mta_method' => Setting::getValue('mta.method'),
-      'current_time' => current_time('mysql')
+      'current_time' => WPFunctions::currentTime('mysql')
     ));
   }
 

lib/Config/Menu.php

@@ -25,6 +25,7 @@ use MailPoet\Util\License\License;
 use MailPoet\WP\DateTime;
 use MailPoet\WP\Notice as WPNotice;
 use MailPoet\WP\Readme;
+use MailPoet\WP\Functions as WPFunctions;
 
 if(!defined('ABSPATH')) exit;
 
@@ -383,7 +384,7 @@ class Menu {
     $data['is_old_user'] = false;
     if(!empty($data['settings']['installed_at'])) {
       $installed_at = Carbon::createFromTimestamp(strtotime($data['settings']['installed_at']));
-      $current_time = Carbon::createFromTimestamp(current_time('timestamp'));
+      $current_time =  Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp'));
       $data['is_new_user'] = $current_time->diffInDays($installed_at) <= 30;
       $data['is_old_user'] = $current_time->diffInMonths($installed_at) >= 6;
       $data['stop_call_for_rating'] = isset($data['settings']['stop_call_for_rating']) ? $data['settings']['stop_call_for_rating'] : false;

lib/Cron/Workers/Scheduler.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace MailPoet\Cron\Workers;
 
 use Carbon\Carbon;
@@ -8,8 +9,8 @@ use MailPoet\Models\Subscriber;
 use MailPoet\Models\SubscriberSegment;
 use MailPoet\Segments\SubscribersFinder;
 use MailPoet\Tasks\Sending as SendingTask;
-use MailPoet\Util\Helpers;
 use MailPoet\Newsletter\Scheduler\Scheduler as NewsletterScheduler;
+use MailPoet\WP\Functions as WPFunctions;
 
 if(!defined('ABSPATH')) exit;
 require_once(ABSPATH . 'wp-includes/pluggable.php');
@@ -125,7 +126,7 @@ class Scheduler {
     // check if subscriber is confirmed (subscribed)
     if($subscriber->status !== Subscriber::STATUS_SUBSCRIBED) {
       // reschedule delivery in 5 minutes
-      $scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+      $scheduled_at = Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp'));
       $queue->scheduled_at = $scheduled_at->addMinutes(
         self::UNCONFIRMED_SUBSCRIBER_RESCHEDULE_TIMEOUT
       );

lib/Cron/Workers/SimpleWorker.php

@@ -1,9 +1,11 @@
 <?php
+
 namespace MailPoet\Cron\Workers;
 
 use Carbon\Carbon;
 use MailPoet\Cron\CronHelper;
 use MailPoet\Models\ScheduledTask;
+use MailPoet\WP\Functions as WPFunctions;
 
 if(!defined('ABSPATH')) exit;
 
@@ -94,19 +96,19 @@ abstract class SimpleWorker {
   }
 
   function complete(ScheduledTask $task) {
-    $task->processed_at = current_time('mysql');
+    $task->processed_at = WPFunctions::currentTime('mysql');
     $task->status = ScheduledTask::STATUS_COMPLETED;
     $task->save();
   }
 
   function reschedule(ScheduledTask $task, $timeout) {
-    $scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $scheduled_at = Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp'));
     $task->scheduled_at = $scheduled_at->addMinutes($timeout);
     $task->save();
   }
 
   static function getNextRunDate() {
-    $date = Carbon::createFromTimestamp(current_time('timestamp'));
+    $date = Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp'));
     // Random day of the next week
     $date->setISODate($date->format('o'), $date->format('W') + 1, mt_rand(1, 7));
     $date->startOfDay();
@@ -116,7 +118,7 @@ abstract class SimpleWorker {
   static function getScheduledTasks($future = false) {
     $dateWhere = ($future) ? 'whereGt' : 'whereLte';
     return ScheduledTask::where('type', static::TASK_TYPE)
-      ->$dateWhere('scheduled_at', Carbon::createFromTimestamp(current_time('timestamp')))
+      ->$dateWhere('scheduled_at', Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp')))
       ->whereNull('deleted_at')
       ->where('status', ScheduledTask::STATUS_SCHEDULED)
       ->findMany();
@@ -124,7 +126,7 @@ abstract class SimpleWorker {
 
   static function getRunningTasks() {
     return ScheduledTask::where('type', static::TASK_TYPE)
-      ->whereLte('scheduled_at', Carbon::createFromTimestamp(current_time('timestamp')))
+      ->whereLte('scheduled_at', Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp')))
       ->whereNull('deleted_at')
       ->whereNull('status')
       ->findMany();

lib/Models/ScheduledTask.php

@@ -1,6 +1,9 @@
 <?php
+
 namespace MailPoet\Models;
 
+use MailPoet\WP\Functions as WPFunctions;
+
 if(!defined('ABSPATH')) exit;
 
 class ScheduledTask extends Model {
@@ -34,7 +37,7 @@ class ScheduledTask extends Model {
   }
 
   function complete() {
-    $this->processed_at = current_time('mysql');
+    $this->processed_at = WPFunctions::currentTime('mysql');
     $this->set('status', self::STATUS_COMPLETED);
     $this->save();
     return ($this->getErrors() === false && $this->id() > 0);

lib/Newsletter/Scheduler/Scheduler.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace MailPoet\Newsletter\Scheduler;
 
 use Carbon\Carbon;
@@ -8,6 +9,7 @@ use MailPoet\Models\NewsletterOptionField;
 use MailPoet\Models\NewsletterPost;
 use MailPoet\Models\SendingQueue;
 use MailPoet\Tasks\Sending as SendingTask;
+use MailPoet\WP\Functions as WPFunctions;
 
 class Scheduler {
   const SECONDS_IN_HOUR = 3600;
@@ -85,7 +87,7 @@ class Scheduler {
     $after_time_type = $newsletter->afterTimeType;
     $after_time_number = $newsletter->afterTimeNumber;
     $scheduled_at = null;
-    $current_time = Carbon::createFromTimestamp(current_time('timestamp'));
+    $current_time = Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp'));
     switch($after_time_type) {
       case 'hours':
         $scheduled_at = $current_time->addHours($after_time_number);
@@ -162,7 +164,7 @@ class Scheduler {
   }
 
   static function getNextRunDate($schedule, $from_timestamp = false) {
-    $from_timestamp = ($from_timestamp) ? $from_timestamp : current_time('timestamp');
+    $from_timestamp = ($from_timestamp) ? $from_timestamp : WPFunctions::currentTime('timestamp');
     try {
       $schedule = \Cron\CronExpression::factory($schedule);
       $next_run_date = $schedule->getNextRunDate(Carbon::createFromTimestamp($from_timestamp))
@@ -174,7 +176,7 @@ class Scheduler {
   }
 
   static function getPreviousRunDate($schedule, $from_timestamp = false) {
-    $from_timestamp = ($from_timestamp) ? $from_timestamp : current_time('timestamp');
+    $from_timestamp = ($from_timestamp) ? $from_timestamp : WPFunctions::currentTime('timestamp');
     try {
       $schedule = \Cron\CronExpression::factory($schedule);
       $previous_run_date = $schedule->getPreviousRunDate(Carbon::createFromTimestamp($from_timestamp))

lib/Newsletter/Shortcodes/Categories/Date.php

@@ -2,6 +2,8 @@
 
 namespace MailPoet\Newsletter\Shortcodes\Categories;
 
+use MailPoet\WP\Functions as WPFunctions;
+
 class Date {
   static function process(
     $action,
@@ -17,10 +19,10 @@ class Date {
       'y' => 'Y'
     );
     if(!empty($action_mapping[$action])) {
-      return date_i18n($action_mapping[$action], current_time('timestamp'));
+      return date_i18n($action_mapping[$action], WPFunctions::currentTime('timestamp'));
     }
     return ($action === 'custom' && $action_argument === 'format') ?
-      date_i18n($action_argument_value, current_time('timestamp')) :
+      date_i18n($action_argument_value, WPFunctions::currentTime('timestamp')) :
       false;
   }
 }

lib/Tasks/Sending.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace MailPoet\Tasks;
 
 use Carbon\Carbon;
@@ -6,6 +7,7 @@ use MailPoet\Models\ScheduledTask;
 use MailPoet\Models\ScheduledTaskSubscriber;
 use MailPoet\Models\SendingQueue;
 use MailPoet\Util\Helpers;
+use MailPoet\WP\Functions as WPFunctions;
 
 if(!defined('ABSPATH')) exit;
 
@@ -221,7 +223,7 @@ class Sending {
 
   static function getScheduledQueues() {
     $tasks = ScheduledTask::where('status', ScheduledTask::STATUS_SCHEDULED)
-      ->whereLte('scheduled_at', Carbon::createFromTimestamp(current_time('timestamp')))
+      ->whereLte('scheduled_at', Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp')))
       ->where('type', 'sending')
       ->findMany();
     $result = array();

lib/WP/DateTime.php

@@ -1,6 +1,9 @@
 <?php
+
 namespace MailPoet\WP;
 
+use MailPoet\WP\Functions as WPFunctions;
+
 class DateTime {
 
   const DEFAULT_DATE_FORMAT = 'Y-m-d';
@@ -24,7 +27,7 @@ class DateTime {
 
   function getCurrentTime($format=false) {
     if (empty($format)) $format = $this->getTimeFormat();
-    return current_time($format);
+    return WPFunctions::currentTime($format);
   }
 
   function getCurrentDate($format=false) {