AyeCode / invoicing

includes/libraries/action-scheduler/classes/migration/ActionScheduler_DBStoreMigrator.php

Indentation +31 added lines, -31 removed lines

@@ -9,39 +9,39 @@
  */
 class ActionScheduler_DBStoreMigrator extends ActionScheduler_DBStore {
 
-	/**
-	 * Save an action with optional last attempt date.
-	 *
-	 * Normally, saving an action sets its attempted date to 0000-00-00 00:00:00 because when an action is first saved,
-	 * it can't have been attempted yet, but migrated completed actions will have an attempted date, so we need to save
-	 * that when first saving the action.
-	 *
-	 * @param ActionScheduler_Action $action
-	 * @param \DateTime $scheduled_date Optional date of the first instance to store.
-	 * @param \DateTime $last_attempt_date Optional date the action was last attempted.
-	 *
-	 * @return string The action ID
-	 * @throws \RuntimeException When the action is not saved.
-	 */
-	public function save_action( ActionScheduler_Action $action, \DateTime $scheduled_date = null, \DateTime $last_attempt_date = null ){
-		try {
-			/** @var \wpdb $wpdb */
-			global $wpdb;
+    /**
+     * Save an action with optional last attempt date.
+     *
+     * Normally, saving an action sets its attempted date to 0000-00-00 00:00:00 because when an action is first saved,
+     * it can't have been attempted yet, but migrated completed actions will have an attempted date, so we need to save
+     * that when first saving the action.
+     *
+     * @param ActionScheduler_Action $action
+     * @param \DateTime $scheduled_date Optional date of the first instance to store.
+     * @param \DateTime $last_attempt_date Optional date the action was last attempted.
+     *
+     * @return string The action ID
+     * @throws \RuntimeException When the action is not saved.
+     */
+    public function save_action( ActionScheduler_Action $action, \DateTime $scheduled_date = null, \DateTime $last_attempt_date = null ){
+        try {
+            /** @var \wpdb $wpdb */
+            global $wpdb;
 
-			$action_id = parent::save_action( $action, $scheduled_date );
+            $action_id = parent::save_action( $action, $scheduled_date );
 
-			if ( null !== $last_attempt_date ) {
-				$data = [
-					'last_attempt_gmt'   => $this->get_scheduled_date_string( $action, $last_attempt_date ),
-					'last_attempt_local' => $this->get_scheduled_date_string_local( $action, $last_attempt_date ),
-				];
+            if ( null !== $last_attempt_date ) {
+                $data = [
+                    'last_attempt_gmt'   => $this->get_scheduled_date_string( $action, $last_attempt_date ),
+                    'last_attempt_local' => $this->get_scheduled_date_string_local( $action, $last_attempt_date ),
+                ];
 
-				$wpdb->update( $wpdb->actionscheduler_actions, $data, array( 'action_id' => $action_id ), array( '%s', '%s' ), array( '%d' ) );
-			}
+                $wpdb->update( $wpdb->actionscheduler_actions, $data, array( 'action_id' => $action_id ), array( '%s', '%s' ), array( '%d' ) );
+            }
 
-			return $action_id;
-		} catch ( \Exception $e ) {
-			throw new \RuntimeException( sprintf( __( 'Error saving action: %s', 'action-scheduler' ), $e->getMessage() ), 0 );
-		}
-	}
+            return $action_id;
+        } catch ( \Exception $e ) {
+            throw new \RuntimeException( sprintf( __( 'Error saving action: %s', 'action-scheduler' ), $e->getMessage() ), 0 );
+        }
+    }
 }

includes/libraries/action-scheduler/classes/migration/Controller.php

Indentation +186 added lines, -186 removed lines

