AyeCode / invoicing

includes/libraries/action-scheduler/classes/ActionScheduler_QueueRunner.php

Indentation +191 added lines, -191 removed lines

@@ -4,195 +4,195 @@
  * Class ActionScheduler_QueueRunner
  */
 class ActionScheduler_QueueRunner extends ActionScheduler_Abstract_QueueRunner {
-	const WP_CRON_HOOK = 'action_scheduler_run_queue';
-
-	const WP_CRON_SCHEDULE = 'every_minute';
-
-	/** @var ActionScheduler_AsyncRequest_QueueRunner */
-	protected $async_request;
-
-	/** @var ActionScheduler_QueueRunner  */
-	private static $runner = null;
-
-	/**
-	 * @return ActionScheduler_QueueRunner
-	 * @codeCoverageIgnore
-	 */
-	public static function instance() {
-		if ( empty(self::$runner) ) {
-			$class = apply_filters('action_scheduler_queue_runner_class', 'ActionScheduler_QueueRunner');
-			self::$runner = new $class();
-		}
-		return self::$runner;
-	}
-
-	/**
-	 * ActionScheduler_QueueRunner constructor.
-	 *
-	 * @param ActionScheduler_Store             $store
-	 * @param ActionScheduler_FatalErrorMonitor $monitor
-	 * @param ActionScheduler_QueueCleaner      $cleaner
-	 */
-	public function __construct( ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null, ActionScheduler_AsyncRequest_QueueRunner $async_request = null ) {
-		parent::__construct( $store, $monitor, $cleaner );
-
-		if ( is_null( $async_request ) ) {
-			$async_request = new ActionScheduler_AsyncRequest_QueueRunner( $this->store );
-		}
-
-		$this->async_request = $async_request;
-	}
-
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public function init() {
-
-		add_filter( 'cron_schedules', array( self::instance(), 'add_wp_cron_schedule' ) );
-
-		$cron_context = array( 'WP Cron' );
-
-		if ( ! wp_next_scheduled( self::WP_CRON_HOOK, $cron_context ) ) {
-
-			// Check for and remove any WP Cron hook scheduled by Action Scheduler < 3.0.0, which didn't include the $context param
-			$next_timestamp = wp_next_scheduled( self::WP_CRON_HOOK );
-			if ( $next_timestamp ) {
-				wp_unschedule_event( $next_timestamp, self::WP_CRON_HOOK );
-			}
-
-			$schedule = apply_filters( 'action_scheduler_run_schedule', self::WP_CRON_SCHEDULE );
-			wp_schedule_event( time(), $schedule, self::WP_CRON_HOOK, $cron_context );
-		}
-
-		add_action( self::WP_CRON_HOOK, array( self::instance(), 'run' ) );
-		$this->hook_dispatch_async_request();
-	}
-
-	/**
-	 * Hook check for dispatching an async request.
-	 */
-	public function hook_dispatch_async_request() {
-		add_action( 'shutdown', array( $this, 'maybe_dispatch_async_request' ) );
-	}
-
-	/**
-	 * Unhook check for dispatching an async request.
-	 */
-	public function unhook_dispatch_async_request() {
-		remove_action( 'shutdown', array( $this, 'maybe_dispatch_async_request' ) );
-	}
-
-	/**
-	 * Check if we should dispatch an async request to process actions.
-	 *
-	 * This method is attached to 'shutdown', so is called frequently. To avoid slowing down
-	 * the site, it mitigates the work performed in each request by:
-	 * 1. checking if it's in the admin context and then
-	 * 2. haven't run on the 'shutdown' hook within the lock time (60 seconds by default)
-	 * 3. haven't exceeded the number of allowed batches.
-	 *
-	 * The order of these checks is important, because they run from a check on a value:
-	 * 1. in memory - is_admin() maps to $GLOBALS or the WP_ADMIN constant
-	 * 2. in memory - transients use autoloaded options by default
-	 * 3. from a database query - has_maximum_concurrent_batches() run the query
-	 *    $this->store->get_claim_count() to find the current number of claims in the DB.
-	 *
-	 * If all of these conditions are met, then we request an async runner check whether it
-	 * should dispatch a request to process pending actions.
-	 */
-	public function maybe_dispatch_async_request() {
-		if ( is_admin() && ! ActionScheduler::lock()->is_locked( 'async-request-runner' ) ) {
-			// Only start an async queue at most once every 60 seconds
-			ActionScheduler::lock()->set( 'async-request-runner' );
-			$this->async_request->maybe_dispatch();
-		}
-	}
-
-	/**
-	 * Process actions in the queue. Attached to self::WP_CRON_HOOK i.e. 'action_scheduler_run_queue'
-	 *
-	 * The $context param of this method defaults to 'WP Cron', because prior to Action Scheduler 3.0.0
-	 * that was the only context in which this method was run, and the self::WP_CRON_HOOK hook had no context
-	 * passed along with it. New code calling this method directly, or by triggering the self::WP_CRON_HOOK,
-	 * should set a context as the first parameter. For an example of this, refer to the code seen in
-	 * @see ActionScheduler_AsyncRequest_QueueRunner::handle()
-	 *
-	 * @param string $context Optional identifer for the context in which this action is being processed, e.g. 'WP CLI' or 'WP Cron'
-	 *        Generally, this should be capitalised and not localised as it's a proper noun.
-	 * @return int The number of actions processed.
-	 */
-	public function run( $context = 'WP Cron' ) {
-		ActionScheduler_Compatibility::raise_memory_limit();
-		ActionScheduler_Compatibility::raise_time_limit( $this->get_time_limit() );
-		do_action( 'action_scheduler_before_process_queue' );
-		$this->run_cleanup();
-		$processed_actions = 0;
-		if ( false === $this->has_maximum_concurrent_batches() ) {
-			$batch_size = apply_filters( 'action_scheduler_queue_runner_batch_size', 25 );
-			do {
-				$processed_actions_in_batch = $this->do_batch( $batch_size, $context );
-				$processed_actions         += $processed_actions_in_batch;
-			} while ( $processed_actions_in_batch > 0 && ! $this->batch_limits_exceeded( $processed_actions ) ); // keep going until we run out of actions, time, or memory
-		}
-
-		do_action( 'action_scheduler_after_process_queue' );
-		return $processed_actions;
-	}
-
-	/**
-	 * Process a batch of actions pending in the queue.
-	 *
-	 * Actions are processed by claiming a set of pending actions then processing each one until either the batch
-	 * size is completed, or memory or time limits are reached, defined by @see $this->batch_limits_exceeded().
-	 *
-	 * @param int $size The maximum number of actions to process in the batch.
-	 * @param string $context Optional identifer for the context in which this action is being processed, e.g. 'WP CLI' or 'WP Cron'
-	 *        Generally, this should be capitalised and not localised as it's a proper noun.
-	 * @return int The number of actions processed.
-	 */
-	protected function do_batch( $size = 100, $context = '' ) {
-		$claim = $this->store->stake_claim($size);
-		$this->monitor->attach($claim);
-		$processed_actions = 0;
-
-		foreach ( $claim->get_actions() as $action_id ) {
-			// bail if we lost the claim
-			if ( ! in_array( $action_id, $this->store->find_actions_by_claim_id( $claim->get_id() ) ) ) {
-				break;
-			}
-			$this->process_action( $action_id, $context );
-			$processed_actions++;
-
-			if ( $this->batch_limits_exceeded( $processed_actions ) ) {
-				break;
-			}
-		}
-		$this->store->release_claim($claim);
-		$this->monitor->detach();
-		$this->clear_caches();
-		return $processed_actions;
-	}
-
-	/**
-	 * Running large batches can eat up memory, as WP adds data to its object cache.
-	 *
-	 * If using a persistent object store, this has the side effect of flushing that
-	 * as well, so this is disabled by default. To enable:
-	 *
-	 * add_filter( 'action_scheduler_queue_runner_flush_cache', '__return_true' );
-	 */
-	protected function clear_caches() {
-		if ( ! wp_using_ext_object_cache() || apply_filters( 'action_scheduler_queue_runner_flush_cache', false ) ) {
-			wp_cache_flush();
-		}
-	}
-
-	public function add_wp_cron_schedule( $schedules ) {
-		$schedules['every_minute'] = array(
-			'interval' => 60, // in seconds
-			'display'  => __( 'Every minute', 'action-scheduler' ),
-		);
-
-		return $schedules;
-	}
+    const WP_CRON_HOOK = 'action_scheduler_run_queue';
+
+    const WP_CRON_SCHEDULE = 'every_minute';
+
+    /** @var ActionScheduler_AsyncRequest_QueueRunner */
+    protected $async_request;
+
+    /** @var ActionScheduler_QueueRunner  */
+    private static $runner = null;
+
+    /**
+     * @return ActionScheduler_QueueRunner
+     * @codeCoverageIgnore
+     */
+    public static function instance() {
+        if ( empty(self::$runner) ) {
+            $class = apply_filters('action_scheduler_queue_runner_class', 'ActionScheduler_QueueRunner');
+            self::$runner = new $class();
+        }
+        return self::$runner;
+    }
+
+    /**
+     * ActionScheduler_QueueRunner constructor.
+     *
+     * @param ActionScheduler_Store             $store
+     * @param ActionScheduler_FatalErrorMonitor $monitor
+     * @param ActionScheduler_QueueCleaner      $cleaner
+     */
+    public function __construct( ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null, ActionScheduler_AsyncRequest_QueueRunner $async_request = null ) {
+        parent::__construct( $store, $monitor, $cleaner );
+
+        if ( is_null( $async_request ) ) {
+            $async_request = new ActionScheduler_AsyncRequest_QueueRunner( $this->store );
+        }
+
+        $this->async_request = $async_request;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function init() {
+
+        add_filter( 'cron_schedules', array( self::instance(), 'add_wp_cron_schedule' ) );
+
+        $cron_context = array( 'WP Cron' );
+
+        if ( ! wp_next_scheduled( self::WP_CRON_HOOK, $cron_context ) ) {
+
+            // Check for and remove any WP Cron hook scheduled by Action Scheduler < 3.0.0, which didn't include the $context param
+            $next_timestamp = wp_next_scheduled( self::WP_CRON_HOOK );
+            if ( $next_timestamp ) {
+                wp_unschedule_event( $next_timestamp, self::WP_CRON_HOOK );
+            }
+
+            $schedule = apply_filters( 'action_scheduler_run_schedule', self::WP_CRON_SCHEDULE );
+            wp_schedule_event( time(), $schedule, self::WP_CRON_HOOK, $cron_context );
+        }
+
+        add_action( self::WP_CRON_HOOK, array( self::instance(), 'run' ) );
+        $this->hook_dispatch_async_request();
+    }
+
+    /**
+     * Hook check for dispatching an async request.
+     */
+    public function hook_dispatch_async_request() {
+        add_action( 'shutdown', array( $this, 'maybe_dispatch_async_request' ) );
+    }
+
+    /**
+     * Unhook check for dispatching an async request.
+     */
+    public function unhook_dispatch_async_request() {
+        remove_action( 'shutdown', array( $this, 'maybe_dispatch_async_request' ) );
+    }
+
+    /**
+     * Check if we should dispatch an async request to process actions.
+     *
+     * This method is attached to 'shutdown', so is called frequently. To avoid slowing down
+     * the site, it mitigates the work performed in each request by:
+     * 1. checking if it's in the admin context and then
+     * 2. haven't run on the 'shutdown' hook within the lock time (60 seconds by default)
+     * 3. haven't exceeded the number of allowed batches.
+     *
+     * The order of these checks is important, because they run from a check on a value:
+     * 1. in memory - is_admin() maps to $GLOBALS or the WP_ADMIN constant
+     * 2. in memory - transients use autoloaded options by default
+     * 3. from a database query - has_maximum_concurrent_batches() run the query
+     *    $this->store->get_claim_count() to find the current number of claims in the DB.
+     *
+     * If all of these conditions are met, then we request an async runner check whether it
+     * should dispatch a request to process pending actions.
+     */
+    public function maybe_dispatch_async_request() {
+        if ( is_admin() && ! ActionScheduler::lock()->is_locked( 'async-request-runner' ) ) {
+            // Only start an async queue at most once every 60 seconds
+            ActionScheduler::lock()->set( 'async-request-runner' );
+            $this->async_request->maybe_dispatch();
+        }
+    }
+
+    /**
+     * Process actions in the queue. Attached to self::WP_CRON_HOOK i.e. 'action_scheduler_run_queue'
+     *
+     * The $context param of this method defaults to 'WP Cron', because prior to Action Scheduler 3.0.0
+     * that was the only context in which this method was run, and the self::WP_CRON_HOOK hook had no context
+     * passed along with it. New code calling this method directly, or by triggering the self::WP_CRON_HOOK,
+     * should set a context as the first parameter. For an example of this, refer to the code seen in
+     * @see ActionScheduler_AsyncRequest_QueueRunner::handle()
+     *
+     * @param string $context Optional identifer for the context in which this action is being processed, e.g. 'WP CLI' or 'WP Cron'
+     *        Generally, this should be capitalised and not localised as it's a proper noun.
+     * @return int The number of actions processed.
+     */
+    public function run( $context = 'WP Cron' ) {
+        ActionScheduler_Compatibility::raise_memory_limit();
+        ActionScheduler_Compatibility::raise_time_limit( $this->get_time_limit() );
+        do_action( 'action_scheduler_before_process_queue' );
+        $this->run_cleanup();
+        $processed_actions = 0;
+        if ( false === $this->has_maximum_concurrent_batches() ) {
+            $batch_size = apply_filters( 'action_scheduler_queue_runner_batch_size', 25 );
+            do {
+                $processed_actions_in_batch = $this->do_batch( $batch_size, $context );
+                $processed_actions         += $processed_actions_in_batch;
+            } while ( $processed_actions_in_batch > 0 && ! $this->batch_limits_exceeded( $processed_actions ) ); // keep going until we run out of actions, time, or memory
+        }
+
+        do_action( 'action_scheduler_after_process_queue' );
+        return $processed_actions;
+    }
+
+    /**
+     * Process a batch of actions pending in the queue.
+     *
+     * Actions are processed by claiming a set of pending actions then processing each one until either the batch
+     * size is completed, or memory or time limits are reached, defined by @see $this->batch_limits_exceeded().
+     *
+     * @param int $size The maximum number of actions to process in the batch.
+     * @param string $context Optional identifer for the context in which this action is being processed, e.g. 'WP CLI' or 'WP Cron'
+     *        Generally, this should be capitalised and not localised as it's a proper noun.
+     * @return int The number of actions processed.
+     */
+    protected function do_batch( $size = 100, $context = '' ) {
+        $claim = $this->store->stake_claim($size);
+        $this->monitor->attach($claim);
+        $processed_actions = 0;
+
+        foreach ( $claim->get_actions() as $action_id ) {
+            // bail if we lost the claim
+            if ( ! in_array( $action_id, $this->store->find_actions_by_claim_id( $claim->get_id() ) ) ) {
+                break;
+            }
+            $this->process_action( $action_id, $context );
+            $processed_actions++;
+
+            if ( $this->batch_limits_exceeded( $processed_actions ) ) {
+                break;
+            }
+        }
+        $this->store->release_claim($claim);
+        $this->monitor->detach();
+        $this->clear_caches();
+        return $processed_actions;
+    }
+
+    /**
+     * Running large batches can eat up memory, as WP adds data to its object cache.
+     *
+     * If using a persistent object store, this has the side effect of flushing that
+     * as well, so this is disabled by default. To enable:
+     *
+     * add_filter( 'action_scheduler_queue_runner_flush_cache', '__return_true' );
+     */
+    protected function clear_caches() {
+        if ( ! wp_using_ext_object_cache() || apply_filters( 'action_scheduler_queue_runner_flush_cache', false ) ) {
+            wp_cache_flush();
+        }
+    }
+
+    public function add_wp_cron_schedule( $schedules ) {
+        $schedules['every_minute'] = array(
+            'interval' => 60, // in seconds
+            'display'  => __( 'Every minute', 'action-scheduler' ),
+        );
+
+        return $schedules;
+    }
 }

Spacing +34 added lines, -34 removed lines

@@ -19,7 +19,7 @@ 
 	 * @codeCoverageIgnore
 	 */
 	public static function instance() {
-		if ( empty(self::$runner) ) {
+		if (empty(self::$runner)) {
 			$class = apply_filters('action_scheduler_queue_runner_class', 'ActionScheduler_QueueRunner');
 			self::$runner = new $class();
 		}
@@ -33,11 +33,11 @@ 
 	 * @param ActionScheduler_FatalErrorMonitor $monitor
 	 * @param ActionScheduler_QueueCleaner      $cleaner
 	 */
-	public function __construct( ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null, ActionScheduler_AsyncRequest_QueueRunner $async_request = null ) {
-		parent::__construct( $store, $monitor, $cleaner );
+	public function __construct(ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null, ActionScheduler_AsyncRequest_QueueRunner $async_request = null) {
+		parent::__construct($store, $monitor, $cleaner);
 
-		if ( is_null( $async_request ) ) {
-			$async_request = new ActionScheduler_AsyncRequest_QueueRunner( $this->store );
+		if (is_null($async_request)) {
+			$async_request = new ActionScheduler_AsyncRequest_QueueRunner($this->store);
 		}
 
 		$this->async_request = $async_request;
@@ -48,23 +48,23 @@ 
 	 */
 	public function init() {
 
-		add_filter( 'cron_schedules', array( self::instance(), 'add_wp_cron_schedule' ) );
+		add_filter('cron_schedules', array(self::instance(), 'add_wp_cron_schedule'));
 
-		$cron_context = array( 'WP Cron' );
+		$cron_context = array('WP Cron');
 
-		if ( ! wp_next_scheduled( self::WP_CRON_HOOK, $cron_context ) ) {
+		if (!wp_next_scheduled(self::WP_CRON_HOOK, $cron_context)) {
 
 			// Check for and remove any WP Cron hook scheduled by Action Scheduler < 3.0.0, which didn't include the $context param
-			$next_timestamp = wp_next_scheduled( self::WP_CRON_HOOK );
-			if ( $next_timestamp ) {
-				wp_unschedule_event( $next_timestamp, self::WP_CRON_HOOK );
+			$next_timestamp = wp_next_scheduled(self::WP_CRON_HOOK);
+			if ($next_timestamp) {
+				wp_unschedule_event($next_timestamp, self::WP_CRON_HOOK);
 			}
 
-			$schedule = apply_filters( 'action_scheduler_run_schedule', self::WP_CRON_SCHEDULE );
-			wp_schedule_event( time(), $schedule, self::WP_CRON_HOOK, $cron_context );
+			$schedule = apply_filters('action_scheduler_run_schedule', self::WP_CRON_SCHEDULE);
+			wp_schedule_event(time(), $schedule, self::WP_CRON_HOOK, $cron_context);
 		}
 
-		add_action( self::WP_CRON_HOOK, array( self::instance(), 'run' ) );
+		add_action(self::WP_CRON_HOOK, array(self::instance(), 'run'));
 		$this->hook_dispatch_async_request();
 	}
 
@@ -72,14 +72,14 @@ 
 	 * Hook check for dispatching an async request.
 	 */
 	public function hook_dispatch_async_request() {
-		add_action( 'shutdown', array( $this, 'maybe_dispatch_async_request' ) );
+		add_action('shutdown', array($this, 'maybe_dispatch_async_request'));
 	}
 
 	/**
 	 * Unhook check for dispatching an async request.
 	 */
 	public function unhook_dispatch_async_request() {
-		remove_action( 'shutdown', array( $this, 'maybe_dispatch_async_request' ) );
+		remove_action('shutdown', array($this, 'maybe_dispatch_async_request'));
 	}
 
 	/**
@@ -101,9 +101,9 @@ 
 	 * should dispatch a request to process pending actions.
 	 */
 	public function maybe_dispatch_async_request() {
-		if ( is_admin() && ! ActionScheduler::lock()->is_locked( 'async-request-runner' ) ) {
+		if (is_admin() && !ActionScheduler::lock()->is_locked('async-request-runner')) {
 			// Only start an async queue at most once every 60 seconds
-			ActionScheduler::lock()->set( 'async-request-runner' );
+			ActionScheduler::lock()->set('async-request-runner');
 			$this->async_request->maybe_dispatch();
 		}
 	}
@@ -121,21 +121,21 @@ 
 	 *        Generally, this should be capitalised and not localised as it's a proper noun.
 	 * @return int The number of actions processed.
 	 */
-	public function run( $context = 'WP Cron' ) {
+	public function run($context = 'WP Cron') {
 		ActionScheduler_Compatibility::raise_memory_limit();
-		ActionScheduler_Compatibility::raise_time_limit( $this->get_time_limit() );
-		do_action( 'action_scheduler_before_process_queue' );
+		ActionScheduler_Compatibility::raise_time_limit($this->get_time_limit());
+		do_action('action_scheduler_before_process_queue');
 		$this->run_cleanup();
 		$processed_actions = 0;
-		if ( false === $this->has_maximum_concurrent_batches() ) {
-			$batch_size = apply_filters( 'action_scheduler_queue_runner_batch_size', 25 );
+		if (false === $this->has_maximum_concurrent_batches()) {
+			$batch_size = apply_filters('action_scheduler_queue_runner_batch_size', 25);
 			do {
-				$processed_actions_in_batch = $this->do_batch( $batch_size, $context );
+				$processed_actions_in_batch = $this->do_batch($batch_size, $context);
 				$processed_actions         += $processed_actions_in_batch;
-			} while ( $processed_actions_in_batch > 0 && ! $this->batch_limits_exceeded( $processed_actions ) ); // keep going until we run out of actions, time, or memory
+			} while ($processed_actions_in_batch > 0 && !$this->batch_limits_exceeded($processed_actions)); // keep going until we run out of actions, time, or memory
 		}
 
-		do_action( 'action_scheduler_after_process_queue' );
+		do_action('action_scheduler_after_process_queue');
 		return $processed_actions;
 	}
 
@@ -150,20 +150,20 @@ 
 	 *        Generally, this should be capitalised and not localised as it's a proper noun.
 	 * @return int The number of actions processed.
 	 */
-	protected function do_batch( $size = 100, $context = '' ) {
+	protected function do_batch($size = 100, $context = '') {
 		$claim = $this->store->stake_claim($size);
 		$this->monitor->attach($claim);
 		$processed_actions = 0;
 
-		foreach ( $claim->get_actions() as $action_id ) {
+		foreach ($claim->get_actions() as $action_id) {
 			// bail if we lost the claim
-			if ( ! in_array( $action_id, $this->store->find_actions_by_claim_id( $claim->get_id() ) ) ) {
+			if (!in_array($action_id, $this->store->find_actions_by_claim_id($claim->get_id()))) {
 				break;
 			}
-			$this->process_action( $action_id, $context );
+			$this->process_action($action_id, $context);
 			$processed_actions++;
 
-			if ( $this->batch_limits_exceeded( $processed_actions ) ) {
+			if ($this->batch_limits_exceeded($processed_actions)) {
 				break;
 			}
 		}
@@ -182,15 +182,15 @@ 
 	 * add_filter( 'action_scheduler_queue_runner_flush_cache', '__return_true' );
 	 */
 	protected function clear_caches() {
-		if ( ! wp_using_ext_object_cache() || apply_filters( 'action_scheduler_queue_runner_flush_cache', false ) ) {
+		if (!wp_using_ext_object_cache() || apply_filters('action_scheduler_queue_runner_flush_cache', false)) {
 			wp_cache_flush();
 		}
 	}
 
-	public function add_wp_cron_schedule( $schedules ) {
+	public function add_wp_cron_schedule($schedules) {
 		$schedules['every_minute'] = array(
 			'interval' => 60, // in seconds
-			'display'  => __( 'Every minute', 'action-scheduler' ),
+			'display'  => __('Every minute', 'action-scheduler'),
 		);
 
 		return $schedules;

includes/libraries/action-scheduler/classes/ActionScheduler_AsyncRequest_QueueRunner.php

Indentation +84 added lines, -84 removed lines

@@ -10,88 +10,88 @@
  */
 class ActionScheduler_AsyncRequest_QueueRunner extends WP_Async_Request {
 
-	/**
-	 * Data store for querying actions
-	 *
-	 * @var ActionScheduler_Store
-	 * @access protected
-	 */
-	protected $store;
-
-	/**
-	 * Prefix for ajax hooks
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $prefix = 'as';
-
-	/**
-	 * Action for ajax hooks
-	 *
-	 * @var string
-	 * @access protected
-	 */
-	protected $action = 'async_request_queue_runner';
-
-	/**
-	 * Initiate new async request
-	 */
-	public function __construct( ActionScheduler_Store $store ) {
-		parent::__construct();
-		$this->store = $store;
-	}
-
-	/**
-	 * Handle async requests
-	 *
-	 * Run a queue, and maybe dispatch another async request to run another queue
-	 * if there are still pending actions after completing a queue in this request.
-	 */
-	protected function handle() {
-		do_action( 'action_scheduler_run_queue', 'Async Request' ); // run a queue in the same way as WP Cron, but declare the Async Request context
-
-		$sleep_seconds = $this->get_sleep_seconds();
-
-		if ( $sleep_seconds ) {
-			sleep( $sleep_seconds );
-		}
-
-		$this->maybe_dispatch();
-	}
-
-	/**
-	 * If the async request runner is needed and allowed to run, dispatch a request.
-	 */
-	public function maybe_dispatch() {
-		if ( ! $this->allow() ) {
-			return;
-		}
-
-		$this->dispatch();
-		ActionScheduler_QueueRunner::instance()->unhook_dispatch_async_request();
-	}
-
-	/**
-	 * Only allow async requests when needed.
-	 *
-	 * Also allow 3rd party code to disable running actions via async requests.
-	 */
-	protected function allow() {
-
-		if ( ! has_action( 'action_scheduler_run_queue' ) || ActionScheduler::runner()->has_maximum_concurrent_batches() || ! $this->store->has_pending_actions_due() ) {
-			$allow = false;
-		} else {
-			$allow = true;
-		}
-
-		return apply_filters( 'action_scheduler_allow_async_request_runner', $allow );
-	}
-
-	/**
-	 * Chaining async requests can crash MySQL. A brief sleep call in PHP prevents that.
-	 */
-	protected function get_sleep_seconds() {
-		return apply_filters( 'action_scheduler_async_request_sleep_seconds', 5, $this );
-	}
+    /**
+     * Data store for querying actions
+     *
+     * @var ActionScheduler_Store
+     * @access protected
+     */
+    protected $store;
+
+    /**
+     * Prefix for ajax hooks
+     *
+     * @var string
+     * @access protected
+     */
+    protected $prefix = 'as';
+
+    /**
+     * Action for ajax hooks
+     *
+     * @var string
+     * @access protected
+     */
+    protected $action = 'async_request_queue_runner';
+
+    /**
+     * Initiate new async request
+     */
+    public function __construct( ActionScheduler_Store $store ) {
+        parent::__construct();
+        $this->store = $store;
+    }
+
+    /**
+     * Handle async requests
+     *
+     * Run a queue, and maybe dispatch another async request to run another queue
+     * if there are still pending actions after completing a queue in this request.
+     */
+    protected function handle() {
+        do_action( 'action_scheduler_run_queue', 'Async Request' ); // run a queue in the same way as WP Cron, but declare the Async Request context
+
+        $sleep_seconds = $this->get_sleep_seconds();
+
+        if ( $sleep_seconds ) {
+            sleep( $sleep_seconds );
+        }
+
+        $this->maybe_dispatch();
+    }
+
+    /**
+     * If the async request runner is needed and allowed to run, dispatch a request.
+     */
+    public function maybe_dispatch() {
+        if ( ! $this->allow() ) {
+            return;
+        }
+
+        $this->dispatch();
+        ActionScheduler_QueueRunner::instance()->unhook_dispatch_async_request();
+    }
+
+    /**
+     * Only allow async requests when needed.
+     *
+     * Also allow 3rd party code to disable running actions via async requests.
+     */
+    protected function allow() {
+
+        if ( ! has_action( 'action_scheduler_run_queue' ) || ActionScheduler::runner()->has_maximum_concurrent_batches() || ! $this->store->has_pending_actions_due() ) {
+            $allow = false;
+        } else {
+            $allow = true;
+        }
+
+        return apply_filters( 'action_scheduler_allow_async_request_runner', $allow );
+    }
+
+    /**
+     * Chaining async requests can crash MySQL. A brief sleep call in PHP prevents that.
+     */
+    protected function get_sleep_seconds() {
+        return apply_filters( 'action_scheduler_async_request_sleep_seconds', 5, $this );
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -3,7 +3,7 @@ 
  * ActionScheduler_AsyncRequest_QueueRunner
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * ActionScheduler_AsyncRequest_QueueRunner class.
@@ -37,7 +37,7 @@ 
 	/**
 	 * Initiate new async request
 	 */
-	public function __construct( ActionScheduler_Store $store ) {
+	public function __construct(ActionScheduler_Store $store) {
 		parent::__construct();
 		$this->store = $store;
 	}
@@ -49,12 +49,12 @@ 
 	 * if there are still pending actions after completing a queue in this request.
 	 */
 	protected function handle() {
-		do_action( 'action_scheduler_run_queue', 'Async Request' ); // run a queue in the same way as WP Cron, but declare the Async Request context
+		do_action('action_scheduler_run_queue', 'Async Request'); // run a queue in the same way as WP Cron, but declare the Async Request context
 
 		$sleep_seconds = $this->get_sleep_seconds();
 
-		if ( $sleep_seconds ) {
-			sleep( $sleep_seconds );
+		if ($sleep_seconds) {
+			sleep($sleep_seconds);
 		}
 
 		$this->maybe_dispatch();
@@ -64,7 +64,7 @@ 
 	 * If the async request runner is needed and allowed to run, dispatch a request.
 	 */
 	public function maybe_dispatch() {
-		if ( ! $this->allow() ) {
+		if (!$this->allow()) {
 			return;
 		}
 
@@ -79,19 +79,19 @@ 
 	 */
 	protected function allow() {
 
-		if ( ! has_action( 'action_scheduler_run_queue' ) || ActionScheduler::runner()->has_maximum_concurrent_batches() || ! $this->store->has_pending_actions_due() ) {
+		if (!has_action('action_scheduler_run_queue') || ActionScheduler::runner()->has_maximum_concurrent_batches() || !$this->store->has_pending_actions_due()) {
 			$allow = false;
 		} else {
 			$allow = true;
 		}
 
-		return apply_filters( 'action_scheduler_allow_async_request_runner', $allow );
+		return apply_filters('action_scheduler_allow_async_request_runner', $allow);
 	}
 
 	/**
 	 * Chaining async requests can crash MySQL. A brief sleep call in PHP prevents that.
 	 */
 	protected function get_sleep_seconds() {
-		return apply_filters( 'action_scheduler_async_request_sleep_seconds', 5, $this );
+		return apply_filters('action_scheduler_async_request_sleep_seconds', 5, $this);
 	}
 }

includes/libraries/action-scheduler/classes/ActionScheduler_WPCommentCleaner.php

Indentation +104 added lines, -104 removed lines

@@ -7,109 +7,109 @@
  */
 class ActionScheduler_WPCommentCleaner {
 
-	/**
-	 * Post migration hook used to cleanup the WP comment table.
-	 *
-	 * @var string
-	 */
-	protected static $cleanup_hook = 'action_scheduler/cleanup_wp_comment_logs';
-
-	/**
-	 * An instance of the ActionScheduler_wpCommentLogger class to interact with the comments table.
-	 *
-	 * This instance should only be used as an interface. It should not be initialized.
-	 *
-	 * @var ActionScheduler_wpCommentLogger
-	 */
-	protected static $wp_comment_logger = null;
-
-	/**
-	 * The key used to store the cached value of whether there are logs in the WP comment table.
-	 *
-	 * @var string
-	 */
-	protected static $has_logs_option_key = 'as_has_wp_comment_logs';
-
-	/**
-	 * Initialize the class and attach callbacks.
-	 */
-	public static function init() {
-		if ( empty( self::$wp_comment_logger ) ) {
-			self::$wp_comment_logger = new ActionScheduler_wpCommentLogger();
-		}
-
-		add_action( self::$cleanup_hook, array( __CLASS__, 'delete_all_action_comments' ) );
-
-		// While there are orphaned logs left in the comments table, we need to attach the callbacks which filter comment counts.
-		add_action( 'pre_get_comments', array( self::$wp_comment_logger, 'filter_comment_queries' ), 10, 1 );
-		add_action( 'wp_count_comments', array( self::$wp_comment_logger, 'filter_comment_count' ), 20, 2 ); // run after WC_Comments::wp_count_comments() to make sure we exclude order notes and action logs
-		add_action( 'comment_feed_where', array( self::$wp_comment_logger, 'filter_comment_feed' ), 10, 2 );
-
-		// Action Scheduler may be displayed as a Tools screen or WooCommerce > Status administration screen
-		add_action( 'load-tools_page_action-scheduler', array( __CLASS__, 'register_admin_notice' ) );
-		add_action( 'load-woocommerce_page_wc-status', array( __CLASS__, 'register_admin_notice' ) );
-	}
-
-	/**
-	 * Determines if there are log entries in the wp comments table.
-	 *
-	 * Uses the flag set on migration completion set by @see self::maybe_schedule_cleanup().
-	 *
-	 * @return boolean Whether there are scheduled action comments in the comments table.
-	 */
-	public static function has_logs() {
-		return 'yes' === get_option( self::$has_logs_option_key );
-	}
-
-	/**
-	 * Schedules the WP Post comment table cleanup to run in 6 months if it's not already scheduled.
-	 * Attached to the migration complete hook 'action_scheduler/migration_complete'.
-	 */
-	public static function maybe_schedule_cleanup() {
-		if ( (bool) get_comments( array( 'type' => ActionScheduler_wpCommentLogger::TYPE, 'number' => 1, 'fields' => 'ids' ) ) ) {
-			update_option( self::$has_logs_option_key, 'yes' );
-
-			if ( ! as_next_scheduled_action( self::$cleanup_hook ) ) {
-				as_schedule_single_action( gmdate( 'U' ) + ( 6 * MONTH_IN_SECONDS ), self::$cleanup_hook );
-			}
-		}
-	}
-
-	/**
-	 * Delete all action comments from the WP Comments table.
-	 */
-	public static function delete_all_action_comments() {
-		global $wpdb;
-		$wpdb->delete( $wpdb->comments, array( 'comment_type' => ActionScheduler_wpCommentLogger::TYPE, 'comment_agent' => ActionScheduler_wpCommentLogger::AGENT ) );
-		delete_option( self::$has_logs_option_key );
-	}
-
-	/**
-	 * Registers admin notices about the orphaned action logs.
-	 */
-	public static function register_admin_notice() {
-		add_action( 'admin_notices', array( __CLASS__, 'print_admin_notice' ) );
-	}
+    /**
+     * Post migration hook used to cleanup the WP comment table.
+     *
+     * @var string
+     */
+    protected static $cleanup_hook = 'action_scheduler/cleanup_wp_comment_logs';
+
+    /**
+     * An instance of the ActionScheduler_wpCommentLogger class to interact with the comments table.
+     *
+     * This instance should only be used as an interface. It should not be initialized.
+     *
+     * @var ActionScheduler_wpCommentLogger
+     */
+    protected static $wp_comment_logger = null;
+
+    /**
+     * The key used to store the cached value of whether there are logs in the WP comment table.
+     *
+     * @var string
+     */
+    protected static $has_logs_option_key = 'as_has_wp_comment_logs';
+
+    /**
+     * Initialize the class and attach callbacks.
+     */
+    public static function init() {
+        if ( empty( self::$wp_comment_logger ) ) {
+            self::$wp_comment_logger = new ActionScheduler_wpCommentLogger();
+        }
+
+        add_action( self::$cleanup_hook, array( __CLASS__, 'delete_all_action_comments' ) );
+
+        // While there are orphaned logs left in the comments table, we need to attach the callbacks which filter comment counts.
+        add_action( 'pre_get_comments', array( self::$wp_comment_logger, 'filter_comment_queries' ), 10, 1 );
+        add_action( 'wp_count_comments', array( self::$wp_comment_logger, 'filter_comment_count' ), 20, 2 ); // run after WC_Comments::wp_count_comments() to make sure we exclude order notes and action logs
+        add_action( 'comment_feed_where', array( self::$wp_comment_logger, 'filter_comment_feed' ), 10, 2 );
+
+        // Action Scheduler may be displayed as a Tools screen or WooCommerce > Status administration screen
+        add_action( 'load-tools_page_action-scheduler', array( __CLASS__, 'register_admin_notice' ) );
+        add_action( 'load-woocommerce_page_wc-status', array( __CLASS__, 'register_admin_notice' ) );
+    }
+
+    /**
+     * Determines if there are log entries in the wp comments table.
+     *
+     * Uses the flag set on migration completion set by @see self::maybe_schedule_cleanup().
+     *
+     * @return boolean Whether there are scheduled action comments in the comments table.
+     */
+    public static function has_logs() {
+        return 'yes' === get_option( self::$has_logs_option_key );
+    }
+
+    /**
+     * Schedules the WP Post comment table cleanup to run in 6 months if it's not already scheduled.
+     * Attached to the migration complete hook 'action_scheduler/migration_complete'.
+     */
+    public static function maybe_schedule_cleanup() {
+        if ( (bool) get_comments( array( 'type' => ActionScheduler_wpCommentLogger::TYPE, 'number' => 1, 'fields' => 'ids' ) ) ) {
+            update_option( self::$has_logs_option_key, 'yes' );
+
+            if ( ! as_next_scheduled_action( self::$cleanup_hook ) ) {
+                as_schedule_single_action( gmdate( 'U' ) + ( 6 * MONTH_IN_SECONDS ), self::$cleanup_hook );
+            }
+        }
+    }
+
+    /**
+     * Delete all action comments from the WP Comments table.
+     */
+    public static function delete_all_action_comments() {
+        global $wpdb;
+        $wpdb->delete( $wpdb->comments, array( 'comment_type' => ActionScheduler_wpCommentLogger::TYPE, 'comment_agent' => ActionScheduler_wpCommentLogger::AGENT ) );
+        delete_option( self::$has_logs_option_key );
+    }
+
+    /**
+     * Registers admin notices about the orphaned action logs.
+     */
+    public static function register_admin_notice() {
+        add_action( 'admin_notices', array( __CLASS__, 'print_admin_notice' ) );
+    }
 	
-	/**
-	 * Prints details about the orphaned action logs and includes information on where to learn more.
-	 */
-	public static function print_admin_notice() {
-		$next_cleanup_message        = '';
-		$next_scheduled_cleanup_hook = as_next_scheduled_action( self::$cleanup_hook );
-
-		if ( $next_scheduled_cleanup_hook ) {
-			/* translators: %s: date interval */
-			$next_cleanup_message = sprintf( __( 'This data will be deleted in %s.', 'action-scheduler' ), human_time_diff( gmdate( 'U' ), $next_scheduled_cleanup_hook ) );
-		}
-
-		$notice = sprintf(
-			/* translators: 1: next cleanup message 2: github issue URL */
-			__( 'Action Scheduler has migrated data to custom tables; however, orphaned log entries exist in the WordPress Comments table. %1$s <a href="%2$s">Learn more &raquo;</a>', 'action-scheduler' ),
-			$next_cleanup_message,
-			'https://github.com/woocommerce/action-scheduler/issues/368'
-		);
-
-		echo '<div class="notice notice-warning"><p>' . wp_kses_post( $notice ) . '</p></div>';
-	}
+    /**
+     * Prints details about the orphaned action logs and includes information on where to learn more.
+     */
+    public static function print_admin_notice() {
+        $next_cleanup_message        = '';
+        $next_scheduled_cleanup_hook = as_next_scheduled_action( self::$cleanup_hook );
+
+        if ( $next_scheduled_cleanup_hook ) {
+            /* translators: %s: date interval */
+            $next_cleanup_message = sprintf( __( 'This data will be deleted in %s.', 'action-scheduler' ), human_time_diff( gmdate( 'U' ), $next_scheduled_cleanup_hook ) );
+        }
+
+        $notice = sprintf(
+            /* translators: 1: next cleanup message 2: github issue URL */
+            __( 'Action Scheduler has migrated data to custom tables; however, orphaned log entries exist in the WordPress Comments table. %1$s <a href="%2$s">Learn more &raquo;</a>', 'action-scheduler' ),
+            $next_cleanup_message,
+            'https://github.com/woocommerce/action-scheduler/issues/368'
+        );
+
+        echo '<div class="notice notice-warning"><p>' . wp_kses_post( $notice ) . '</p></div>';
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -34,20 +34,20 @@ 
 	 * Initialize the class and attach callbacks.
 	 */
 	public static function init() {
-		if ( empty( self::$wp_comment_logger ) ) {
+		if (empty(self::$wp_comment_logger)) {
 			self::$wp_comment_logger = new ActionScheduler_wpCommentLogger();
 		}
 
-		add_action( self::$cleanup_hook, array( __CLASS__, 'delete_all_action_comments' ) );
+		add_action(self::$cleanup_hook, array(__CLASS__, 'delete_all_action_comments'));
 
 		// While there are orphaned logs left in the comments table, we need to attach the callbacks which filter comment counts.
-		add_action( 'pre_get_comments', array( self::$wp_comment_logger, 'filter_comment_queries' ), 10, 1 );
-		add_action( 'wp_count_comments', array( self::$wp_comment_logger, 'filter_comment_count' ), 20, 2 ); // run after WC_Comments::wp_count_comments() to make sure we exclude order notes and action logs
-		add_action( 'comment_feed_where', array( self::$wp_comment_logger, 'filter_comment_feed' ), 10, 2 );
+		add_action('pre_get_comments', array(self::$wp_comment_logger, 'filter_comment_queries'), 10, 1);
+		add_action('wp_count_comments', array(self::$wp_comment_logger, 'filter_comment_count'), 20, 2); // run after WC_Comments::wp_count_comments() to make sure we exclude order notes and action logs
+		add_action('comment_feed_where', array(self::$wp_comment_logger, 'filter_comment_feed'), 10, 2);
 
 		// Action Scheduler may be displayed as a Tools screen or WooCommerce > Status administration screen
-		add_action( 'load-tools_page_action-scheduler', array( __CLASS__, 'register_admin_notice' ) );
-		add_action( 'load-woocommerce_page_wc-status', array( __CLASS__, 'register_admin_notice' ) );
+		add_action('load-tools_page_action-scheduler', array(__CLASS__, 'register_admin_notice'));
+		add_action('load-woocommerce_page_wc-status', array(__CLASS__, 'register_admin_notice'));
 	}
 
 	/**
@@ -58,7 +58,7 @@ 
 	 * @return boolean Whether there are scheduled action comments in the comments table.
 	 */
 	public static function has_logs() {
-		return 'yes' === get_option( self::$has_logs_option_key );
+		return 'yes' === get_option(self::$has_logs_option_key);
 	}
 
 	/**
@@ -66,11 +66,11 @@ 
 	 * Attached to the migration complete hook 'action_scheduler/migration_complete'.
 	 */
 	public static function maybe_schedule_cleanup() {
-		if ( (bool) get_comments( array( 'type' => ActionScheduler_wpCommentLogger::TYPE, 'number' => 1, 'fields' => 'ids' ) ) ) {
-			update_option( self::$has_logs_option_key, 'yes' );
+		if ((bool) get_comments(array('type' => ActionScheduler_wpCommentLogger::TYPE, 'number' => 1, 'fields' => 'ids'))) {
+			update_option(self::$has_logs_option_key, 'yes');
 
-			if ( ! as_next_scheduled_action( self::$cleanup_hook ) ) {
-				as_schedule_single_action( gmdate( 'U' ) + ( 6 * MONTH_IN_SECONDS ), self::$cleanup_hook );
+			if (!as_next_scheduled_action(self::$cleanup_hook)) {
+				as_schedule_single_action(gmdate('U') + (6 * MONTH_IN_SECONDS), self::$cleanup_hook);
 			}
 		}
 	}
@@ -80,15 +80,15 @@ 
 	 */
 	public static function delete_all_action_comments() {
 		global $wpdb;
-		$wpdb->delete( $wpdb->comments, array( 'comment_type' => ActionScheduler_wpCommentLogger::TYPE, 'comment_agent' => ActionScheduler_wpCommentLogger::AGENT ) );
-		delete_option( self::$has_logs_option_key );
+		$wpdb->delete($wpdb->comments, array('comment_type' => ActionScheduler_wpCommentLogger::TYPE, 'comment_agent' => ActionScheduler_wpCommentLogger::AGENT));
+		delete_option(self::$has_logs_option_key);
 	}
 
 	/**
 	 * Registers admin notices about the orphaned action logs.
 	 */
 	public static function register_admin_notice() {
-		add_action( 'admin_notices', array( __CLASS__, 'print_admin_notice' ) );
+		add_action('admin_notices', array(__CLASS__, 'print_admin_notice'));
 	}
 	
 	/**
@@ -96,20 +96,20 @@ 
 	 */
 	public static function print_admin_notice() {
 		$next_cleanup_message        = '';
-		$next_scheduled_cleanup_hook = as_next_scheduled_action( self::$cleanup_hook );
+		$next_scheduled_cleanup_hook = as_next_scheduled_action(self::$cleanup_hook);
 
-		if ( $next_scheduled_cleanup_hook ) {
+		if ($next_scheduled_cleanup_hook) {
 			/* translators: %s: date interval */
-			$next_cleanup_message = sprintf( __( 'This data will be deleted in %s.', 'action-scheduler' ), human_time_diff( gmdate( 'U' ), $next_scheduled_cleanup_hook ) );
+			$next_cleanup_message = sprintf(__('This data will be deleted in %s.', 'action-scheduler'), human_time_diff(gmdate('U'), $next_scheduled_cleanup_hook));
 		}
 
 		$notice = sprintf(
 			/* translators: 1: next cleanup message 2: github issue URL */
-			__( 'Action Scheduler has migrated data to custom tables; however, orphaned log entries exist in the WordPress Comments table. %1$s <a href="%2$s">Learn more &raquo;</a>', 'action-scheduler' ),
+			__('Action Scheduler has migrated data to custom tables; however, orphaned log entries exist in the WordPress Comments table. %1$s <a href="%2$s">Learn more &raquo;</a>', 'action-scheduler'),
 			$next_cleanup_message,
 			'https://github.com/woocommerce/action-scheduler/issues/368'
 		);
 
-		echo '<div class="notice notice-warning"><p>' . wp_kses_post( $notice ) . '</p></div>';
+		echo '<div class="notice notice-warning"><p>' . wp_kses_post($notice) . '</p></div>';
 	}
 }

includes/libraries/action-scheduler/classes/actions/ActionScheduler_FinishedAction.php

Indentation +7 added lines, -7 removed lines

@@ -5,12 +5,12 @@
  */
 class ActionScheduler_FinishedAction extends ActionScheduler_Action {
 
-	public function execute() {
-		// don't execute
-	}
+    public function execute() {
+        // don't execute
+    }
 
-	public function is_finished() {
-		return TRUE;
-	}
+    public function is_finished() {
+        return TRUE;
+    }
 }
- 
\ No newline at end of file
+    
\ No newline at end of file

includes/libraries/action-scheduler/classes/actions/ActionScheduler_CanceledAction.php

Indentation +12 added lines, -12 removed lines

@@ -8,16 +8,16 @@
  */
 class ActionScheduler_CanceledAction extends ActionScheduler_FinishedAction {
 
-	/**
-	 * @param string $hook
-	 * @param array $args
-	 * @param ActionScheduler_Schedule $schedule
-	 * @param string $group
-	 */
-	public function __construct( $hook, array $args = array(), ActionScheduler_Schedule $schedule = null, $group = '' ) {
-		parent::__construct( $hook, $args, $schedule, $group );
-		if ( is_null( $schedule ) ) {
-			$this->set_schedule( new ActionScheduler_NullSchedule() );
-		}
-	}
+    /**
+     * @param string $hook
+     * @param array $args
+     * @param ActionScheduler_Schedule $schedule
+     * @param string $group
+     */
+    public function __construct( $hook, array $args = array(), ActionScheduler_Schedule $schedule = null, $group = '' ) {
+        parent::__construct( $hook, $args, $schedule, $group );
+        if ( is_null( $schedule ) ) {
+            $this->set_schedule( new ActionScheduler_NullSchedule() );
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -14,10 +14,10 @@
 	 * @param ActionScheduler_Schedule $schedule
 	 * @param string $group
 	 */
-	public function __construct( $hook, array $args = array(), ActionScheduler_Schedule $schedule = null, $group = '' ) {
-		parent::__construct( $hook, $args, $schedule, $group );
-		if ( is_null( $schedule ) ) {
-			$this->set_schedule( new ActionScheduler_NullSchedule() );
+	public function __construct($hook, array $args = array(), ActionScheduler_Schedule $schedule = null, $group = '') {
+		parent::__construct($hook, $args, $schedule, $group);
+		if (is_null($schedule)) {
+			$this->set_schedule(new ActionScheduler_NullSchedule());
 		}
 	}
 }

includes/libraries/action-scheduler/classes/actions/ActionScheduler_Action.php

Indentation +57 added lines, -57 removed lines

@@ -4,72 +4,72 @@
  * Class ActionScheduler_Action
  */
 class ActionScheduler_Action {
-	protected $hook = '';
-	protected $args = array();
-	/** @var ActionScheduler_Schedule */
-	protected $schedule = NULL;
-	protected $group = '';
+    protected $hook = '';
+    protected $args = array();
+    /** @var ActionScheduler_Schedule */
+    protected $schedule = NULL;
+    protected $group = '';
 
-	public function __construct( $hook, array $args = array(), ActionScheduler_Schedule $schedule = NULL, $group = '' ) {
-		$schedule = empty( $schedule ) ? new ActionScheduler_NullSchedule() : $schedule;
-		$this->set_hook($hook);
-		$this->set_schedule($schedule);
-		$this->set_args($args);
-		$this->set_group($group);
-	}
+    public function __construct( $hook, array $args = array(), ActionScheduler_Schedule $schedule = NULL, $group = '' ) {
+        $schedule = empty( $schedule ) ? new ActionScheduler_NullSchedule() : $schedule;
+        $this->set_hook($hook);
+        $this->set_schedule($schedule);
+        $this->set_args($args);
+        $this->set_group($group);
+    }
 
-	public function execute() {
-		return do_action_ref_array($this->get_hook(), $this->get_args());
-	}
+    public function execute() {
+        return do_action_ref_array($this->get_hook(), $this->get_args());
+    }
 
-	/**
-	 * @param string $hook
-	 */
-	protected function set_hook( $hook ) {
-		$this->hook = $hook;
-	}
+    /**
+     * @param string $hook
+     */
+    protected function set_hook( $hook ) {
+        $this->hook = $hook;
+    }
 
-	public function get_hook() {
-		return $this->hook;
-	}
+    public function get_hook() {
+        return $this->hook;
+    }
 
-	protected function set_schedule( ActionScheduler_Schedule $schedule ) {
-		$this->schedule = $schedule;
-	}
+    protected function set_schedule( ActionScheduler_Schedule $schedule ) {
+        $this->schedule = $schedule;
+    }
 
-	/**
-	 * @return ActionScheduler_Schedule
-	 */
-	public function get_schedule() {
-		return $this->schedule;
-	}
+    /**
+     * @return ActionScheduler_Schedule
+     */
+    public function get_schedule() {
+        return $this->schedule;
+    }
 
-	protected function set_args( array $args ) {
-		$this->args = $args;
-	}
+    protected function set_args( array $args ) {
+        $this->args = $args;
+    }
 
-	public function get_args() {
-		return $this->args;
-	}
+    public function get_args() {
+        return $this->args;
+    }
 
-	/**
-	 * @param string $group
-	 */
-	protected function set_group( $group ) {
-		$this->group = $group;
-	}
+    /**
+     * @param string $group
+     */
+    protected function set_group( $group ) {
+        $this->group = $group;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_group() {
-		return $this->group;
-	}
+    /**
+     * @return string
+     */
+    public function get_group() {
+        return $this->group;
+    }
 
-	/**
-	 * @return bool If the action has been finished
-	 */
-	public function is_finished() {
-		return FALSE;
-	}
+    /**
+     * @return bool If the action has been finished
+     */
+    public function is_finished() {
+        return FALSE;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -10,8 +10,8 @@ 
 	protected $schedule = NULL;
 	protected $group = '';
 
-	public function __construct( $hook, array $args = array(), ActionScheduler_Schedule $schedule = NULL, $group = '' ) {
-		$schedule = empty( $schedule ) ? new ActionScheduler_NullSchedule() : $schedule;
+	public function __construct($hook, array $args = array(), ActionScheduler_Schedule $schedule = NULL, $group = '') {
+		$schedule = empty($schedule) ? new ActionScheduler_NullSchedule() : $schedule;
 		$this->set_hook($hook);
 		$this->set_schedule($schedule);
 		$this->set_args($args);
@@ -25,7 +25,7 @@ 
 	/**
 	 * @param string $hook
 	 */
-	protected function set_hook( $hook ) {
+	protected function set_hook($hook) {
 		$this->hook = $hook;
 	}
 
@@ -33,7 +33,7 @@ 
 		return $this->hook;
 	}
 
-	protected function set_schedule( ActionScheduler_Schedule $schedule ) {
+	protected function set_schedule(ActionScheduler_Schedule $schedule) {
 		$this->schedule = $schedule;
 	}
 
@@ -44,7 +44,7 @@ 
 		return $this->schedule;
 	}
 
-	protected function set_args( array $args ) {
+	protected function set_args(array $args) {
 		$this->args = $args;
 	}
 
@@ -55,7 +55,7 @@ 
 	/**
 	 * @param string $group
 	 */
-	protected function set_group( $group ) {
+	protected function set_group($group) {
 		$this->group = $group;
 	}
 

includes/libraries/action-scheduler/classes/actions/ActionScheduler_NullAction.php

Indentation +7 added lines, -7 removed lines

@@ -5,12 +5,12 @@
  */
 class ActionScheduler_NullAction extends ActionScheduler_Action {
 
-	public function __construct( $hook = '', array $args = array(), ActionScheduler_Schedule $schedule = NULL ) {
-		$this->set_schedule( new ActionScheduler_NullSchedule() );
-	}
+    public function __construct( $hook = '', array $args = array(), ActionScheduler_Schedule $schedule = NULL ) {
+        $this->set_schedule( new ActionScheduler_NullSchedule() );
+    }
 
-	public function execute() {
-		// don't execute
-	}
+    public function execute() {
+        // don't execute
+    }
 }
- 
\ No newline at end of file
+    
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
  */
 class ActionScheduler_NullAction extends ActionScheduler_Action {
 
-	public function __construct( $hook = '', array $args = array(), ActionScheduler_Schedule $schedule = NULL ) {
-		$this->set_schedule( new ActionScheduler_NullSchedule() );
+	public function __construct($hook = '', array $args = array(), ActionScheduler_Schedule $schedule = NULL) {
+		$this->set_schedule(new ActionScheduler_NullSchedule());
 	}
 
 	public function execute() {

includes/libraries/action-scheduler/classes/ActionScheduler_AdminView.php

Indentation +145 added lines, -145 removed lines

@@ -6,149 +6,149 @@
  */
 class ActionScheduler_AdminView extends ActionScheduler_AdminView_Deprecated {
 
-	private static $admin_view = NULL;
-
-	private static $screen_id = 'tools_page_action-scheduler';
-
-	/** @var ActionScheduler_ListTable */
-	protected $list_table;
-
-	/**
-	 * @return ActionScheduler_AdminView
-	 * @codeCoverageIgnore
-	 */
-	public static function instance() {
-
-		if ( empty( self::$admin_view ) ) {
-			$class = apply_filters('action_scheduler_admin_view_class', 'ActionScheduler_AdminView');
-			self::$admin_view = new $class();
-		}
-
-		return self::$admin_view;
-	}
-
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public function init() {
-		if ( is_admin() && ( ! defined( 'DOING_AJAX' ) || false == DOING_AJAX ) ) {
-
-			if ( class_exists( 'WooCommerce' ) ) {
-				add_action( 'woocommerce_admin_status_content_action-scheduler', array( $this, 'render_admin_ui' ) );
-				add_action( 'woocommerce_system_status_report', array( $this, 'system_status_report' ) );
-				add_filter( 'woocommerce_admin_status_tabs', array( $this, 'register_system_status_tab' ) );
-			}
-
-			add_action( 'admin_menu', array( $this, 'register_menu' ) );
-
-			add_action( 'current_screen', array( $this, 'add_help_tabs' ) );
-		}
-	}
-
-	public function system_status_report() {
-		$table = new ActionScheduler_wcSystemStatus( ActionScheduler::store() );
-		$table->render();
-	}
-
-	/**
-	 * Registers action-scheduler into WooCommerce > System status.
-	 *
-	 * @param array $tabs An associative array of tab key => label.
-	 * @return array $tabs An associative array of tab key => label, including Action Scheduler's tabs
-	 */
-	public function register_system_status_tab( array $tabs ) {
-		$tabs['action-scheduler'] = __( 'Scheduled Actions', 'action-scheduler' );
-
-		return $tabs;
-	}
-
-	/**
-	 * Include Action Scheduler's administration under the Tools menu.
-	 *
-	 * A menu under the Tools menu is important for backward compatibility (as that's
-	 * where it started), and also provides more convenient access than the WooCommerce
-	 * System Status page, and for sites where WooCommerce isn't active.
-	 */
-	public function register_menu() {
-		$hook_suffix = add_submenu_page(
-			'tools.php',
-			__( 'Scheduled Actions', 'action-scheduler' ),
-			__( 'Scheduled Actions', 'action-scheduler' ),
-			'manage_options',
-			'action-scheduler',
-			array( $this, 'render_admin_ui' )
-		);
-		add_action( 'load-' . $hook_suffix , array( $this, 'process_admin_ui' ) );
-	}
-
-	/**
-	 * Triggers processing of any pending actions.
-	 */
-	public function process_admin_ui() {
-		$this->get_list_table();
-	}
-
-	/**
-	 * Renders the Admin UI
-	 */
-	public function render_admin_ui() {
-		$table = $this->get_list_table();
-		$table->display_page();
-	}
-
-	/**
-	 * Get the admin UI object and process any requested actions.
-	 *
-	 * @return ActionScheduler_ListTable
-	 */
-	protected function get_list_table() {
-		if ( null === $this->list_table ) {
-			$this->list_table = new ActionScheduler_ListTable( ActionScheduler::store(), ActionScheduler::logger(), ActionScheduler::runner() );
-			$this->list_table->process_actions();
-		}
-
-		return $this->list_table;
-	}
-
-	/**
-	 * Provide more information about the screen and its data in the help tab.
-	 */
-	public function add_help_tabs() {
-		$screen = get_current_screen();
-
-		if ( ! $screen || self::$screen_id != $screen->id ) {
-			return;
-		}
-
-		$as_version = ActionScheduler_Versions::instance()->latest_version();
-		$screen->add_help_tab(
-			array(
-				'id'      => 'action_scheduler_about',
-				'title'   => __( 'About', 'action-scheduler' ),
-				'content' =>
-					'<h2>' . sprintf( __( 'About Action Scheduler %s', 'action-scheduler' ), $as_version ) . '</h2>' .
-					'<p>' .
-						__( 'Action Scheduler is a scalable, traceable job queue for background processing large sets of actions. Action Scheduler works by triggering an action hook to run at some time in the future. Scheduled actions can also be scheduled to run on a recurring schedule.', 'action-scheduler' ) .
-					'</p>',
-			)
-		);
-
-		$screen->add_help_tab(
-			array(
-				'id'      => 'action_scheduler_columns',
-				'title'   => __( 'Columns', 'action-scheduler' ),
-				'content' =>
-					'<h2>' . __( 'Scheduled Action Columns', 'action-scheduler' ) . '</h2>' .
-					'<ul>' .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Hook', 'action-scheduler' ), __( 'Name of the action hook that will be triggered.', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Status', 'action-scheduler' ), __( 'Action statuses are Pending, Complete, Canceled, Failed', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Arguments', 'action-scheduler' ), __( 'Optional data array passed to the action hook.', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Group', 'action-scheduler' ), __( 'Optional action group.', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Recurrence', 'action-scheduler' ), __( 'The action\'s schedule frequency.', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Scheduled', 'action-scheduler' ), __( 'The date/time the action is/was scheduled to run.', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Log', 'action-scheduler' ), __( 'Activity log for the action.', 'action-scheduler' ) ) .
-					'</ul>',
-			)
-		);
-	}
+    private static $admin_view = NULL;
+
+    private static $screen_id = 'tools_page_action-scheduler';
+
+    /** @var ActionScheduler_ListTable */
+    protected $list_table;
+
+    /**
+     * @return ActionScheduler_AdminView
+     * @codeCoverageIgnore
+     */
+    public static function instance() {
+
+        if ( empty( self::$admin_view ) ) {
+            $class = apply_filters('action_scheduler_admin_view_class', 'ActionScheduler_AdminView');
+            self::$admin_view = new $class();
+        }
+
+        return self::$admin_view;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function init() {
+        if ( is_admin() && ( ! defined( 'DOING_AJAX' ) || false == DOING_AJAX ) ) {
+
+            if ( class_exists( 'WooCommerce' ) ) {
+                add_action( 'woocommerce_admin_status_content_action-scheduler', array( $this, 'render_admin_ui' ) );
+                add_action( 'woocommerce_system_status_report', array( $this, 'system_status_report' ) );
+                add_filter( 'woocommerce_admin_status_tabs', array( $this, 'register_system_status_tab' ) );
+            }
+
+            add_action( 'admin_menu', array( $this, 'register_menu' ) );
+
+            add_action( 'current_screen', array( $this, 'add_help_tabs' ) );
+        }
+    }
+
+    public function system_status_report() {
+        $table = new ActionScheduler_wcSystemStatus( ActionScheduler::store() );
+        $table->render();
+    }
+
+    /**
+     * Registers action-scheduler into WooCommerce > System status.
+     *
+     * @param array $tabs An associative array of tab key => label.
+     * @return array $tabs An associative array of tab key => label, including Action Scheduler's tabs
+     */
+    public function register_system_status_tab( array $tabs ) {
+        $tabs['action-scheduler'] = __( 'Scheduled Actions', 'action-scheduler' );
+
+        return $tabs;
+    }
+
+    /**
+     * Include Action Scheduler's administration under the Tools menu.
+     *
+     * A menu under the Tools menu is important for backward compatibility (as that's
+     * where it started), and also provides more convenient access than the WooCommerce
+     * System Status page, and for sites where WooCommerce isn't active.
+     */
+    public function register_menu() {
+        $hook_suffix = add_submenu_page(
+            'tools.php',
+            __( 'Scheduled Actions', 'action-scheduler' ),
+            __( 'Scheduled Actions', 'action-scheduler' ),
+            'manage_options',
+            'action-scheduler',
+            array( $this, 'render_admin_ui' )
+        );
+        add_action( 'load-' . $hook_suffix , array( $this, 'process_admin_ui' ) );
+    }
+
+    /**
+     * Triggers processing of any pending actions.
+     */
+    public function process_admin_ui() {
+        $this->get_list_table();
+    }
+
+    /**
+     * Renders the Admin UI
+     */
+    public function render_admin_ui() {
+        $table = $this->get_list_table();
+        $table->display_page();
+    }
+
+    /**
+     * Get the admin UI object and process any requested actions.
+     *
+     * @return ActionScheduler_ListTable
+     */
+    protected function get_list_table() {
+        if ( null === $this->list_table ) {
+            $this->list_table = new ActionScheduler_ListTable( ActionScheduler::store(), ActionScheduler::logger(), ActionScheduler::runner() );
+            $this->list_table->process_actions();
+        }
+
+        return $this->list_table;
+    }
+
+    /**
+     * Provide more information about the screen and its data in the help tab.
+     */
+    public function add_help_tabs() {
+        $screen = get_current_screen();
+
+        if ( ! $screen || self::$screen_id != $screen->id ) {
+            return;
+        }
+
+        $as_version = ActionScheduler_Versions::instance()->latest_version();
+        $screen->add_help_tab(
+            array(
+                'id'      => 'action_scheduler_about',
+                'title'   => __( 'About', 'action-scheduler' ),
+                'content' =>
+                    '<h2>' . sprintf( __( 'About Action Scheduler %s', 'action-scheduler' ), $as_version ) . '</h2>' .
+                    '<p>' .
+                        __( 'Action Scheduler is a scalable, traceable job queue for background processing large sets of actions. Action Scheduler works by triggering an action hook to run at some time in the future. Scheduled actions can also be scheduled to run on a recurring schedule.', 'action-scheduler' ) .
+                    '</p>',
+            )
+        );
+
+        $screen->add_help_tab(
+            array(
+                'id'      => 'action_scheduler_columns',
+                'title'   => __( 'Columns', 'action-scheduler' ),
+                'content' =>
+                    '<h2>' . __( 'Scheduled Action Columns', 'action-scheduler' ) . '</h2>' .
+                    '<ul>' .
+                    sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Hook', 'action-scheduler' ), __( 'Name of the action hook that will be triggered.', 'action-scheduler' ) ) .
+                    sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Status', 'action-scheduler' ), __( 'Action statuses are Pending, Complete, Canceled, Failed', 'action-scheduler' ) ) .
+                    sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Arguments', 'action-scheduler' ), __( 'Optional data array passed to the action hook.', 'action-scheduler' ) ) .
+                    sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Group', 'action-scheduler' ), __( 'Optional action group.', 'action-scheduler' ) ) .
+                    sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Recurrence', 'action-scheduler' ), __( 'The action\'s schedule frequency.', 'action-scheduler' ) ) .
+                    sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Scheduled', 'action-scheduler' ), __( 'The date/time the action is/was scheduled to run.', 'action-scheduler' ) ) .
+                    sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Log', 'action-scheduler' ), __( 'Activity log for the action.', 'action-scheduler' ) ) .
+                    '</ul>',
+            )
+        );
+    }
 }

Spacing +30 added lines, -30 removed lines

@@ -19,7 +19,7 @@ 
 	 */
 	public static function instance() {
 
-		if ( empty( self::$admin_view ) ) {
+		if (empty(self::$admin_view)) {
 			$class = apply_filters('action_scheduler_admin_view_class', 'ActionScheduler_AdminView');
 			self::$admin_view = new $class();
 		}
@@ -31,22 +31,22 @@ 
 	 * @codeCoverageIgnore
 	 */
 	public function init() {
-		if ( is_admin() && ( ! defined( 'DOING_AJAX' ) || false == DOING_AJAX ) ) {
+		if (is_admin() && (!defined('DOING_AJAX') || false == DOING_AJAX)) {
 
-			if ( class_exists( 'WooCommerce' ) ) {
-				add_action( 'woocommerce_admin_status_content_action-scheduler', array( $this, 'render_admin_ui' ) );
-				add_action( 'woocommerce_system_status_report', array( $this, 'system_status_report' ) );
-				add_filter( 'woocommerce_admin_status_tabs', array( $this, 'register_system_status_tab' ) );
+			if (class_exists('WooCommerce')) {
+				add_action('woocommerce_admin_status_content_action-scheduler', array($this, 'render_admin_ui'));
+				add_action('woocommerce_system_status_report', array($this, 'system_status_report'));
+				add_filter('woocommerce_admin_status_tabs', array($this, 'register_system_status_tab'));
 			}
 
-			add_action( 'admin_menu', array( $this, 'register_menu' ) );
+			add_action('admin_menu', array($this, 'register_menu'));
 
-			add_action( 'current_screen', array( $this, 'add_help_tabs' ) );
+			add_action('current_screen', array($this, 'add_help_tabs'));
 		}
 	}
 
 	public function system_status_report() {
-		$table = new ActionScheduler_wcSystemStatus( ActionScheduler::store() );
+		$table = new ActionScheduler_wcSystemStatus(ActionScheduler::store());
 		$table->render();
 	}
 
@@ -56,8 +56,8 @@ 
 	 * @param array $tabs An associative array of tab key => label.
 	 * @return array $tabs An associative array of tab key => label, including Action Scheduler's tabs
 	 */
-	public function register_system_status_tab( array $tabs ) {
-		$tabs['action-scheduler'] = __( 'Scheduled Actions', 'action-scheduler' );
+	public function register_system_status_tab(array $tabs) {
+		$tabs['action-scheduler'] = __('Scheduled Actions', 'action-scheduler');
 
 		return $tabs;
 	}
@@ -72,13 +72,13 @@ 
 	public function register_menu() {
 		$hook_suffix = add_submenu_page(
 			'tools.php',
-			__( 'Scheduled Actions', 'action-scheduler' ),
-			__( 'Scheduled Actions', 'action-scheduler' ),
+			__('Scheduled Actions', 'action-scheduler'),
+			__('Scheduled Actions', 'action-scheduler'),
 			'manage_options',
 			'action-scheduler',
-			array( $this, 'render_admin_ui' )
+			array($this, 'render_admin_ui')
 		);
-		add_action( 'load-' . $hook_suffix , array( $this, 'process_admin_ui' ) );
+		add_action('load-' . $hook_suffix, array($this, 'process_admin_ui'));
 	}
 
 	/**
@@ -102,8 +102,8 @@ 
 	 * @return ActionScheduler_ListTable
 	 */
 	protected function get_list_table() {
-		if ( null === $this->list_table ) {
-			$this->list_table = new ActionScheduler_ListTable( ActionScheduler::store(), ActionScheduler::logger(), ActionScheduler::runner() );
+		if (null === $this->list_table) {
+			$this->list_table = new ActionScheduler_ListTable(ActionScheduler::store(), ActionScheduler::logger(), ActionScheduler::runner());
 			$this->list_table->process_actions();
 		}
 
@@ -116,7 +116,7 @@ 
 	public function add_help_tabs() {
 		$screen = get_current_screen();
 
-		if ( ! $screen || self::$screen_id != $screen->id ) {
+		if (!$screen || self::$screen_id != $screen->id) {
 			return;
 		}
 
@@ -124,11 +124,11 @@ 
 		$screen->add_help_tab(
 			array(
 				'id'      => 'action_scheduler_about',
-				'title'   => __( 'About', 'action-scheduler' ),
+				'title'   => __('About', 'action-scheduler'),
 				'content' =>
-					'<h2>' . sprintf( __( 'About Action Scheduler %s', 'action-scheduler' ), $as_version ) . '</h2>' .
+					'<h2>' . sprintf(__('About Action Scheduler %s', 'action-scheduler'), $as_version) . '</h2>' .
 					'<p>' .
-						__( 'Action Scheduler is a scalable, traceable job queue for background processing large sets of actions. Action Scheduler works by triggering an action hook to run at some time in the future. Scheduled actions can also be scheduled to run on a recurring schedule.', 'action-scheduler' ) .
+						__('Action Scheduler is a scalable, traceable job queue for background processing large sets of actions. Action Scheduler works by triggering an action hook to run at some time in the future. Scheduled actions can also be scheduled to run on a recurring schedule.', 'action-scheduler') .
 					'</p>',
 			)
 		);
@@ -136,17 +136,17 @@ 
 		$screen->add_help_tab(
 			array(
 				'id'      => 'action_scheduler_columns',
-				'title'   => __( 'Columns', 'action-scheduler' ),
+				'title'   => __('Columns', 'action-scheduler'),
 				'content' =>
-					'<h2>' . __( 'Scheduled Action Columns', 'action-scheduler' ) . '</h2>' .
+					'<h2>' . __('Scheduled Action Columns', 'action-scheduler') . '</h2>' .
 					'<ul>' .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Hook', 'action-scheduler' ), __( 'Name of the action hook that will be triggered.', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Status', 'action-scheduler' ), __( 'Action statuses are Pending, Complete, Canceled, Failed', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Arguments', 'action-scheduler' ), __( 'Optional data array passed to the action hook.', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Group', 'action-scheduler' ), __( 'Optional action group.', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Recurrence', 'action-scheduler' ), __( 'The action\'s schedule frequency.', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Scheduled', 'action-scheduler' ), __( 'The date/time the action is/was scheduled to run.', 'action-scheduler' ) ) .
-					sprintf( '<li><strong>%1$s</strong>: %2$s</li>', __( 'Log', 'action-scheduler' ), __( 'Activity log for the action.', 'action-scheduler' ) ) .
+					sprintf('<li><strong>%1$s</strong>: %2$s</li>', __('Hook', 'action-scheduler'), __('Name of the action hook that will be triggered.', 'action-scheduler')) .
+					sprintf('<li><strong>%1$s</strong>: %2$s</li>', __('Status', 'action-scheduler'), __('Action statuses are Pending, Complete, Canceled, Failed', 'action-scheduler')) .
+					sprintf('<li><strong>%1$s</strong>: %2$s</li>', __('Arguments', 'action-scheduler'), __('Optional data array passed to the action hook.', 'action-scheduler')) .
+					sprintf('<li><strong>%1$s</strong>: %2$s</li>', __('Group', 'action-scheduler'), __('Optional action group.', 'action-scheduler')) .
+					sprintf('<li><strong>%1$s</strong>: %2$s</li>', __('Recurrence', 'action-scheduler'), __('The action\'s schedule frequency.', 'action-scheduler')) .
+					sprintf('<li><strong>%1$s</strong>: %2$s</li>', __('Scheduled', 'action-scheduler'), __('The date/time the action is/was scheduled to run.', 'action-scheduler')) .
+					sprintf('<li><strong>%1$s</strong>: %2$s</li>', __('Log', 'action-scheduler'), __('Activity log for the action.', 'action-scheduler')) .
 					'</ul>',
 			)
 		);

includes/libraries/action-scheduler/classes/ActionScheduler_ActionFactory.php

Indentation +159 added lines, -159 removed lines

@@ -5,175 +5,175 @@
  */
 class ActionScheduler_ActionFactory {
 
-	/**
-	 * @param string $status The action's status in the data store
-	 * @param string $hook The hook to trigger when this action runs
-	 * @param array $args Args to pass to callbacks when the hook is triggered
-	 * @param ActionScheduler_Schedule $schedule The action's schedule
-	 * @param string $group A group to put the action in
-	 *
-	 * @return ActionScheduler_Action An instance of the stored action
-	 */
-	public function get_stored_action( $status, $hook, array $args = array(), ActionScheduler_Schedule $schedule = null, $group = '' ) {
+    /**
+     * @param string $status The action's status in the data store
+     * @param string $hook The hook to trigger when this action runs
+     * @param array $args Args to pass to callbacks when the hook is triggered
+     * @param ActionScheduler_Schedule $schedule The action's schedule
+     * @param string $group A group to put the action in
+     *
+     * @return ActionScheduler_Action An instance of the stored action
+     */
+    public function get_stored_action( $status, $hook, array $args = array(), ActionScheduler_Schedule $schedule = null, $group = '' ) {
 
-		switch ( $status ) {
-			case ActionScheduler_Store::STATUS_PENDING :
-				$action_class = 'ActionScheduler_Action';
-				break;
-			case ActionScheduler_Store::STATUS_CANCELED :
-				$action_class = 'ActionScheduler_CanceledAction';
-				if ( ! is_null( $schedule ) && ! is_a( $schedule, 'ActionScheduler_CanceledSchedule' ) ) {
-					$schedule = new ActionScheduler_CanceledSchedule( $schedule->get_date() );
-				}
-				break;
-			default :
-				$action_class = 'ActionScheduler_FinishedAction';
-				break;
-		}
+        switch ( $status ) {
+            case ActionScheduler_Store::STATUS_PENDING :
+                $action_class = 'ActionScheduler_Action';
+                break;
+            case ActionScheduler_Store::STATUS_CANCELED :
+                $action_class = 'ActionScheduler_CanceledAction';
+                if ( ! is_null( $schedule ) && ! is_a( $schedule, 'ActionScheduler_CanceledSchedule' ) ) {
+                    $schedule = new ActionScheduler_CanceledSchedule( $schedule->get_date() );
+                }
+                break;
+            default :
+                $action_class = 'ActionScheduler_FinishedAction';
+                break;
+        }
 
-		$action_class = apply_filters( 'action_scheduler_stored_action_class', $action_class, $status, $hook, $args, $schedule, $group );
+        $action_class = apply_filters( 'action_scheduler_stored_action_class', $action_class, $status, $hook, $args, $schedule, $group );
 
-		$action = new $action_class( $hook, $args, $schedule, $group );
+        $action = new $action_class( $hook, $args, $schedule, $group );
 
-		/**
-		 * Allow 3rd party code to change the instantiated action for a given hook, args, schedule and group.
-		 *
-		 * @param ActionScheduler_Action $action The instantiated action.
-		 * @param string $hook The instantiated action's hook.
-		 * @param array $args The instantiated action's args.
-		 * @param ActionScheduler_Schedule $schedule The instantiated action's schedule.
-		 * @param string $group The instantiated action's group.
-		 */
-		return apply_filters( 'action_scheduler_stored_action_instance', $action, $hook, $args, $schedule, $group );
-	}
+        /**
+         * Allow 3rd party code to change the instantiated action for a given hook, args, schedule and group.
+         *
+         * @param ActionScheduler_Action $action The instantiated action.
+         * @param string $hook The instantiated action's hook.
+         * @param array $args The instantiated action's args.
+         * @param ActionScheduler_Schedule $schedule The instantiated action's schedule.
+         * @param string $group The instantiated action's group.
+         */
+        return apply_filters( 'action_scheduler_stored_action_instance', $action, $hook, $args, $schedule, $group );
+    }
 
-	/**
-	 * Enqueue an action to run one time, as soon as possible (rather a specific scheduled time).
-	 *
-	 * This method creates a new action with the NULLSchedule. This schedule maps to a MySQL datetime string of
-	 * 0000-00-00 00:00:00. This is done to create a psuedo "async action" type that is fully backward compatible.
-	 * Existing queries to claim actions claim by date, meaning actions scheduled for 0000-00-00 00:00:00 will
-	 * always be claimed prior to actions scheduled for a specific date. This makes sure that any async action is
-	 * given priority in queue processing. This has the added advantage of making sure async actions can be
-	 * claimed by both the existing WP Cron and WP CLI runners, as well as a new async request runner.
-	 *
-	 * @param string $hook The hook to trigger when this action runs
-	 * @param array $args Args to pass when the hook is triggered
-	 * @param string $group A group to put the action in
-	 *
-	 * @return string The ID of the stored action
-	 */
-	public function async( $hook, $args = array(), $group = '' ) {
-		$schedule = new ActionScheduler_NullSchedule();
-		$action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
-		return $this->store( $action );
-	}
+    /**
+     * Enqueue an action to run one time, as soon as possible (rather a specific scheduled time).
+     *
+     * This method creates a new action with the NULLSchedule. This schedule maps to a MySQL datetime string of
+     * 0000-00-00 00:00:00. This is done to create a psuedo "async action" type that is fully backward compatible.
+     * Existing queries to claim actions claim by date, meaning actions scheduled for 0000-00-00 00:00:00 will
+     * always be claimed prior to actions scheduled for a specific date. This makes sure that any async action is
+     * given priority in queue processing. This has the added advantage of making sure async actions can be
+     * claimed by both the existing WP Cron and WP CLI runners, as well as a new async request runner.
+     *
+     * @param string $hook The hook to trigger when this action runs
+     * @param array $args Args to pass when the hook is triggered
+     * @param string $group A group to put the action in
+     *
+     * @return string The ID of the stored action
+     */
+    public function async( $hook, $args = array(), $group = '' ) {
+        $schedule = new ActionScheduler_NullSchedule();
+        $action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
+        return $this->store( $action );
+    }
 
-	/**
-	 * @param string $hook The hook to trigger when this action runs
-	 * @param array $args Args to pass when the hook is triggered
-	 * @param int $when Unix timestamp when the action will run
-	 * @param string $group A group to put the action in
-	 *
-	 * @return string The ID of the stored action
-	 */
-	public function single( $hook, $args = array(), $when = null, $group = '' ) {
-		$date = as_get_datetime_object( $when );
-		$schedule = new ActionScheduler_SimpleSchedule( $date );
-		$action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
-		return $this->store( $action );
-	}
+    /**
+     * @param string $hook The hook to trigger when this action runs
+     * @param array $args Args to pass when the hook is triggered
+     * @param int $when Unix timestamp when the action will run
+     * @param string $group A group to put the action in
+     *
+     * @return string The ID of the stored action
+     */
+    public function single( $hook, $args = array(), $when = null, $group = '' ) {
+        $date = as_get_datetime_object( $when );
+        $schedule = new ActionScheduler_SimpleSchedule( $date );
+        $action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
+        return $this->store( $action );
+    }
 
-	/**
-	 * Create the first instance of an action recurring on a given interval.
-	 *
-	 * @param string $hook The hook to trigger when this action runs
-	 * @param array $args Args to pass when the hook is triggered
-	 * @param int $first Unix timestamp for the first run
-	 * @param int $interval Seconds between runs
-	 * @param string $group A group to put the action in
-	 *
-	 * @return string The ID of the stored action
-	 */
-	public function recurring( $hook, $args = array(), $first = null, $interval = null, $group = '' ) {
-		if ( empty($interval) ) {
-			return $this->single( $hook, $args, $first, $group );
-		}
-		$date = as_get_datetime_object( $first );
-		$schedule = new ActionScheduler_IntervalSchedule( $date, $interval );
-		$action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
-		return $this->store( $action );
-	}
+    /**
+     * Create the first instance of an action recurring on a given interval.
+     *
+     * @param string $hook The hook to trigger when this action runs
+     * @param array $args Args to pass when the hook is triggered
+     * @param int $first Unix timestamp for the first run
+     * @param int $interval Seconds between runs
+     * @param string $group A group to put the action in
+     *
+     * @return string The ID of the stored action
+     */
+    public function recurring( $hook, $args = array(), $first = null, $interval = null, $group = '' ) {
+        if ( empty($interval) ) {
+            return $this->single( $hook, $args, $first, $group );
+        }
+        $date = as_get_datetime_object( $first );
+        $schedule = new ActionScheduler_IntervalSchedule( $date, $interval );
+        $action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
+        return $this->store( $action );
+    }
 
-	/**
-	 * Create the first instance of an action recurring on a Cron schedule.
-	 *
-	 * @param string $hook The hook to trigger when this action runs
-	 * @param array $args Args to pass when the hook is triggered
-	 * @param int $base_timestamp The first instance of the action will be scheduled
-	 *        to run at a time calculated after this timestamp matching the cron
-	 *        expression. This can be used to delay the first instance of the action.
-	 * @param int $schedule A cron definition string
-	 * @param string $group A group to put the action in
-	 *
-	 * @return string The ID of the stored action
-	 */
-	public function cron( $hook, $args = array(), $base_timestamp = null, $schedule = null, $group = '' ) {
-		if ( empty($schedule) ) {
-			return $this->single( $hook, $args, $base_timestamp, $group );
-		}
-		$date = as_get_datetime_object( $base_timestamp );
-		$cron = CronExpression::factory( $schedule );
-		$schedule = new ActionScheduler_CronSchedule( $date, $cron );
-		$action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
-		return $this->store( $action );
-	}
+    /**
+     * Create the first instance of an action recurring on a Cron schedule.
+     *
+     * @param string $hook The hook to trigger when this action runs
+     * @param array $args Args to pass when the hook is triggered
+     * @param int $base_timestamp The first instance of the action will be scheduled
+     *        to run at a time calculated after this timestamp matching the cron
+     *        expression. This can be used to delay the first instance of the action.
+     * @param int $schedule A cron definition string
+     * @param string $group A group to put the action in
+     *
+     * @return string The ID of the stored action
+     */
+    public function cron( $hook, $args = array(), $base_timestamp = null, $schedule = null, $group = '' ) {
+        if ( empty($schedule) ) {
+            return $this->single( $hook, $args, $base_timestamp, $group );
+        }
+        $date = as_get_datetime_object( $base_timestamp );
+        $cron = CronExpression::factory( $schedule );
+        $schedule = new ActionScheduler_CronSchedule( $date, $cron );
+        $action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
+        return $this->store( $action );
+    }
 
-	/**
-	 * Create a successive instance of a recurring or cron action.
-	 *
-	 * Importantly, the action will be rescheduled to run based on the current date/time.
-	 * That means when the action is scheduled to run in the past, the next scheduled date
-	 * will be pushed forward. For example, if a recurring action set to run every hour
-	 * was scheduled to run 5 seconds ago, it will be next scheduled for 1 hour in the
-	 * future, which is 1 hour and 5 seconds from when it was last scheduled to run.
-	 *
-	 * Alternatively, if the action is scheduled to run in the future, and is run early,
-	 * likely via manual intervention, then its schedule will change based on the time now.
-	 * For example, if a recurring action set to run every day, and is run 12 hours early,
-	 * it will run again in 24 hours, not 36 hours.
-	 *
-	 * This slippage is less of an issue with Cron actions, as the specific run time can
-	 * be set for them to run, e.g. 1am each day. In those cases, and entire period would
-	 * need to be missed before there was any change is scheduled, e.g. in the case of an
-	 * action scheduled for 1am each day, the action would need to run an entire day late.
-	 *
-	 * @param ActionScheduler_Action $action The existing action.
-	 *
-	 * @return string The ID of the stored action
-	 * @throws InvalidArgumentException If $action is not a recurring action.
-	 */
-	public function repeat( $action ) {
-		$schedule = $action->get_schedule();
-		$next     = $schedule->get_next( as_get_datetime_object() );
+    /**
+     * Create a successive instance of a recurring or cron action.
+     *
+     * Importantly, the action will be rescheduled to run based on the current date/time.
+     * That means when the action is scheduled to run in the past, the next scheduled date
+     * will be pushed forward. For example, if a recurring action set to run every hour
+     * was scheduled to run 5 seconds ago, it will be next scheduled for 1 hour in the
+     * future, which is 1 hour and 5 seconds from when it was last scheduled to run.
+     *
+     * Alternatively, if the action is scheduled to run in the future, and is run early,
+     * likely via manual intervention, then its schedule will change based on the time now.
+     * For example, if a recurring action set to run every day, and is run 12 hours early,
+     * it will run again in 24 hours, not 36 hours.
+     *
+     * This slippage is less of an issue with Cron actions, as the specific run time can
+     * be set for them to run, e.g. 1am each day. In those cases, and entire period would
+     * need to be missed before there was any change is scheduled, e.g. in the case of an
+     * action scheduled for 1am each day, the action would need to run an entire day late.
+     *
+     * @param ActionScheduler_Action $action The existing action.
+     *
+     * @return string The ID of the stored action
+     * @throws InvalidArgumentException If $action is not a recurring action.
+     */
+    public function repeat( $action ) {
+        $schedule = $action->get_schedule();
+        $next     = $schedule->get_next( as_get_datetime_object() );
 
-		if ( is_null( $next ) || ! $schedule->is_recurring() ) {
-			throw new InvalidArgumentException( __( 'Invalid action - must be a recurring action.', 'action-scheduler' ) );
-		}
+        if ( is_null( $next ) || ! $schedule->is_recurring() ) {
+            throw new InvalidArgumentException( __( 'Invalid action - must be a recurring action.', 'action-scheduler' ) );
+        }
 
-		$schedule_class = get_class( $schedule );
-		$new_schedule = new $schedule( $next, $schedule->get_recurrence(), $schedule->get_first_date() );
-		$new_action = new ActionScheduler_Action( $action->get_hook(), $action->get_args(), $new_schedule, $action->get_group() );
-		return $this->store( $new_action );
-	}
+        $schedule_class = get_class( $schedule );
+        $new_schedule = new $schedule( $next, $schedule->get_recurrence(), $schedule->get_first_date() );
+        $new_action = new ActionScheduler_Action( $action->get_hook(), $action->get_args(), $new_schedule, $action->get_group() );
+        return $this->store( $new_action );
+    }
 
-	/**
-	 * @param ActionScheduler_Action $action
-	 *
-	 * @return string The ID of the stored action
-	 */
-	protected function store( ActionScheduler_Action $action ) {
-		$store = ActionScheduler_Store::instance();
-		return $store->save_action( $action );
-	}
+    /**
+     * @param ActionScheduler_Action $action
+     *
+     * @return string The ID of the stored action
+     */
+    protected function store( ActionScheduler_Action $action ) {
+        $store = ActionScheduler_Store::instance();
+        return $store->save_action( $action );
+    }
 }

Spacing +40 added lines, -40 removed lines

@@ -14,16 +14,16 @@ 
 	 *
 	 * @return ActionScheduler_Action An instance of the stored action
 	 */
-	public function get_stored_action( $status, $hook, array $args = array(), ActionScheduler_Schedule $schedule = null, $group = '' ) {
+	public function get_stored_action($status, $hook, array $args = array(), ActionScheduler_Schedule $schedule = null, $group = '') {
 
-		switch ( $status ) {
+		switch ($status) {
 			case ActionScheduler_Store::STATUS_PENDING :
 				$action_class = 'ActionScheduler_Action';
 				break;
 			case ActionScheduler_Store::STATUS_CANCELED :
 				$action_class = 'ActionScheduler_CanceledAction';
-				if ( ! is_null( $schedule ) && ! is_a( $schedule, 'ActionScheduler_CanceledSchedule' ) ) {
-					$schedule = new ActionScheduler_CanceledSchedule( $schedule->get_date() );
+				if (!is_null($schedule) && !is_a($schedule, 'ActionScheduler_CanceledSchedule')) {
+					$schedule = new ActionScheduler_CanceledSchedule($schedule->get_date());
 				}
 				break;
 			default :
@@ -31,9 +31,9 @@ 
 				break;
 		}
 
-		$action_class = apply_filters( 'action_scheduler_stored_action_class', $action_class, $status, $hook, $args, $schedule, $group );
+		$action_class = apply_filters('action_scheduler_stored_action_class', $action_class, $status, $hook, $args, $schedule, $group);
 
-		$action = new $action_class( $hook, $args, $schedule, $group );
+		$action = new $action_class($hook, $args, $schedule, $group);
 
 		/**
 		 * Allow 3rd party code to change the instantiated action for a given hook, args, schedule and group.
@@ -44,7 +44,7 @@ 
 		 * @param ActionScheduler_Schedule $schedule The instantiated action's schedule.
 		 * @param string $group The instantiated action's group.
 		 */
-		return apply_filters( 'action_scheduler_stored_action_instance', $action, $hook, $args, $schedule, $group );
+		return apply_filters('action_scheduler_stored_action_instance', $action, $hook, $args, $schedule, $group);
 	}
 
 	/**
@@ -63,10 +63,10 @@ 
 	 *
 	 * @return string The ID of the stored action
 	 */
-	public function async( $hook, $args = array(), $group = '' ) {
+	public function async($hook, $args = array(), $group = '') {
 		$schedule = new ActionScheduler_NullSchedule();
-		$action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
-		return $this->store( $action );
+		$action = new ActionScheduler_Action($hook, $args, $schedule, $group);
+		return $this->store($action);
 	}
 
 	/**
@@ -77,11 +77,11 @@ 
 	 *
 	 * @return string The ID of the stored action
 	 */
-	public function single( $hook, $args = array(), $when = null, $group = '' ) {
-		$date = as_get_datetime_object( $when );
-		$schedule = new ActionScheduler_SimpleSchedule( $date );
-		$action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
-		return $this->store( $action );
+	public function single($hook, $args = array(), $when = null, $group = '') {
+		$date = as_get_datetime_object($when);
+		$schedule = new ActionScheduler_SimpleSchedule($date);
+		$action = new ActionScheduler_Action($hook, $args, $schedule, $group);
+		return $this->store($action);
 	}
 
 	/**
@@ -95,14 +95,14 @@ 
 	 *
 	 * @return string The ID of the stored action
 	 */
-	public function recurring( $hook, $args = array(), $first = null, $interval = null, $group = '' ) {
-		if ( empty($interval) ) {
-			return $this->single( $hook, $args, $first, $group );
+	public function recurring($hook, $args = array(), $first = null, $interval = null, $group = '') {
+		if (empty($interval)) {
+			return $this->single($hook, $args, $first, $group);
 		}
-		$date = as_get_datetime_object( $first );
-		$schedule = new ActionScheduler_IntervalSchedule( $date, $interval );
-		$action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
-		return $this->store( $action );
+		$date = as_get_datetime_object($first);
+		$schedule = new ActionScheduler_IntervalSchedule($date, $interval);
+		$action = new ActionScheduler_Action($hook, $args, $schedule, $group);
+		return $this->store($action);
 	}
 
 	/**
@@ -118,15 +118,15 @@ 
 	 *
 	 * @return string The ID of the stored action
 	 */
-	public function cron( $hook, $args = array(), $base_timestamp = null, $schedule = null, $group = '' ) {
-		if ( empty($schedule) ) {
-			return $this->single( $hook, $args, $base_timestamp, $group );
+	public function cron($hook, $args = array(), $base_timestamp = null, $schedule = null, $group = '') {
+		if (empty($schedule)) {
+			return $this->single($hook, $args, $base_timestamp, $group);
 		}
-		$date = as_get_datetime_object( $base_timestamp );
-		$cron = CronExpression::factory( $schedule );
-		$schedule = new ActionScheduler_CronSchedule( $date, $cron );
-		$action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
-		return $this->store( $action );
+		$date = as_get_datetime_object($base_timestamp);
+		$cron = CronExpression::factory($schedule);
+		$schedule = new ActionScheduler_CronSchedule($date, $cron);
+		$action = new ActionScheduler_Action($hook, $args, $schedule, $group);
+		return $this->store($action);
 	}
 
 	/**
@@ -153,18 +153,18 @@ 
 	 * @return string The ID of the stored action
 	 * @throws InvalidArgumentException If $action is not a recurring action.
 	 */
-	public function repeat( $action ) {
+	public function repeat($action) {
 		$schedule = $action->get_schedule();
-		$next     = $schedule->get_next( as_get_datetime_object() );
+		$next     = $schedule->get_next(as_get_datetime_object());
 
-		if ( is_null( $next ) || ! $schedule->is_recurring() ) {
-			throw new InvalidArgumentException( __( 'Invalid action - must be a recurring action.', 'action-scheduler' ) );
+		if (is_null($next) || !$schedule->is_recurring()) {
+			throw new InvalidArgumentException(__('Invalid action - must be a recurring action.', 'action-scheduler'));
 		}
 
-		$schedule_class = get_class( $schedule );
-		$new_schedule = new $schedule( $next, $schedule->get_recurrence(), $schedule->get_first_date() );
-		$new_action = new ActionScheduler_Action( $action->get_hook(), $action->get_args(), $new_schedule, $action->get_group() );
-		return $this->store( $new_action );
+		$schedule_class = get_class($schedule);
+		$new_schedule = new $schedule($next, $schedule->get_recurrence(), $schedule->get_first_date());
+		$new_action = new ActionScheduler_Action($action->get_hook(), $action->get_args(), $new_schedule, $action->get_group());
+		return $this->store($new_action);
 	}
 
 	/**
@@ -172,8 +172,8 @@ 
 	 *
 	 * @return string The ID of the stored action
 	 */
-	protected function store( ActionScheduler_Action $action ) {
+	protected function store(ActionScheduler_Action $action) {
 		$store = ActionScheduler_Store::instance();
-		return $store->save_action( $action );
+		return $store->save_action($action);
 	}
 }