@@ -17,190 +17,190 @@
  * @codeCoverageIgnore
  */
 class Controller {
-	private static $instance;
-
-	/** @var Action_Scheduler\Migration\Scheduler */
-	private $migration_scheduler;
-
-	/** @var string */
-	private $store_classname;
-
-	/** @var string */
-	private $logger_classname;
-
-	/** @var bool */
-	private $migrate_custom_store;
-
-	/**
-	 * Controller constructor.
-	 *
-	 * @param Scheduler $migration_scheduler Migration scheduler object.
-	 */
-	protected function __construct( Scheduler $migration_scheduler ) {
-		$this->migration_scheduler = $migration_scheduler;
-		$this->store_classname     = '';
-	}
-
-	/**
-	 * Set the action store class name.
-	 *
-	 * @param string $class Classname of the store class.
-	 *
-	 * @return string
-	 */
-	public function get_store_class( $class ) {
-		if ( \ActionScheduler_DataController::is_migration_complete() ) {
-			return \ActionScheduler_DataController::DATASTORE_CLASS;
-		} elseif ( \ActionScheduler_Store::DEFAULT_CLASS !== $class ) {
-			$this->store_classname = $class;
-			return $class;
-		} else {
-			return 'ActionScheduler_HybridStore';
-		}
-	}
-
-	/**
-	 * Set the action logger class name.
-	 *
-	 * @param string $class Classname of the logger class.
-	 *
-	 * @return string
-	 */
-	public function get_logger_class( $class ) {
-		\ActionScheduler_Store::instance();
-
-		if ( $this->has_custom_datastore() ) {
-			$this->logger_classname = $class;
-			return $class;
-		} else {
-			return \ActionScheduler_DataController::LOGGER_CLASS;
-		}
-	}
-
-	/**
-	 * Get flag indicating whether a custom datastore is in use.
-	 *
-	 * @return bool
-	 */
-	public function has_custom_datastore() {
-		return (bool) $this->store_classname;
-	}
-
-	/**
-	 * Set up the background migration process
-	 *
-	 * @return void
-	 */
-	public function schedule_migration() {
-		if ( \ActionScheduler_DataController::is_migration_complete() || $this->migration_scheduler->is_migration_scheduled() ) {
-			return;
-		}
-
-		$this->migration_scheduler->schedule_migration();
-	}
-
-	/**
-	 * Get the default migration config object
-	 *
-	 * @return ActionScheduler\Migration\Config
-	 */
-	public function get_migration_config_object() {
-		static $config = null;
-
-		if ( ! $config ) {
-			$source_store  = $this->store_classname ? new $this->store_classname() : new \ActionScheduler_wpPostStore();
-			$source_logger = $this->logger_classname ? new $this->logger_classname() : new \ActionScheduler_wpCommentLogger();
-
-			$config = new Config();
-			$config->set_source_store( $source_store );
-			$config->set_source_logger( $source_logger );
-			$config->set_destination_store( new \ActionScheduler_DBStoreMigrator() );
-			$config->set_destination_logger( new \ActionScheduler_DBLogger() );
-
-			if ( defined( 'WP_CLI' ) && WP_CLI ) {
-				$config->set_progress_bar( new ProgressBar( '', 0 ) );
-			}
-		}
-
-		return apply_filters( 'action_scheduler/migration_config', $config );
-	}
-
-	/**
-	 * Hook dashboard migration notice.
-	 */
-	public function hook_admin_notices() {
-		if ( ! $this->allow_migration() || \ActionScheduler_DataController::is_migration_complete() ) {
-			return;
-		}
-		add_action( 'admin_notices', array( $this, 'display_migration_notice' ), 10, 0 );
-	}
-
-	/**
-	 * Show a dashboard notice that migration is in progress.
-	 */
-	public function display_migration_notice() {
-		printf( '<div class="notice notice-warning"><p>%s</p></div>', __( 'Action Scheduler migration in progress. The list of scheduled actions may be incomplete.', 'action-scheduler' ) );
-	}
-
-	/**
-	 * Add store classes. Hook migration.
-	 */
-	private function hook() {
-		add_filter( 'action_scheduler_store_class', array( $this, 'get_store_class' ), 100, 1 );
-		add_filter( 'action_scheduler_logger_class', array( $this, 'get_logger_class' ), 100, 1 );
-		add_action( 'init', array( $this, 'maybe_hook_migration' ) );
-		add_action( 'shutdown', array( $this, 'schedule_migration' ), 0, 0 );
-
-		// Action Scheduler may be displayed as a Tools screen or WooCommerce > Status administration screen
-		add_action( 'load-tools_page_action-scheduler', array( $this, 'hook_admin_notices' ), 10, 0 );
-		add_action( 'load-woocommerce_page_wc-status', array( $this, 'hook_admin_notices' ), 10, 0 );
-	}
-
-	/**
-	 * Possibly hook the migration scheduler action.
-	 *
-	 * @author Jeremy Pry
-	 */
-	public function maybe_hook_migration() {
-		if ( ! $this->allow_migration() || \ActionScheduler_DataController::is_migration_complete() ) {
-			return;
-		}
-
-		$this->migration_scheduler->hook();
-	}
-
-	/**
-	 * Allow datastores to enable migration to AS tables.
-	 */
-	public function allow_migration() {
-		if ( ! \ActionScheduler_DataController::dependencies_met() ) {
-			return false;
-		}
-
-		if ( null === $this->migrate_custom_store ) {
-			$this->migrate_custom_store = apply_filters( 'action_scheduler_migrate_data_store', false );
-		}
-
-		return ( ! $this->has_custom_datastore() ) || $this->migrate_custom_store;
-	}
-
-	/**
-	 * Proceed with the migration if the dependencies have been met.
-	 */
-	public static function init() {
-		if ( \ActionScheduler_DataController::dependencies_met() ) {
-			self::instance()->hook();
-		}
-	}
-
-	/**
-	 * Singleton factory.
-	 */
-	public static function instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new static( new Scheduler() );
-		}
-
-		return self::$instance;
-	}
+    private static $instance;
+
+    /** @var Action_Scheduler\Migration\Scheduler */
+    private $migration_scheduler;
+
+    /** @var string */
+    private $store_classname;
+
+    /** @var string */
+    private $logger_classname;
+
+    /** @var bool */
+    private $migrate_custom_store;
+
+    /**
+     * Controller constructor.
+     *
+     * @param Scheduler $migration_scheduler Migration scheduler object.
+     */
+    protected function __construct( Scheduler $migration_scheduler ) {
+        $this->migration_scheduler = $migration_scheduler;
+        $this->store_classname     = '';
+    }
+
+    /**
+     * Set the action store class name.
+     *
+     * @param string $class Classname of the store class.
+     *
+     * @return string
+     */
+    public function get_store_class( $class ) {
+        if ( \ActionScheduler_DataController::is_migration_complete() ) {
+            return \ActionScheduler_DataController::DATASTORE_CLASS;
+        } elseif ( \ActionScheduler_Store::DEFAULT_CLASS !== $class ) {
+            $this->store_classname = $class;
+            return $class;
+        } else {
+            return 'ActionScheduler_HybridStore';
+        }
+    }
+
+    /**
+     * Set the action logger class name.
+     *
+     * @param string $class Classname of the logger class.
+     *
+     * @return string
+     */
+    public function get_logger_class( $class ) {
+        \ActionScheduler_Store::instance();
+
+        if ( $this->has_custom_datastore() ) {
+            $this->logger_classname = $class;
+            return $class;
+        } else {
+            return \ActionScheduler_DataController::LOGGER_CLASS;
+        }
+    }
+
+    /**
+     * Get flag indicating whether a custom datastore is in use.
+     *
+     * @return bool
+     */
+    public function has_custom_datastore() {
+        return (bool) $this->store_classname;
+    }
+
+    /**
+     * Set up the background migration process
+     *
+     * @return void
+     */
+    public function schedule_migration() {
+        if ( \ActionScheduler_DataController::is_migration_complete() || $this->migration_scheduler->is_migration_scheduled() ) {
+            return;
+        }
+
+        $this->migration_scheduler->schedule_migration();
+    }
+
+    /**
+     * Get the default migration config object
+     *
+     * @return ActionScheduler\Migration\Config
+     */
+    public function get_migration_config_object() {
+        static $config = null;
+
+        if ( ! $config ) {
+            $source_store  = $this->store_classname ? new $this->store_classname() : new \ActionScheduler_wpPostStore();
+            $source_logger = $this->logger_classname ? new $this->logger_classname() : new \ActionScheduler_wpCommentLogger();
+
+            $config = new Config();
+            $config->set_source_store( $source_store );
+            $config->set_source_logger( $source_logger );
+            $config->set_destination_store( new \ActionScheduler_DBStoreMigrator() );
+            $config->set_destination_logger( new \ActionScheduler_DBLogger() );
+
+            if ( defined( 'WP_CLI' ) && WP_CLI ) {
+                $config->set_progress_bar( new ProgressBar( '', 0 ) );
+            }
+        }
+
+        return apply_filters( 'action_scheduler/migration_config', $config );
+    }
+
+    /**
+     * Hook dashboard migration notice.
+     */
+    public function hook_admin_notices() {
+        if ( ! $this->allow_migration() || \ActionScheduler_DataController::is_migration_complete() ) {
+            return;
+        }
+        add_action( 'admin_notices', array( $this, 'display_migration_notice' ), 10, 0 );
+    }
+
+    /**
+     * Show a dashboard notice that migration is in progress.
+     */
+    public function display_migration_notice() {
+        printf( '<div class="notice notice-warning"><p>%s</p></div>', __( 'Action Scheduler migration in progress. The list of scheduled actions may be incomplete.', 'action-scheduler' ) );
+    }
+
+    /**
+     * Add store classes. Hook migration.
+     */
+    private function hook() {
+        add_filter( 'action_scheduler_store_class', array( $this, 'get_store_class' ), 100, 1 );
+        add_filter( 'action_scheduler_logger_class', array( $this, 'get_logger_class' ), 100, 1 );
+        add_action( 'init', array( $this, 'maybe_hook_migration' ) );
+        add_action( 'shutdown', array( $this, 'schedule_migration' ), 0, 0 );
+
+        // Action Scheduler may be displayed as a Tools screen or WooCommerce > Status administration screen
+        add_action( 'load-tools_page_action-scheduler', array( $this, 'hook_admin_notices' ), 10, 0 );
+        add_action( 'load-woocommerce_page_wc-status', array( $this, 'hook_admin_notices' ), 10, 0 );
+    }
+
+    /**
+     * Possibly hook the migration scheduler action.
+     *
+     * @author Jeremy Pry
+     */
+    public function maybe_hook_migration() {
+        if ( ! $this->allow_migration() || \ActionScheduler_DataController::is_migration_complete() ) {
+            return;
+        }
+
+        $this->migration_scheduler->hook();
+    }
+
+    /**
+     * Allow datastores to enable migration to AS tables.
+     */
+    public function allow_migration() {
+        if ( ! \ActionScheduler_DataController::dependencies_met() ) {
+            return false;
+        }
+
+        if ( null === $this->migrate_custom_store ) {
+            $this->migrate_custom_store = apply_filters( 'action_scheduler_migrate_data_store', false );
+        }
+
+        return ( ! $this->has_custom_datastore() ) || $this->migrate_custom_store;
+    }
+
+    /**
+     * Proceed with the migration if the dependencies have been met.
+     */
+    public static function init() {
+        if ( \ActionScheduler_DataController::dependencies_met() ) {
+            self::instance()->hook();
+        }
+    }
+
+    /**
+     * Singleton factory.
+     */
+    public static function instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new static( new Scheduler() );
+        }
+
+        return self::$instance;
+    }
 }

includes/libraries/action-scheduler/classes/migration/ActionMigrator.php

Indentation +93 added lines, -93 removed lines

@@ -13,97 +13,97 @@
  * @codeCoverageIgnore
  */
 class ActionMigrator {
-	/** var ActionScheduler_Store */
-	private $source;
-
-	/** var ActionScheduler_Store */
-	private $destination;
-
-	/** var LogMigrator */
-	private $log_migrator;
-
-	/**
-	 * ActionMigrator constructor.
-	 *
-	 * @param ActionScheduler_Store $source_store Source store object.
-	 * @param ActionScheduler_Store $destination_store Destination store object.
-	 * @param LogMigrator           $log_migrator Log migrator object.
-	 */
-	public function __construct( \ActionScheduler_Store $source_store, \ActionScheduler_Store $destination_store, LogMigrator $log_migrator ) {
-		$this->source       = $source_store;
-		$this->destination  = $destination_store;
-		$this->log_migrator = $log_migrator;
-	}
-
-	/**
-	 * Migrate an action.
-	 *
-	 * @param int $source_action_id Action ID.
-	 *
-	 * @return int 0|new action ID
-	 */
-	public function migrate( $source_action_id ) {
-		try {
-			$action = $this->source->fetch_action( $source_action_id );
-			$status = $this->source->get_status( $source_action_id );
-		} catch ( \Exception $e ) {
-			$action = null;
-			$status = '';
-		}
-
-		if ( is_null( $action ) || empty( $status ) || ! $action->get_schedule()->get_date() ) {
-			// null action or empty status means the fetch operation failed or the action didn't exist
-			// null schedule means it's missing vital data
-			// delete it and move on
-			try {
-				$this->source->delete_action( $source_action_id );
-			} catch ( \Exception $e ) {
-				// nothing to do, it didn't exist in the first place
-			}
-			do_action( 'action_scheduler/no_action_to_migrate', $source_action_id, $this->source, $this->destination );
-
-			return 0;
-		}
-
-		try {
-
-			// Make sure the last attempt date is set correctly for completed and failed actions
-			$last_attempt_date = ( $status !== \ActionScheduler_Store::STATUS_PENDING ) ? $this->source->get_date( $source_action_id ) : null;
-
-			$destination_action_id = $this->destination->save_action( $action, null, $last_attempt_date );
-		} catch ( \Exception $e ) {
-			do_action( 'action_scheduler/migrate_action_failed', $source_action_id, $this->source, $this->destination );
-
-			return 0; // could not save the action in the new store
-		}
-
-		try {
-			switch ( $status ) {
-				case \ActionScheduler_Store::STATUS_FAILED :
-					$this->destination->mark_failure( $destination_action_id );
-					break;
-				case \ActionScheduler_Store::STATUS_CANCELED :
-					$this->destination->cancel_action( $destination_action_id );
-					break;
-			}
-
-			$this->log_migrator->migrate( $source_action_id, $destination_action_id );
-			$this->source->delete_action( $source_action_id );
-
-			$test_action = $this->source->fetch_action( $source_action_id );
-			if ( ! is_a( $test_action, 'ActionScheduler_NullAction' ) ) {
-				throw new \RuntimeException( sprintf( __( 'Unable to remove source migrated action %s', 'action-scheduler' ), $source_action_id ) );
-			}
-			do_action( 'action_scheduler/migrated_action', $source_action_id, $destination_action_id, $this->source, $this->destination );
-
-			return $destination_action_id;
-		} catch ( \Exception $e ) {
-			// could not delete from the old store
-			$this->source->mark_migrated( $source_action_id );
-			do_action( 'action_scheduler/migrate_action_incomplete', $source_action_id, $destination_action_id, $this->source, $this->destination );
-			do_action( 'action_scheduler/migrated_action', $source_action_id, $destination_action_id, $this->source, $this->destination );
-
-			return $destination_action_id;
-		}
-	}
+    /** var ActionScheduler_Store */
+    private $source;
+
+    /** var ActionScheduler_Store */
+    private $destination;
+
+    /** var LogMigrator */
+    private $log_migrator;
+
+    /**
+     * ActionMigrator constructor.
+     *
+     * @param ActionScheduler_Store $source_store Source store object.
+     * @param ActionScheduler_Store $destination_store Destination store object.
+     * @param LogMigrator           $log_migrator Log migrator object.
+     */
+    public function __construct( \ActionScheduler_Store $source_store, \ActionScheduler_Store $destination_store, LogMigrator $log_migrator ) {
+        $this->source       = $source_store;
+        $this->destination  = $destination_store;
+        $this->log_migrator = $log_migrator;
+    }
+
+    /**
+     * Migrate an action.
+     *
+     * @param int $source_action_id Action ID.
+     *
+     * @return int 0|new action ID
+     */
+    public function migrate( $source_action_id ) {
+        try {
+            $action = $this->source->fetch_action( $source_action_id );
+            $status = $this->source->get_status( $source_action_id );
+        } catch ( \Exception $e ) {
+            $action = null;
+            $status = '';
+        }
+
+        if ( is_null( $action ) || empty( $status ) || ! $action->get_schedule()->get_date() ) {
+            // null action or empty status means the fetch operation failed or the action didn't exist
+            // null schedule means it's missing vital data
+            // delete it and move on
+            try {
+                $this->source->delete_action( $source_action_id );
+            } catch ( \Exception $e ) {
+                // nothing to do, it didn't exist in the first place
+            }
+            do_action( 'action_scheduler/no_action_to_migrate', $source_action_id, $this->source, $this->destination );
+
+            return 0;
+        }
+
+        try {
+
+            // Make sure the last attempt date is set correctly for completed and failed actions
+            $last_attempt_date = ( $status !== \ActionScheduler_Store::STATUS_PENDING ) ? $this->source->get_date( $source_action_id ) : null;
+
+            $destination_action_id = $this->destination->save_action( $action, null, $last_attempt_date );
+        } catch ( \Exception $e ) {
+            do_action( 'action_scheduler/migrate_action_failed', $source_action_id, $this->source, $this->destination );
+
+            return 0; // could not save the action in the new store
+        }
+
+        try {
+            switch ( $status ) {
+                case \ActionScheduler_Store::STATUS_FAILED :
+                    $this->destination->mark_failure( $destination_action_id );
+                    break;
+                case \ActionScheduler_Store::STATUS_CANCELED :
+                    $this->destination->cancel_action( $destination_action_id );
+                    break;
+            }
+
+            $this->log_migrator->migrate( $source_action_id, $destination_action_id );
+            $this->source->delete_action( $source_action_id );
+
+            $test_action = $this->source->fetch_action( $source_action_id );
+            if ( ! is_a( $test_action, 'ActionScheduler_NullAction' ) ) {
+                throw new \RuntimeException( sprintf( __( 'Unable to remove source migrated action %s', 'action-scheduler' ), $source_action_id ) );
+            }
+            do_action( 'action_scheduler/migrated_action', $source_action_id, $destination_action_id, $this->source, $this->destination );
+
+            return $destination_action_id;
+        } catch ( \Exception $e ) {
+            // could not delete from the old store
+            $this->source->mark_migrated( $source_action_id );
+            do_action( 'action_scheduler/migrate_action_incomplete', $source_action_id, $destination_action_id, $this->source, $this->destination );
+            do_action( 'action_scheduler/migrated_action', $source_action_id, $destination_action_id, $this->source, $this->destination );
+
+            return $destination_action_id;
+        }
+    }
 }

includes/libraries/action-scheduler/classes/schedules/ActionScheduler_IntervalSchedule.php

Indentation +64 added lines, -64 removed lines

@@ -5,77 +5,77 @@
  */
 class ActionScheduler_IntervalSchedule extends ActionScheduler_Abstract_RecurringSchedule implements ActionScheduler_Schedule {
 
-	/**
-	 * Deprecated property @see $this->__wakeup() for details.
-	 **/
-	private $start_timestamp = NULL;
+    /**
+     * Deprecated property @see $this->__wakeup() for details.
+     **/
+    private $start_timestamp = NULL;
 
-	/**
-	 * Deprecated property @see $this->__wakeup() for details.
-	 **/
-	private $interval_in_seconds = NULL;
+    /**
+     * Deprecated property @see $this->__wakeup() for details.
+     **/
+    private $interval_in_seconds = NULL;
 
-	/**
-	 * Calculate when this schedule should start after a given date & time using
-	 * the number of seconds between recurrences.
-	 *
-	 * @param DateTime $after
-	 * @return DateTime
-	 */
-	protected function calculate_next( DateTime $after ) {
-		$after->modify( '+' . (int) $this->get_recurrence() . ' seconds' );
-		return $after;
-	}
+    /**
+     * Calculate when this schedule should start after a given date & time using
+     * the number of seconds between recurrences.
+     *
+     * @param DateTime $after
+     * @return DateTime
+     */
+    protected function calculate_next( DateTime $after ) {
+        $after->modify( '+' . (int) $this->get_recurrence() . ' seconds' );
+        return $after;
+    }
 
-	/**
-	 * @return int
-	 */
-	public function interval_in_seconds() {
-		_deprecated_function( __METHOD__, '3.0.0', '(int)ActionScheduler_Abstract_RecurringSchedule::get_recurrence()' );
-		return (int) $this->get_recurrence();
-	}
+    /**
+     * @return int
+     */
+    public function interval_in_seconds() {
+        _deprecated_function( __METHOD__, '3.0.0', '(int)ActionScheduler_Abstract_RecurringSchedule::get_recurrence()' );
+        return (int) $this->get_recurrence();
+    }
 
-	/**
-	 * Serialize interval schedules with data required prior to AS 3.0.0
-	 *
-	 * Prior to Action Scheduler 3.0.0, reccuring schedules used different property names to
-	 * refer to equivalent data. For example, ActionScheduler_IntervalSchedule::start_timestamp
-	 * was the same as ActionScheduler_SimpleSchedule::timestamp. Action Scheduler 3.0.0
-	 * aligned properties and property names for better inheritance. To guard against the
-	 * possibility of infinite loops if downgrading to Action Scheduler < 3.0.0, we need to
-	 * also store the data with the old property names so if it's unserialized in AS < 3.0,
-	 * the schedule doesn't end up with a null/false/0 recurrence.
-	 *
-	 * @return array
-	 */
-	public function __sleep() {
+    /**
+     * Serialize interval schedules with data required prior to AS 3.0.0
+     *
+     * Prior to Action Scheduler 3.0.0, reccuring schedules used different property names to
+     * refer to equivalent data. For example, ActionScheduler_IntervalSchedule::start_timestamp
+     * was the same as ActionScheduler_SimpleSchedule::timestamp. Action Scheduler 3.0.0
+     * aligned properties and property names for better inheritance. To guard against the
+     * possibility of infinite loops if downgrading to Action Scheduler < 3.0.0, we need to
+     * also store the data with the old property names so if it's unserialized in AS < 3.0,
+     * the schedule doesn't end up with a null/false/0 recurrence.
+     *
+     * @return array
+     */
+    public function __sleep() {
 
-		$sleep_params = parent::__sleep();
+        $sleep_params = parent::__sleep();
 
-		$this->start_timestamp     = $this->scheduled_timestamp;
-		$this->interval_in_seconds = $this->recurrence;
+        $this->start_timestamp     = $this->scheduled_timestamp;
+        $this->interval_in_seconds = $this->recurrence;
 
-		return array_merge( $sleep_params, array(
-			'start_timestamp',
-			'interval_in_seconds'
-		) );
-	}
+        return array_merge( $sleep_params, array(
+            'start_timestamp',
+            'interval_in_seconds'
+        ) );
+    }
 
-	/**
-	 * Unserialize interval schedules serialized/stored prior to AS 3.0.0
-	 *
-	 * For more background, @see ActionScheduler_Abstract_RecurringSchedule::__wakeup().
-	 */
-	public function __wakeup() {
-		if ( is_null( $this->scheduled_timestamp ) && ! is_null( $this->start_timestamp ) ) {
-			$this->scheduled_timestamp = $this->start_timestamp;
-			unset( $this->start_timestamp );
-		}
+    /**
+     * Unserialize interval schedules serialized/stored prior to AS 3.0.0
+     *
+     * For more background, @see ActionScheduler_Abstract_RecurringSchedule::__wakeup().
+     */
+    public function __wakeup() {
+        if ( is_null( $this->scheduled_timestamp ) && ! is_null( $this->start_timestamp ) ) {
+            $this->scheduled_timestamp = $this->start_timestamp;
+            unset( $this->start_timestamp );
+        }
 
-		if ( is_null( $this->recurrence ) && ! is_null( $this->interval_in_seconds ) ) {
-			$this->recurrence = $this->interval_in_seconds;
-			unset( $this->interval_in_seconds );
-		}
-		parent::__wakeup();
-	}
+        if ( is_null( $this->recurrence ) && ! is_null( $this->interval_in_seconds ) ) {
+            $this->recurrence = $this->interval_in_seconds;
+            unset( $this->interval_in_seconds );
+        }
+        parent::__wakeup();
+    }
 }

includes/libraries/action-scheduler/classes/schedules/ActionScheduler_SimpleSchedule.php

Indentation +55 added lines, -55 removed lines

@@ -5,67 +5,67 @@
  */
 class ActionScheduler_SimpleSchedule extends ActionScheduler_Abstract_Schedule {
 
-	/**
-	 * Deprecated property @see $this->__wakeup() for details.
-	 **/
-	private $timestamp = NULL;
+    /**
+     * Deprecated property @see $this->__wakeup() for details.
+     **/
+    private $timestamp = NULL;
 
-	/**
-	 * @param DateTime $after
-	 *
-	 * @return DateTime|null
-	 */
-	public function calculate_next( DateTime $after ) {
-		return null;
-	}
+    /**
+     * @param DateTime $after
+     *
+     * @return DateTime|null
+     */
+    public function calculate_next( DateTime $after ) {
+        return null;
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function is_recurring() {
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function is_recurring() {
+        return false;
+    }
 
-	/**
-	 * Serialize schedule with data required prior to AS 3.0.0
-	 *
-	 * Prior to Action Scheduler 3.0.0, schedules used different property names to refer
-	 * to equivalent data. For example, ActionScheduler_IntervalSchedule::start_timestamp
-	 * was the same as ActionScheduler_SimpleSchedule::timestamp. Action Scheduler 3.0.0
-	 * aligned properties and property names for better inheritance. To guard against the
-	 * scheduled date for single actions always being seen as "now" if downgrading to
-	 * Action Scheduler < 3.0.0, we need to also store the data with the old property names
-	 * so if it's unserialized in AS < 3.0, the schedule doesn't end up with a null recurrence.
-	 *
-	 * @return array
-	 */
-	public function __sleep() {
+    /**
+     * Serialize schedule with data required prior to AS 3.0.0
+     *
+     * Prior to Action Scheduler 3.0.0, schedules used different property names to refer
+     * to equivalent data. For example, ActionScheduler_IntervalSchedule::start_timestamp
+     * was the same as ActionScheduler_SimpleSchedule::timestamp. Action Scheduler 3.0.0
+     * aligned properties and property names for better inheritance. To guard against the
+     * scheduled date for single actions always being seen as "now" if downgrading to
+     * Action Scheduler < 3.0.0, we need to also store the data with the old property names
+     * so if it's unserialized in AS < 3.0, the schedule doesn't end up with a null recurrence.
+     *
+     * @return array
+     */
+    public function __sleep() {
 
-		$sleep_params = parent::__sleep();
+        $sleep_params = parent::__sleep();
 
-		$this->timestamp = $this->scheduled_timestamp;
+        $this->timestamp = $this->scheduled_timestamp;
 
-		return array_merge( $sleep_params, array(
-			'timestamp',
-		) );
-	}
+        return array_merge( $sleep_params, array(
+            'timestamp',
+        ) );
+    }
 
-	/**
-	 * Unserialize recurring schedules serialized/stored prior to AS 3.0.0
-	 *
-	 * Prior to Action Scheduler 3.0.0, schedules used different property names to refer
-	 * to equivalent data. For example, ActionScheduler_IntervalSchedule::start_timestamp
-	 * was the same as ActionScheduler_SimpleSchedule::timestamp. Action Scheduler 3.0.0
-	 * aligned properties and property names for better inheritance. To maintain backward
-	 * compatibility with schedules serialized and stored prior to 3.0, we need to correctly
-	 * map the old property names with matching visibility.
-	 */
-	public function __wakeup() {
+    /**
+     * Unserialize recurring schedules serialized/stored prior to AS 3.0.0
+     *
+     * Prior to Action Scheduler 3.0.0, schedules used different property names to refer
+     * to equivalent data. For example, ActionScheduler_IntervalSchedule::start_timestamp
+     * was the same as ActionScheduler_SimpleSchedule::timestamp. Action Scheduler 3.0.0
+     * aligned properties and property names for better inheritance. To maintain backward
+     * compatibility with schedules serialized and stored prior to 3.0, we need to correctly
+     * map the old property names with matching visibility.
+     */
+    public function __wakeup() {
 
-		if ( is_null( $this->scheduled_timestamp ) && ! is_null( $this->timestamp ) ) {
-			$this->scheduled_timestamp = $this->timestamp;
-			unset( $this->timestamp );
-		}
-		parent::__wakeup();
-	}
+        if ( is_null( $this->scheduled_timestamp ) && ! is_null( $this->timestamp ) ) {
+            $this->scheduled_timestamp = $this->timestamp;
+            unset( $this->timestamp );
+        }
+        parent::__wakeup();
+    }
 }

includes/libraries/action-scheduler/classes/schedules/ActionScheduler_Schedule.php

Indentation +10 added lines, -10 removed lines

@@ -4,15 +4,15 @@
  * Class ActionScheduler_Schedule
  */
 interface ActionScheduler_Schedule {
-	/**
-	 * @param DateTime $after
-	 * @return DateTime|null
-	 */
-	public function next( DateTime $after = NULL );
+    /**
+     * @param DateTime $after
+     * @return DateTime|null
+     */
+    public function next( DateTime $after = NULL );
 
-	/**
-	 * @return bool
-	 */
-	public function is_recurring();
+    /**
+     * @return bool
+     */
+    public function is_recurring();
 }
- 
\ No newline at end of file
+    
\ No newline at end of file

includes/libraries/action-scheduler/classes/schedules/ActionScheduler_NullSchedule.php

Indentation +18 added lines, -18 removed lines

@@ -5,24 +5,24 @@
  */
 class ActionScheduler_NullSchedule extends ActionScheduler_SimpleSchedule {
 
-	/**
-	 * Make the $date param optional and default to null.
-	 *
-	 * @param null $date The date & time to run the action.
-	 */
-	public function __construct( DateTime $date = null ) {
-		$this->scheduled_date = null;
-	}
+    /**
+     * Make the $date param optional and default to null.
+     *
+     * @param null $date The date & time to run the action.
+     */
+    public function __construct( DateTime $date = null ) {
+        $this->scheduled_date = null;
+    }
 
-	/**
-	 * This schedule has no scheduled DateTime, so we need to override the parent __sleep()
-	 * @return array
-	 */
-	public function __sleep() {
-		return array();
-	}
+    /**
+     * This schedule has no scheduled DateTime, so we need to override the parent __sleep()
+     * @return array
+     */
+    public function __sleep() {
+        return array();
+    }
 
-	public function __wakeup() {
-		$this->scheduled_date = null;
-	}
+    public function __wakeup() {
+        $this->scheduled_date = null;
+    }
 }

includes/libraries/action-scheduler/classes/schedules/ActionScheduler_CanceledSchedule.php

Indentation +45 added lines, -45 removed lines

@@ -5,53 +5,53 @@
  */
 class ActionScheduler_CanceledSchedule extends ActionScheduler_SimpleSchedule {
 
-	/**
-	 * Deprecated property @see $this->__wakeup() for details.
-	 **/
-	private $timestamp = NULL;
+    /**
+     * Deprecated property @see $this->__wakeup() for details.
+     **/
+    private $timestamp = NULL;
 
-	/**
-	 * @param DateTime $after
-	 *
-	 * @return DateTime|null
-	 */
-	public function calculate_next( DateTime $after ) {
-		return null;
-	}
+    /**
+     * @param DateTime $after
+     *
+     * @return DateTime|null
+     */
+    public function calculate_next( DateTime $after ) {
+        return null;
+    }
 
-	/**
-	 * Cancelled actions should never have a next schedule, even if get_next()
-	 * is called with $after < $this->scheduled_date.
-	 *
-	 * @param DateTime $after
-	 * @return DateTime|null
-	 */
-	public function get_next( DateTime $after ) {
-		return null;
-	}
+    /**
+     * Cancelled actions should never have a next schedule, even if get_next()
+     * is called with $after < $this->scheduled_date.
+     *
+     * @param DateTime $after
+     * @return DateTime|null
+     */
+    public function get_next( DateTime $after ) {
+        return null;
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function is_recurring() {
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function is_recurring() {
+        return false;
+    }
 
-	/**
-	 * Unserialize recurring schedules serialized/stored prior to AS 3.0.0
-	 *
-	 * Prior to Action Scheduler 3.0.0, schedules used different property names to refer
-	 * to equivalent data. For example, ActionScheduler_IntervalSchedule::start_timestamp
-	 * was the same as ActionScheduler_SimpleSchedule::timestamp. Action Scheduler 3.0.0
-	 * aligned properties and property names for better inheritance. To maintain backward
-	 * compatibility with schedules serialized and stored prior to 3.0, we need to correctly
-	 * map the old property names with matching visibility.
-	 */
-	public function __wakeup() {
-		if ( ! is_null( $this->timestamp ) ) {
-			$this->scheduled_timestamp = $this->timestamp;
-			unset( $this->timestamp );
-		}
-		parent::__wakeup();
-	}
+    /**
+     * Unserialize recurring schedules serialized/stored prior to AS 3.0.0
+     *
+     * Prior to Action Scheduler 3.0.0, schedules used different property names to refer
+     * to equivalent data. For example, ActionScheduler_IntervalSchedule::start_timestamp
+     * was the same as ActionScheduler_SimpleSchedule::timestamp. Action Scheduler 3.0.0
+     * aligned properties and property names for better inheritance. To maintain backward
+     * compatibility with schedules serialized and stored prior to 3.0, we need to correctly
+     * map the old property names with matching visibility.
+     */
+    public function __wakeup() {
+        if ( ! is_null( $this->timestamp ) ) {
+            $this->scheduled_timestamp = $this->timestamp;
+            unset( $this->timestamp );
+        }
+        parent::__wakeup();
+    }
 }

includes/libraries/action-scheduler/classes/schedules/ActionScheduler_CronSchedule.php

Indentation +93 added lines, -93 removed lines

@@ -5,98 +5,98 @@
  */
 class ActionScheduler_CronSchedule extends ActionScheduler_Abstract_RecurringSchedule implements ActionScheduler_Schedule {
 
-	/**
-	 * Deprecated property @see $this->__wakeup() for details.
-	 **/
-	private $start_timestamp = NULL;
-
-	/**
-	 * Deprecated property @see $this->__wakeup() for details.
-	 **/
-	private $cron = NULL;
-
-	/**
-	 * Wrapper for parent constructor to accept a cron expression string and map it to a CronExpression for this
-	 * objects $recurrence property.
-	 *
-	 * @param DateTime $start The date & time to run the action at or after. If $start aligns with the CronSchedule passed via $recurrence, it will be used. If it does not align, the first matching date after it will be used.
-	 * @param CronExpression|string $recurrence The CronExpression used to calculate the schedule's next instance.
-	 * @param DateTime|null $first (Optional) The date & time the first instance of this interval schedule ran. Default null, meaning this is the first instance.
-	 */
-	public function __construct( DateTime $start, $recurrence, DateTime $first = null ) {
-		if ( ! is_a( $recurrence, 'CronExpression' ) ) {
-			$recurrence = CronExpression::factory( $recurrence );
-		}
-
-		// For backward compatibility, we need to make sure the date is set to the first matching cron date, not whatever date is passed in. Importantly, by passing true as the 3rd param, if $start matches the cron expression, then it will be used. This was previously handled in the now deprecated next() method.
-		$date = $recurrence->getNextRunDate( $start, 0, true );
-
-		// parent::__construct() will set this to $date by default, but that may be different to $start now.
-		$first = empty( $first ) ? $start : $first;
-
-		parent::__construct( $date, $recurrence, $first );
-	}
-
-	/**
-	 * Calculate when an instance of this schedule would start based on a given
-	 * date & time using its the CronExpression.
-	 *
-	 * @param DateTime $after
-	 * @return DateTime
-	 */
-	protected function calculate_next( DateTime $after ) {
-		return $this->recurrence->getNextRunDate( $after, 0, false );
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_recurrence() {
-		return strval( $this->recurrence );
-	}
-
-	/**
-	 * Serialize cron schedules with data required prior to AS 3.0.0
-	 *
-	 * Prior to Action Scheduler 3.0.0, reccuring schedules used different property names to
-	 * refer to equivalent data. For example, ActionScheduler_IntervalSchedule::start_timestamp
-	 * was the same as ActionScheduler_SimpleSchedule::timestamp. Action Scheduler 3.0.0
-	 * aligned properties and property names for better inheritance. To guard against the
-	 * possibility of infinite loops if downgrading to Action Scheduler < 3.0.0, we need to
-	 * also store the data with the old property names so if it's unserialized in AS < 3.0,
-	 * the schedule doesn't end up with a null recurrence.
-	 *
-	 * @return array
-	 */
-	public function __sleep() {
-
-		$sleep_params = parent::__sleep();
-
-		$this->start_timestamp = $this->scheduled_timestamp;
-		$this->cron            = $this->recurrence;
-
-		return array_merge( $sleep_params, array(
-			'start_timestamp',
-			'cron'
-		) );
-	}
-
-	/**
-	 * Unserialize cron schedules serialized/stored prior to AS 3.0.0
-	 *
-	 * For more background, @see ActionScheduler_Abstract_RecurringSchedule::__wakeup().
-	 */
-	public function __wakeup() {
-		if ( is_null( $this->scheduled_timestamp ) && ! is_null( $this->start_timestamp ) ) {
-			$this->scheduled_timestamp = $this->start_timestamp;
-			unset( $this->start_timestamp );
-		}
-
-		if ( is_null( $this->recurrence ) && ! is_null( $this->cron ) ) {
-			$this->recurrence = $this->cron;
-			unset( $this->cron );
-		}
-		parent::__wakeup();
-	}
+    /**
+     * Deprecated property @see $this->__wakeup() for details.
+     **/
+    private $start_timestamp = NULL;
+
+    /**
+     * Deprecated property @see $this->__wakeup() for details.
+     **/
+    private $cron = NULL;
+
+    /**
+     * Wrapper for parent constructor to accept a cron expression string and map it to a CronExpression for this
+     * objects $recurrence property.
+     *
+     * @param DateTime $start The date & time to run the action at or after. If $start aligns with the CronSchedule passed via $recurrence, it will be used. If it does not align, the first matching date after it will be used.
+     * @param CronExpression|string $recurrence The CronExpression used to calculate the schedule's next instance.
+     * @param DateTime|null $first (Optional) The date & time the first instance of this interval schedule ran. Default null, meaning this is the first instance.
+     */
+    public function __construct( DateTime $start, $recurrence, DateTime $first = null ) {
+        if ( ! is_a( $recurrence, 'CronExpression' ) ) {
+            $recurrence = CronExpression::factory( $recurrence );
+        }
+
+        // For backward compatibility, we need to make sure the date is set to the first matching cron date, not whatever date is passed in. Importantly, by passing true as the 3rd param, if $start matches the cron expression, then it will be used. This was previously handled in the now deprecated next() method.
+        $date = $recurrence->getNextRunDate( $start, 0, true );
+
+        // parent::__construct() will set this to $date by default, but that may be different to $start now.
+        $first = empty( $first ) ? $start : $first;
+
+        parent::__construct( $date, $recurrence, $first );
+    }
+
+    /**
+     * Calculate when an instance of this schedule would start based on a given
+     * date & time using its the CronExpression.
+     *
+     * @param DateTime $after
+     * @return DateTime
+     */
+    protected function calculate_next( DateTime $after ) {
+        return $this->recurrence->getNextRunDate( $after, 0, false );
+    }
+
+    /**
+     * @return string
+     */
+    public function get_recurrence() {
+        return strval( $this->recurrence );
+    }
+
+    /**
+     * Serialize cron schedules with data required prior to AS 3.0.0
+     *
+     * Prior to Action Scheduler 3.0.0, reccuring schedules used different property names to
+     * refer to equivalent data. For example, ActionScheduler_IntervalSchedule::start_timestamp
+     * was the same as ActionScheduler_SimpleSchedule::timestamp. Action Scheduler 3.0.0
+     * aligned properties and property names for better inheritance. To guard against the
+     * possibility of infinite loops if downgrading to Action Scheduler < 3.0.0, we need to
+     * also store the data with the old property names so if it's unserialized in AS < 3.0,
+     * the schedule doesn't end up with a null recurrence.
+     *
+     * @return array
+     */
+    public function __sleep() {
+
+        $sleep_params = parent::__sleep();
+
+        $this->start_timestamp = $this->scheduled_timestamp;
+        $this->cron            = $this->recurrence;
+
+        return array_merge( $sleep_params, array(
+            'start_timestamp',
+            'cron'
+        ) );
+    }
+
+    /**
+     * Unserialize cron schedules serialized/stored prior to AS 3.0.0
+     *
+     * For more background, @see ActionScheduler_Abstract_RecurringSchedule::__wakeup().
+     */
+    public function __wakeup() {
+        if ( is_null( $this->scheduled_timestamp ) && ! is_null( $this->start_timestamp ) ) {
+            $this->scheduled_timestamp = $this->start_timestamp;
+            unset( $this->start_timestamp );
+        }
+
+        if ( is_null( $this->recurrence ) && ! is_null( $this->cron ) ) {
+            $this->recurrence = $this->cron;
+            unset( $this->cron );
+        }
+        parent::__wakeup();
+    }
 }