AyeCode / invoicing

includes/libraries/action-scheduler/classes/WP_CLI/ActionScheduler_WPCLI_QueueRunner.php

Indentation +185 added lines, -185 removed lines

@@ -9,189 +9,189 @@
  */
 class ActionScheduler_WPCLI_QueueRunner extends ActionScheduler_Abstract_QueueRunner {
 
-	/** @var array */
-	protected $actions;
-
-	/** @var  ActionScheduler_ActionClaim */
-	protected $claim;
-
-	/** @var \cli\progress\Bar */
-	protected $progress_bar;
-
-	/**
-	 * ActionScheduler_WPCLI_QueueRunner constructor.
-	 *
-	 * @param ActionScheduler_Store             $store
-	 * @param ActionScheduler_FatalErrorMonitor $monitor
-	 * @param ActionScheduler_QueueCleaner      $cleaner
-	 *
-	 * @throws Exception When this is not run within WP CLI
-	 */
-	public function __construct( ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null ) {
-		if ( ! ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-			/* translators: %s php class name */
-			throw new Exception( sprintf( __( 'The %s class can only be run within WP CLI.', 'action-scheduler' ), __CLASS__ ) );
-		}
-
-		parent::__construct( $store, $monitor, $cleaner );
-	}
-
-	/**
-	 * Set up the Queue before processing.
-	 *
-	 * @author Jeremy Pry
-	 *
-	 * @param int    $batch_size The batch size to process.
-	 * @param array  $hooks      The hooks being used to filter the actions claimed in this batch.
-	 * @param string $group      The group of actions to claim with this batch.
-	 * @param bool   $force      Whether to force running even with too many concurrent processes.
-	 *
-	 * @return int The number of actions that will be run.
-	 * @throws \WP_CLI\ExitException When there are too many concurrent batches.
-	 */
-	public function setup( $batch_size, $hooks = array(), $group = '', $force = false ) {
-		$this->run_cleanup();
-		$this->add_hooks();
-
-		// Check to make sure there aren't too many concurrent processes running.
-		if ( $this->has_maximum_concurrent_batches() ) {
-			if ( $force ) {
-				WP_CLI::warning( __( 'There are too many concurrent batches, but the run is forced to continue.', 'action-scheduler' ) );
-			} else {
-				WP_CLI::error( __( 'There are too many concurrent batches.', 'action-scheduler' ) );
-			}
-		}
-
-		// Stake a claim and store it.
-		$this->claim = $this->store->stake_claim( $batch_size, null, $hooks, $group );
-		$this->monitor->attach( $this->claim );
-		$this->actions = $this->claim->get_actions();
-
-		return count( $this->actions );
-	}
-
-	/**
-	 * Add our hooks to the appropriate actions.
-	 *
-	 * @author Jeremy Pry
-	 */
-	protected function add_hooks() {
-		add_action( 'action_scheduler_before_execute', array( $this, 'before_execute' ) );
-		add_action( 'action_scheduler_after_execute', array( $this, 'after_execute' ), 10, 2 );
-		add_action( 'action_scheduler_failed_execution', array( $this, 'action_failed' ), 10, 2 );
-	}
-
-	/**
-	 * Set up the WP CLI progress bar.
-	 *
-	 * @author Jeremy Pry
-	 */
-	protected function setup_progress_bar() {
-		$count              = count( $this->actions );
-		$this->progress_bar = new ProgressBar(
-			/* translators: %d: amount of actions */
-			sprintf( _n( 'Running %d action', 'Running %d actions', $count, 'action-scheduler' ), number_format_i18n( $count ) ),
-			$count
-		);
-	}
-
-	/**
-	 * Process actions in the queue.
-	 *
-	 * @author Jeremy Pry
-	 *
-	 * @param string $context Optional runner context. Default 'WP CLI'.
-	 *
-	 * @return int The number of actions processed.
-	 */
-	public function run( $context = 'WP CLI' ) {
-		do_action( 'action_scheduler_before_process_queue' );
-		$this->setup_progress_bar();
-		foreach ( $this->actions as $action_id ) {
-			// Error if we lost the claim.
-			if ( ! in_array( $action_id, $this->store->find_actions_by_claim_id( $this->claim->get_id() ) ) ) {
-				WP_CLI::warning( __( 'The claim has been lost. Aborting current batch.', 'action-scheduler' ) );
-				break;
-			}
-
-			$this->process_action( $action_id, $context );
-			$this->progress_bar->tick();
-		}
-
-		$completed = $this->progress_bar->current();
-		$this->progress_bar->finish();
-		$this->store->release_claim( $this->claim );
-		do_action( 'action_scheduler_after_process_queue' );
-
-		return $completed;
-	}
-
-	/**
-	 * Handle WP CLI message when the action is starting.
-	 *
-	 * @author Jeremy Pry
-	 *
-	 * @param $action_id
-	 */
-	public function before_execute( $action_id ) {
-		/* translators: %s refers to the action ID */
-		WP_CLI::log( sprintf( __( 'Started processing action %s', 'action-scheduler' ), $action_id ) );
-	}
-
-	/**
-	 * Handle WP CLI message when the action has completed.
-	 *
-	 * @author Jeremy Pry
-	 *
-	 * @param int $action_id
-	 * @param null|ActionScheduler_Action $action The instance of the action. Default to null for backward compatibility.
-	 */
-	public function after_execute( $action_id, $action = null ) {
-		// backward compatibility
-		if ( null === $action ) {
-			$action = $this->store->fetch_action( $action_id );
-		}
-		/* translators: 1: action ID 2: hook name */
-		WP_CLI::log( sprintf( __( 'Completed processing action %1$s with hook: %2$s', 'action-scheduler' ), $action_id, $action->get_hook() ) );
-	}
-
-	/**
-	 * Handle WP CLI message when the action has failed.
-	 *
-	 * @author Jeremy Pry
-	 *
-	 * @param int       $action_id
-	 * @param Exception $exception
-	 * @throws \WP_CLI\ExitException With failure message.
-	 */
-	public function action_failed( $action_id, $exception ) {
-		WP_CLI::error(
-			/* translators: 1: action ID 2: exception message */
-			sprintf( __( 'Error processing action %1$s: %2$s', 'action-scheduler' ), $action_id, $exception->getMessage() ),
-			false
-		);
-	}
-
-	/**
-	 * Sleep and help avoid hitting memory limit
-	 *
-	 * @param int $sleep_time Amount of seconds to sleep
-	 * @deprecated 3.0.0
-	 */
-	protected function stop_the_insanity( $sleep_time = 0 ) {
-		_deprecated_function( 'ActionScheduler_WPCLI_QueueRunner::stop_the_insanity', '3.0.0', 'ActionScheduler_DataController::free_memory' );
-
-		ActionScheduler_DataController::free_memory();
-	}
-
-	/**
-	 * Maybe trigger the stop_the_insanity() method to free up memory.
-	 */
-	protected function maybe_stop_the_insanity() {
-		// The value returned by progress_bar->current() might be padded. Remove padding, and convert to int.
-		$current_iteration = intval( trim( $this->progress_bar->current() ) );
-		if ( 0 === $current_iteration % 50 ) {
-			$this->stop_the_insanity();
-		}
-	}
+    /** @var array */
+    protected $actions;
+
+    /** @var  ActionScheduler_ActionClaim */
+    protected $claim;
+
+    /** @var \cli\progress\Bar */
+    protected $progress_bar;
+
+    /**
+     * ActionScheduler_WPCLI_QueueRunner constructor.
+     *
+     * @param ActionScheduler_Store             $store
+     * @param ActionScheduler_FatalErrorMonitor $monitor
+     * @param ActionScheduler_QueueCleaner      $cleaner
+     *
+     * @throws Exception When this is not run within WP CLI
+     */
+    public function __construct( ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null ) {
+        if ( ! ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+            /* translators: %s php class name */
+            throw new Exception( sprintf( __( 'The %s class can only be run within WP CLI.', 'action-scheduler' ), __CLASS__ ) );
+        }
+
+        parent::__construct( $store, $monitor, $cleaner );
+    }
+
+    /**
+     * Set up the Queue before processing.
+     *
+     * @author Jeremy Pry
+     *
+     * @param int    $batch_size The batch size to process.
+     * @param array  $hooks      The hooks being used to filter the actions claimed in this batch.
+     * @param string $group      The group of actions to claim with this batch.
+     * @param bool   $force      Whether to force running even with too many concurrent processes.
+     *
+     * @return int The number of actions that will be run.
+     * @throws \WP_CLI\ExitException When there are too many concurrent batches.
+     */
+    public function setup( $batch_size, $hooks = array(), $group = '', $force = false ) {
+        $this->run_cleanup();
+        $this->add_hooks();
+
+        // Check to make sure there aren't too many concurrent processes running.
+        if ( $this->has_maximum_concurrent_batches() ) {
+            if ( $force ) {
+                WP_CLI::warning( __( 'There are too many concurrent batches, but the run is forced to continue.', 'action-scheduler' ) );
+            } else {
+                WP_CLI::error( __( 'There are too many concurrent batches.', 'action-scheduler' ) );
+            }
+        }
+
+        // Stake a claim and store it.
+        $this->claim = $this->store->stake_claim( $batch_size, null, $hooks, $group );
+        $this->monitor->attach( $this->claim );
+        $this->actions = $this->claim->get_actions();
+
+        return count( $this->actions );
+    }
+
+    /**
+     * Add our hooks to the appropriate actions.
+     *
+     * @author Jeremy Pry
+     */
+    protected function add_hooks() {
+        add_action( 'action_scheduler_before_execute', array( $this, 'before_execute' ) );
+        add_action( 'action_scheduler_after_execute', array( $this, 'after_execute' ), 10, 2 );
+        add_action( 'action_scheduler_failed_execution', array( $this, 'action_failed' ), 10, 2 );
+    }
+
+    /**
+     * Set up the WP CLI progress bar.
+     *
+     * @author Jeremy Pry
+     */
+    protected function setup_progress_bar() {
+        $count              = count( $this->actions );
+        $this->progress_bar = new ProgressBar(
+            /* translators: %d: amount of actions */
+            sprintf( _n( 'Running %d action', 'Running %d actions', $count, 'action-scheduler' ), number_format_i18n( $count ) ),
+            $count
+        );
+    }
+
+    /**
+     * Process actions in the queue.
+     *
+     * @author Jeremy Pry
+     *
+     * @param string $context Optional runner context. Default 'WP CLI'.
+     *
+     * @return int The number of actions processed.
+     */
+    public function run( $context = 'WP CLI' ) {
+        do_action( 'action_scheduler_before_process_queue' );
+        $this->setup_progress_bar();
+        foreach ( $this->actions as $action_id ) {
+            // Error if we lost the claim.
+            if ( ! in_array( $action_id, $this->store->find_actions_by_claim_id( $this->claim->get_id() ) ) ) {
+                WP_CLI::warning( __( 'The claim has been lost. Aborting current batch.', 'action-scheduler' ) );
+                break;
+            }
+
+            $this->process_action( $action_id, $context );
+            $this->progress_bar->tick();
+        }
+
+        $completed = $this->progress_bar->current();
+        $this->progress_bar->finish();
+        $this->store->release_claim( $this->claim );
+        do_action( 'action_scheduler_after_process_queue' );
+
+        return $completed;
+    }
+
+    /**
+     * Handle WP CLI message when the action is starting.
+     *
+     * @author Jeremy Pry
+     *
+     * @param $action_id
+     */
+    public function before_execute( $action_id ) {
+        /* translators: %s refers to the action ID */
+        WP_CLI::log( sprintf( __( 'Started processing action %s', 'action-scheduler' ), $action_id ) );
+    }
+
+    /**
+     * Handle WP CLI message when the action has completed.
+     *
+     * @author Jeremy Pry
+     *
+     * @param int $action_id
+     * @param null|ActionScheduler_Action $action The instance of the action. Default to null for backward compatibility.
+     */
+    public function after_execute( $action_id, $action = null ) {
+        // backward compatibility
+        if ( null === $action ) {
+            $action = $this->store->fetch_action( $action_id );
+        }
+        /* translators: 1: action ID 2: hook name */
+        WP_CLI::log( sprintf( __( 'Completed processing action %1$s with hook: %2$s', 'action-scheduler' ), $action_id, $action->get_hook() ) );
+    }
+
+    /**
+     * Handle WP CLI message when the action has failed.
+     *
+     * @author Jeremy Pry
+     *
+     * @param int       $action_id
+     * @param Exception $exception
+     * @throws \WP_CLI\ExitException With failure message.
+     */
+    public function action_failed( $action_id, $exception ) {
+        WP_CLI::error(
+            /* translators: 1: action ID 2: exception message */
+            sprintf( __( 'Error processing action %1$s: %2$s', 'action-scheduler' ), $action_id, $exception->getMessage() ),
+            false
+        );
+    }
+
+    /**
+     * Sleep and help avoid hitting memory limit
+     *
+     * @param int $sleep_time Amount of seconds to sleep
+     * @deprecated 3.0.0
+     */
+    protected function stop_the_insanity( $sleep_time = 0 ) {
+        _deprecated_function( 'ActionScheduler_WPCLI_QueueRunner::stop_the_insanity', '3.0.0', 'ActionScheduler_DataController::free_memory' );
+
+        ActionScheduler_DataController::free_memory();
+    }
+
+    /**
+     * Maybe trigger the stop_the_insanity() method to free up memory.
+     */
+    protected function maybe_stop_the_insanity() {
+        // The value returned by progress_bar->current() might be padded. Remove padding, and convert to int.
+        $current_iteration = intval( trim( $this->progress_bar->current() ) );
+        if ( 0 === $current_iteration % 50 ) {
+            $this->stop_the_insanity();
+        }
+    }
 }

Spacing +37 added lines, -37 removed lines

@@ -27,13 +27,13 @@ 
 	 *
 	 * @throws Exception When this is not run within WP CLI
 	 */
-	public function __construct( ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null ) {
-		if ( ! ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+	public function __construct(ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null) {
+		if (!(defined('WP_CLI') && WP_CLI)) {
 			/* translators: %s php class name */
-			throw new Exception( sprintf( __( 'The %s class can only be run within WP CLI.', 'action-scheduler' ), __CLASS__ ) );
+			throw new Exception(sprintf(__('The %s class can only be run within WP CLI.', 'action-scheduler'), __CLASS__));
 		}
 
-		parent::__construct( $store, $monitor, $cleaner );
+		parent::__construct($store, $monitor, $cleaner);
 	}
 
 	/**
@@ -49,25 +49,25 @@ 
 	 * @return int The number of actions that will be run.
 	 * @throws \WP_CLI\ExitException When there are too many concurrent batches.
 	 */
-	public function setup( $batch_size, $hooks = array(), $group = '', $force = false ) {
+	public function setup($batch_size, $hooks = array(), $group = '', $force = false) {
 		$this->run_cleanup();
 		$this->add_hooks();
 
 		// Check to make sure there aren't too many concurrent processes running.
-		if ( $this->has_maximum_concurrent_batches() ) {
-			if ( $force ) {
-				WP_CLI::warning( __( 'There are too many concurrent batches, but the run is forced to continue.', 'action-scheduler' ) );
+		if ($this->has_maximum_concurrent_batches()) {
+			if ($force) {
+				WP_CLI::warning(__('There are too many concurrent batches, but the run is forced to continue.', 'action-scheduler'));
 			} else {
-				WP_CLI::error( __( 'There are too many concurrent batches.', 'action-scheduler' ) );
+				WP_CLI::error(__('There are too many concurrent batches.', 'action-scheduler'));
 			}
 		}
 
 		// Stake a claim and store it.
-		$this->claim = $this->store->stake_claim( $batch_size, null, $hooks, $group );
-		$this->monitor->attach( $this->claim );
+		$this->claim = $this->store->stake_claim($batch_size, null, $hooks, $group);
+		$this->monitor->attach($this->claim);
 		$this->actions = $this->claim->get_actions();
 
-		return count( $this->actions );
+		return count($this->actions);
 	}
 
 	/**
@@ -76,9 +76,9 @@ 
 	 * @author Jeremy Pry
 	 */
 	protected function add_hooks() {
-		add_action( 'action_scheduler_before_execute', array( $this, 'before_execute' ) );
-		add_action( 'action_scheduler_after_execute', array( $this, 'after_execute' ), 10, 2 );
-		add_action( 'action_scheduler_failed_execution', array( $this, 'action_failed' ), 10, 2 );
+		add_action('action_scheduler_before_execute', array($this, 'before_execute'));
+		add_action('action_scheduler_after_execute', array($this, 'after_execute'), 10, 2);
+		add_action('action_scheduler_failed_execution', array($this, 'action_failed'), 10, 2);
 	}
 
 	/**
@@ -87,10 +87,10 @@ 
 	 * @author Jeremy Pry
 	 */
 	protected function setup_progress_bar() {
-		$count              = count( $this->actions );
+		$count              = count($this->actions);
 		$this->progress_bar = new ProgressBar(
 			/* translators: %d: amount of actions */
-			sprintf( _n( 'Running %d action', 'Running %d actions', $count, 'action-scheduler' ), number_format_i18n( $count ) ),
+			sprintf(_n('Running %d action', 'Running %d actions', $count, 'action-scheduler'), number_format_i18n($count)),
 			$count
 		);
 	}
@@ -104,24 +104,24 @@ 
 	 *
 	 * @return int The number of actions processed.
 	 */
-	public function run( $context = 'WP CLI' ) {
-		do_action( 'action_scheduler_before_process_queue' );
+	public function run($context = 'WP CLI') {
+		do_action('action_scheduler_before_process_queue');
 		$this->setup_progress_bar();
-		foreach ( $this->actions as $action_id ) {
+		foreach ($this->actions as $action_id) {
 			// Error if we lost the claim.
-			if ( ! in_array( $action_id, $this->store->find_actions_by_claim_id( $this->claim->get_id() ) ) ) {
-				WP_CLI::warning( __( 'The claim has been lost. Aborting current batch.', 'action-scheduler' ) );
+			if (!in_array($action_id, $this->store->find_actions_by_claim_id($this->claim->get_id()))) {
+				WP_CLI::warning(__('The claim has been lost. Aborting current batch.', 'action-scheduler'));
 				break;
 			}
 
-			$this->process_action( $action_id, $context );
+			$this->process_action($action_id, $context);
 			$this->progress_bar->tick();
 		}
 
 		$completed = $this->progress_bar->current();
 		$this->progress_bar->finish();
-		$this->store->release_claim( $this->claim );
-		do_action( 'action_scheduler_after_process_queue' );
+		$this->store->release_claim($this->claim);
+		do_action('action_scheduler_after_process_queue');
 
 		return $completed;
 	}
@@ -133,9 +133,9 @@ 
 	 *
 	 * @param $action_id
 	 */
-	public function before_execute( $action_id ) {
+	public function before_execute($action_id) {
 		/* translators: %s refers to the action ID */
-		WP_CLI::log( sprintf( __( 'Started processing action %s', 'action-scheduler' ), $action_id ) );
+		WP_CLI::log(sprintf(__('Started processing action %s', 'action-scheduler'), $action_id));
 	}
 
 	/**
@@ -146,13 +146,13 @@ 
 	 * @param int $action_id
 	 * @param null|ActionScheduler_Action $action The instance of the action. Default to null for backward compatibility.
 	 */
-	public function after_execute( $action_id, $action = null ) {
+	public function after_execute($action_id, $action = null) {
 		// backward compatibility
-		if ( null === $action ) {
-			$action = $this->store->fetch_action( $action_id );
+		if (null === $action) {
+			$action = $this->store->fetch_action($action_id);
 		}
 		/* translators: 1: action ID 2: hook name */
-		WP_CLI::log( sprintf( __( 'Completed processing action %1$s with hook: %2$s', 'action-scheduler' ), $action_id, $action->get_hook() ) );
+		WP_CLI::log(sprintf(__('Completed processing action %1$s with hook: %2$s', 'action-scheduler'), $action_id, $action->get_hook()));
 	}
 
 	/**
@@ -164,10 +164,10 @@ 
 	 * @param Exception $exception
 	 * @throws \WP_CLI\ExitException With failure message.
 	 */
-	public function action_failed( $action_id, $exception ) {
+	public function action_failed($action_id, $exception) {
 		WP_CLI::error(
 			/* translators: 1: action ID 2: exception message */
-			sprintf( __( 'Error processing action %1$s: %2$s', 'action-scheduler' ), $action_id, $exception->getMessage() ),
+			sprintf(__('Error processing action %1$s: %2$s', 'action-scheduler'), $action_id, $exception->getMessage()),
 			false
 		);
 	}
@@ -178,8 +178,8 @@ 
 	 * @param int $sleep_time Amount of seconds to sleep
 	 * @deprecated 3.0.0
 	 */
-	protected function stop_the_insanity( $sleep_time = 0 ) {
-		_deprecated_function( 'ActionScheduler_WPCLI_QueueRunner::stop_the_insanity', '3.0.0', 'ActionScheduler_DataController::free_memory' );
+	protected function stop_the_insanity($sleep_time = 0) {
+		_deprecated_function('ActionScheduler_WPCLI_QueueRunner::stop_the_insanity', '3.0.0', 'ActionScheduler_DataController::free_memory');
 
 		ActionScheduler_DataController::free_memory();
 	}
@@ -189,8 +189,8 @@ 
 	 */
 	protected function maybe_stop_the_insanity() {
 		// The value returned by progress_bar->current() might be padded. Remove padding, and convert to int.
-		$current_iteration = intval( trim( $this->progress_bar->current() ) );
-		if ( 0 === $current_iteration % 50 ) {
+		$current_iteration = intval(trim($this->progress_bar->current()));
+		if (0 === $current_iteration % 50) {
 			$this->stop_the_insanity();
 		}
 	}

includes/libraries/action-scheduler/classes/WP_CLI/Migration_Command.php

Indentation +124 added lines, -124 removed lines

@@ -21,128 +21,128 @@
  */
 class Migration_Command extends WP_CLI_Command {
 
-	/** @var int */
-	private $total_processed = 0;
-
-	/**
-	 * Register the command with WP-CLI
-	 */
-	public function register() {
-		if ( ! defined( 'WP_CLI' ) || ! WP_CLI ) {
-			return;
-		}
-
-		WP_CLI::add_command( 'action-scheduler migrate', [ $this, 'migrate' ], [
-			'shortdesc' => 'Migrates actions to the DB tables store',
-			'synopsis'  => [
-				[
-					'type'        => 'assoc',
-					'name'        => 'batch-size',
-					'optional'    => true,
-					'default'     => 100,
-					'description' => 'The number of actions to process in each batch',
-				],
-				[
-					'type'        => 'assoc',
-					'name'        => 'free-memory-on',
-					'optional'    => true,
-					'default'     => 50,
-					'description' => 'The number of actions to process between freeing memory. 0 disables freeing memory',
-				],
-				[
-					'type'        => 'assoc',
-					'name'        => 'pause',
-					'optional'    => true,
-					'default'     => 0,
-					'description' => 'The number of seconds to pause when freeing memory',
-				],
-				[
-					'type'        => 'flag',
-					'name'        => 'dry-run',
-					'optional'    => true,
-					'description' => 'Reports on the actions that would have been migrated, but does not change any data',
-				],
-			],
-		] );
-	}
-
-	/**
-	 * Process the data migration.
-	 *
-	 * @param array $positional_args Required for WP CLI. Not used in migration.
-	 * @param array $assoc_args Optional arguments.
-	 *
-	 * @return void
-	 */
-	public function migrate( $positional_args, $assoc_args ) {
-		$this->init_logging();
-
-		$config = $this->get_migration_config( $assoc_args );
-		$runner = new Runner( $config );
-		$runner->init_destination();
-
-		$batch_size = isset( $assoc_args[ 'batch-size' ] ) ? (int) $assoc_args[ 'batch-size' ] : 100;
-		$free_on    = isset( $assoc_args[ 'free-memory-on' ] ) ? (int) $assoc_args[ 'free-memory-on' ] : 50;
-		$sleep      = isset( $assoc_args[ 'pause' ] ) ? (int) $assoc_args[ 'pause' ] : 0;
-		\ActionScheduler_DataController::set_free_ticks( $free_on );
-		\ActionScheduler_DataController::set_sleep_time( $sleep );
-
-		do {
-			$actions_processed     = $runner->run( $batch_size );
-			$this->total_processed += $actions_processed;
-		} while ( $actions_processed > 0 );
-
-		if ( ! $config->get_dry_run() ) {
-			// let the scheduler know that there's nothing left to do
-			$scheduler = new Scheduler();
-			$scheduler->mark_complete();
-		}
-
-		WP_CLI::success( sprintf( '%s complete. %d actions processed.', $config->get_dry_run() ? 'Dry run' : 'Migration', $this->total_processed ) );
-	}
-
-	/**
-	 * Build the config object used to create the Runner
-	 *
-	 * @param array $args Optional arguments.
-	 *
-	 * @return ActionScheduler\Migration\Config
-	 */
-	private function get_migration_config( $args ) {
-		$args = wp_parse_args( $args, [
-			'dry-run' => false,
-		] );
-
-		$config = Controller::instance()->get_migration_config_object();
-		$config->set_dry_run( ! empty( $args[ 'dry-run' ] ) );
-
-		return $config;
-	}
-
-	/**
-	 * Hook command line logging into migration actions.
-	 */
-	private function init_logging() {
-		add_action( 'action_scheduler/migrate_action_dry_run', function ( $action_id ) {
-			WP_CLI::debug( sprintf( 'Dry-run: migrated action %d', $action_id ) );
-		}, 10, 1 );
-		add_action( 'action_scheduler/no_action_to_migrate', function ( $action_id ) {
-			WP_CLI::debug( sprintf( 'No action found to migrate for ID %d', $action_id ) );
-		}, 10, 1 );
-		add_action( 'action_scheduler/migrate_action_failed', function ( $action_id ) {
-			WP_CLI::warning( sprintf( 'Failed migrating action with ID %d', $action_id ) );
-		}, 10, 1 );
-		add_action( 'action_scheduler/migrate_action_incomplete', function ( $source_id, $destination_id ) {
-			WP_CLI::warning( sprintf( 'Unable to remove source action with ID %d after migrating to new ID %d', $source_id, $destination_id ) );
-		}, 10, 2 );
-		add_action( 'action_scheduler/migrated_action', function ( $source_id, $destination_id ) {
-			WP_CLI::debug( sprintf( 'Migrated source action with ID %d to new store with ID %d', $source_id, $destination_id ) );
-		}, 10, 2 );
-		add_action( 'action_scheduler/migration_batch_starting', function ( $batch ) {
-			WP_CLI::debug( 'Beginning migration of batch: ' . print_r( $batch, true ) );
-		}, 10, 1 );
-		add_action( 'action_scheduler/migration_batch_complete', function ( $batch ) {
-			WP_CLI::log( sprintf( 'Completed migration of %d actions', count( $batch ) ) );
-		}, 10, 1 );
-	}
+    /** @var int */
+    private $total_processed = 0;
+
+    /**
+     * Register the command with WP-CLI
+     */
+    public function register() {
+        if ( ! defined( 'WP_CLI' ) || ! WP_CLI ) {
+            return;
+        }
+
+        WP_CLI::add_command( 'action-scheduler migrate', [ $this, 'migrate' ], [
+            'shortdesc' => 'Migrates actions to the DB tables store',
+            'synopsis'  => [
+                [
+                    'type'        => 'assoc',
+                    'name'        => 'batch-size',
+                    'optional'    => true,
+                    'default'     => 100,
+                    'description' => 'The number of actions to process in each batch',
+                ],
+                [
+                    'type'        => 'assoc',
+                    'name'        => 'free-memory-on',
+                    'optional'    => true,
+                    'default'     => 50,
+                    'description' => 'The number of actions to process between freeing memory. 0 disables freeing memory',
+                ],
+                [
+                    'type'        => 'assoc',
+                    'name'        => 'pause',
+                    'optional'    => true,
+                    'default'     => 0,
+                    'description' => 'The number of seconds to pause when freeing memory',
+                ],
+                [
+                    'type'        => 'flag',
+                    'name'        => 'dry-run',
+                    'optional'    => true,
+                    'description' => 'Reports on the actions that would have been migrated, but does not change any data',
+                ],
+            ],
+        ] );
+    }
+
+    /**
+     * Process the data migration.
+     *
+     * @param array $positional_args Required for WP CLI. Not used in migration.
+     * @param array $assoc_args Optional arguments.
+     *
+     * @return void
+     */
+    public function migrate( $positional_args, $assoc_args ) {
+        $this->init_logging();
+
+        $config = $this->get_migration_config( $assoc_args );
+        $runner = new Runner( $config );
+        $runner->init_destination();
+
+        $batch_size = isset( $assoc_args[ 'batch-size' ] ) ? (int) $assoc_args[ 'batch-size' ] : 100;
+        $free_on    = isset( $assoc_args[ 'free-memory-on' ] ) ? (int) $assoc_args[ 'free-memory-on' ] : 50;
+        $sleep      = isset( $assoc_args[ 'pause' ] ) ? (int) $assoc_args[ 'pause' ] : 0;
+        \ActionScheduler_DataController::set_free_ticks( $free_on );
+        \ActionScheduler_DataController::set_sleep_time( $sleep );
+
+        do {
+            $actions_processed     = $runner->run( $batch_size );
+            $this->total_processed += $actions_processed;
+        } while ( $actions_processed > 0 );
+
+        if ( ! $config->get_dry_run() ) {
+            // let the scheduler know that there's nothing left to do
+            $scheduler = new Scheduler();
+            $scheduler->mark_complete();
+        }
+
+        WP_CLI::success( sprintf( '%s complete. %d actions processed.', $config->get_dry_run() ? 'Dry run' : 'Migration', $this->total_processed ) );
+    }
+
+    /**
+     * Build the config object used to create the Runner
+     *
+     * @param array $args Optional arguments.
+     *
+     * @return ActionScheduler\Migration\Config
+     */
+    private function get_migration_config( $args ) {
+        $args = wp_parse_args( $args, [
+            'dry-run' => false,
+        ] );
+
+        $config = Controller::instance()->get_migration_config_object();
+        $config->set_dry_run( ! empty( $args[ 'dry-run' ] ) );
+
+        return $config;
+    }
+
+    /**
+     * Hook command line logging into migration actions.
+     */
+    private function init_logging() {
+        add_action( 'action_scheduler/migrate_action_dry_run', function ( $action_id ) {
+            WP_CLI::debug( sprintf( 'Dry-run: migrated action %d', $action_id ) );
+        }, 10, 1 );
+        add_action( 'action_scheduler/no_action_to_migrate', function ( $action_id ) {
+            WP_CLI::debug( sprintf( 'No action found to migrate for ID %d', $action_id ) );
+        }, 10, 1 );
+        add_action( 'action_scheduler/migrate_action_failed', function ( $action_id ) {
+            WP_CLI::warning( sprintf( 'Failed migrating action with ID %d', $action_id ) );
+        }, 10, 1 );
+        add_action( 'action_scheduler/migrate_action_incomplete', function ( $source_id, $destination_id ) {
+            WP_CLI::warning( sprintf( 'Unable to remove source action with ID %d after migrating to new ID %d', $source_id, $destination_id ) );
+        }, 10, 2 );
+        add_action( 'action_scheduler/migrated_action', function ( $source_id, $destination_id ) {
+            WP_CLI::debug( sprintf( 'Migrated source action with ID %d to new store with ID %d', $source_id, $destination_id ) );
+        }, 10, 2 );
+        add_action( 'action_scheduler/migration_batch_starting', function ( $batch ) {
+            WP_CLI::debug( 'Beginning migration of batch: ' . print_r( $batch, true ) );
+        }, 10, 1 );
+        add_action( 'action_scheduler/migration_batch_complete', function ( $batch ) {
+            WP_CLI::log( sprintf( 'Completed migration of %d actions', count( $batch ) ) );
+        }, 10, 1 );
+    }
 }

Spacing +40 added lines, -40 removed lines

@@ -28,11 +28,11 @@ 
 	 * Register the command with WP-CLI
 	 */
 	public function register() {
-		if ( ! defined( 'WP_CLI' ) || ! WP_CLI ) {
+		if (!defined('WP_CLI') || !WP_CLI) {
 			return;
 		}
 
-		WP_CLI::add_command( 'action-scheduler migrate', [ $this, 'migrate' ], [
+		WP_CLI::add_command('action-scheduler migrate', [$this, 'migrate'], [
 			'shortdesc' => 'Migrates actions to the DB tables store',
 			'synopsis'  => [
 				[
@@ -63,7 +63,7 @@ 
 					'description' => 'Reports on the actions that would have been migrated, but does not change any data',
 				],
 			],
-		] );
+		]);
 	}
 
 	/**
@@ -74,31 +74,31 @@ 
 	 *
 	 * @return void
 	 */
-	public function migrate( $positional_args, $assoc_args ) {
+	public function migrate($positional_args, $assoc_args) {
 		$this->init_logging();
 
-		$config = $this->get_migration_config( $assoc_args );
-		$runner = new Runner( $config );
+		$config = $this->get_migration_config($assoc_args);
+		$runner = new Runner($config);
 		$runner->init_destination();
 
-		$batch_size = isset( $assoc_args[ 'batch-size' ] ) ? (int) $assoc_args[ 'batch-size' ] : 100;
-		$free_on    = isset( $assoc_args[ 'free-memory-on' ] ) ? (int) $assoc_args[ 'free-memory-on' ] : 50;
-		$sleep      = isset( $assoc_args[ 'pause' ] ) ? (int) $assoc_args[ 'pause' ] : 0;
-		\ActionScheduler_DataController::set_free_ticks( $free_on );
-		\ActionScheduler_DataController::set_sleep_time( $sleep );
+		$batch_size = isset($assoc_args['batch-size']) ? (int) $assoc_args['batch-size'] : 100;
+		$free_on    = isset($assoc_args['free-memory-on']) ? (int) $assoc_args['free-memory-on'] : 50;
+		$sleep      = isset($assoc_args['pause']) ? (int) $assoc_args['pause'] : 0;
+		\ActionScheduler_DataController::set_free_ticks($free_on);
+		\ActionScheduler_DataController::set_sleep_time($sleep);
 
 		do {
-			$actions_processed     = $runner->run( $batch_size );
+			$actions_processed = $runner->run($batch_size);
 			$this->total_processed += $actions_processed;
-		} while ( $actions_processed > 0 );
+		} while ($actions_processed > 0);
 
-		if ( ! $config->get_dry_run() ) {
+		if (!$config->get_dry_run()) {
 			// let the scheduler know that there's nothing left to do
 			$scheduler = new Scheduler();
 			$scheduler->mark_complete();
 		}
 
-		WP_CLI::success( sprintf( '%s complete. %d actions processed.', $config->get_dry_run() ? 'Dry run' : 'Migration', $this->total_processed ) );
+		WP_CLI::success(sprintf('%s complete. %d actions processed.', $config->get_dry_run() ? 'Dry run' : 'Migration', $this->total_processed));
 	}
 
 	/**
@@ -108,13 +108,13 @@ 
 	 *
 	 * @return ActionScheduler\Migration\Config
 	 */
-	private function get_migration_config( $args ) {
-		$args = wp_parse_args( $args, [
+	private function get_migration_config($args) {
+		$args = wp_parse_args($args, [
 			'dry-run' => false,
-		] );
+		]);
 
 		$config = Controller::instance()->get_migration_config_object();
-		$config->set_dry_run( ! empty( $args[ 'dry-run' ] ) );
+		$config->set_dry_run(!empty($args['dry-run']));
 
 		return $config;
 	}
@@ -123,26 +123,26 @@ 
 	 * Hook command line logging into migration actions.
 	 */
 	private function init_logging() {
-		add_action( 'action_scheduler/migrate_action_dry_run', function ( $action_id ) {
-			WP_CLI::debug( sprintf( 'Dry-run: migrated action %d', $action_id ) );
-		}, 10, 1 );
-		add_action( 'action_scheduler/no_action_to_migrate', function ( $action_id ) {
-			WP_CLI::debug( sprintf( 'No action found to migrate for ID %d', $action_id ) );
-		}, 10, 1 );
-		add_action( 'action_scheduler/migrate_action_failed', function ( $action_id ) {
-			WP_CLI::warning( sprintf( 'Failed migrating action with ID %d', $action_id ) );
-		}, 10, 1 );
-		add_action( 'action_scheduler/migrate_action_incomplete', function ( $source_id, $destination_id ) {
-			WP_CLI::warning( sprintf( 'Unable to remove source action with ID %d after migrating to new ID %d', $source_id, $destination_id ) );
-		}, 10, 2 );
-		add_action( 'action_scheduler/migrated_action', function ( $source_id, $destination_id ) {
-			WP_CLI::debug( sprintf( 'Migrated source action with ID %d to new store with ID %d', $source_id, $destination_id ) );
-		}, 10, 2 );
-		add_action( 'action_scheduler/migration_batch_starting', function ( $batch ) {
-			WP_CLI::debug( 'Beginning migration of batch: ' . print_r( $batch, true ) );
-		}, 10, 1 );
-		add_action( 'action_scheduler/migration_batch_complete', function ( $batch ) {
-			WP_CLI::log( sprintf( 'Completed migration of %d actions', count( $batch ) ) );
-		}, 10, 1 );
+		add_action('action_scheduler/migrate_action_dry_run', function($action_id) {
+			WP_CLI::debug(sprintf('Dry-run: migrated action %d', $action_id));
+		}, 10, 1);
+		add_action('action_scheduler/no_action_to_migrate', function($action_id) {
+			WP_CLI::debug(sprintf('No action found to migrate for ID %d', $action_id));
+		}, 10, 1);
+		add_action('action_scheduler/migrate_action_failed', function($action_id) {
+			WP_CLI::warning(sprintf('Failed migrating action with ID %d', $action_id));
+		}, 10, 1);
+		add_action('action_scheduler/migrate_action_incomplete', function($source_id, $destination_id) {
+			WP_CLI::warning(sprintf('Unable to remove source action with ID %d after migrating to new ID %d', $source_id, $destination_id));
+		}, 10, 2);
+		add_action('action_scheduler/migrated_action', function($source_id, $destination_id) {
+			WP_CLI::debug(sprintf('Migrated source action with ID %d to new store with ID %d', $source_id, $destination_id));
+		}, 10, 2);
+		add_action('action_scheduler/migration_batch_starting', function($batch) {
+			WP_CLI::debug('Beginning migration of batch: ' . print_r($batch, true));
+		}, 10, 1);
+		add_action('action_scheduler/migration_batch_complete', function($batch) {
+			WP_CLI::log(sprintf('Completed migration of %d actions', count($batch)));
+		}, 10, 1);
 	}
 }

includes/libraries/action-scheduler/classes/WP_CLI/ActionScheduler_WPCLI_Scheduler_command.php

Indentation +138 added lines, -138 removed lines

@@ -5,154 +5,154 @@
  */
 class ActionScheduler_WPCLI_Scheduler_command extends WP_CLI_Command {
 
-	/**
-	 * Run the Action Scheduler
-	 *
-	 * ## OPTIONS
-	 *
-	 * [--batch-size=<size>]
-	 * : The maximum number of actions to run. Defaults to 100.
-	 *
-	 * [--batches=<size>]
-	 * : Limit execution to a number of batches. Defaults to 0, meaning batches will continue being executed until all actions are complete.
-	 *
-	 * [--cleanup-batch-size=<size>]
-	 * : The maximum number of actions to clean up. Defaults to the value of --batch-size.
-	 *
-	 * [--hooks=<hooks>]
-	 * : Only run actions with the specified hook. Omitting this option runs actions with any hook. Define multiple hooks as a comma separated string (without spaces), e.g. `--hooks=hook_one,hook_two,hook_three`
-	 *
-	 * [--group=<group>]
-	 * : Only run actions from the specified group. Omitting this option runs actions from all groups.
-	 *
-	 * [--free-memory-on=<count>]
-	 * : The number of actions to process between freeing memory. 0 disables freeing memory. Default 50.
-	 *
-	 * [--pause=<seconds>]
-	 * : The number of seconds to pause when freeing memory. Default no pause.
-	 *
-	 * [--force]
-	 * : Whether to force execution despite the maximum number of concurrent processes being exceeded.
-	 *
-	 * @param array $args Positional arguments.
-	 * @param array $assoc_args Keyed arguments.
-	 * @throws \WP_CLI\ExitException When an error occurs.
-	 *
-	 * @subcommand run
-	 */
-	public function run( $args, $assoc_args ) {
-		// Handle passed arguments.
-		$batch   = absint( \WP_CLI\Utils\get_flag_value( $assoc_args, 'batch-size', 100 ) );
-		$batches = absint( \WP_CLI\Utils\get_flag_value( $assoc_args, 'batches', 0 ) );
-		$clean   = absint( \WP_CLI\Utils\get_flag_value( $assoc_args, 'cleanup-batch-size', $batch ) );
-		$hooks   = explode( ',', WP_CLI\Utils\get_flag_value( $assoc_args, 'hooks', '' ) );
-		$hooks   = array_filter( array_map( 'trim', $hooks ) );
-		$group   = \WP_CLI\Utils\get_flag_value( $assoc_args, 'group', '' );
-		$free_on = \WP_CLI\Utils\get_flag_value( $assoc_args, 'free-memory-on', '' );
-		$sleep   = \WP_CLI\Utils\get_flag_value( $assoc_args, 'pause', '' );
-		$force   = \WP_CLI\Utils\get_flag_value( $assoc_args, 'force', false );
+    /**
+     * Run the Action Scheduler
+     *
+     * ## OPTIONS
+     *
+     * [--batch-size=<size>]
+     * : The maximum number of actions to run. Defaults to 100.
+     *
+     * [--batches=<size>]
+     * : Limit execution to a number of batches. Defaults to 0, meaning batches will continue being executed until all actions are complete.
+     *
+     * [--cleanup-batch-size=<size>]
+     * : The maximum number of actions to clean up. Defaults to the value of --batch-size.
+     *
+     * [--hooks=<hooks>]
+     * : Only run actions with the specified hook. Omitting this option runs actions with any hook. Define multiple hooks as a comma separated string (without spaces), e.g. `--hooks=hook_one,hook_two,hook_three`
+     *
+     * [--group=<group>]
+     * : Only run actions from the specified group. Omitting this option runs actions from all groups.
+     *
+     * [--free-memory-on=<count>]
+     * : The number of actions to process between freeing memory. 0 disables freeing memory. Default 50.
+     *
+     * [--pause=<seconds>]
+     * : The number of seconds to pause when freeing memory. Default no pause.
+     *
+     * [--force]
+     * : Whether to force execution despite the maximum number of concurrent processes being exceeded.
+     *
+     * @param array $args Positional arguments.
+     * @param array $assoc_args Keyed arguments.
+     * @throws \WP_CLI\ExitException When an error occurs.
+     *
+     * @subcommand run
+     */
+    public function run( $args, $assoc_args ) {
+        // Handle passed arguments.
+        $batch   = absint( \WP_CLI\Utils\get_flag_value( $assoc_args, 'batch-size', 100 ) );
+        $batches = absint( \WP_CLI\Utils\get_flag_value( $assoc_args, 'batches', 0 ) );
+        $clean   = absint( \WP_CLI\Utils\get_flag_value( $assoc_args, 'cleanup-batch-size', $batch ) );
+        $hooks   = explode( ',', WP_CLI\Utils\get_flag_value( $assoc_args, 'hooks', '' ) );
+        $hooks   = array_filter( array_map( 'trim', $hooks ) );
+        $group   = \WP_CLI\Utils\get_flag_value( $assoc_args, 'group', '' );
+        $free_on = \WP_CLI\Utils\get_flag_value( $assoc_args, 'free-memory-on', '' );
+        $sleep   = \WP_CLI\Utils\get_flag_value( $assoc_args, 'pause', '' );
+        $force   = \WP_CLI\Utils\get_flag_value( $assoc_args, 'force', false );
 
-		ActionScheduler_DataController::set_free_ticks( $free_on );
-		ActionScheduler_DataController::set_sleep_time( $sleep );
+        ActionScheduler_DataController::set_free_ticks( $free_on );
+        ActionScheduler_DataController::set_sleep_time( $sleep );
 
-		$batches_completed = 0;
-		$actions_completed = 0;
-		$unlimited         = $batches === 0;
+        $batches_completed = 0;
+        $actions_completed = 0;
+        $unlimited         = $batches === 0;
 
-		try {
-			// Custom queue cleaner instance.
-			$cleaner = new ActionScheduler_QueueCleaner( null, $clean );
+        try {
+            // Custom queue cleaner instance.
+            $cleaner = new ActionScheduler_QueueCleaner( null, $clean );
 
-			// Get the queue runner instance
-			$runner = new ActionScheduler_WPCLI_QueueRunner( null, null, $cleaner );
+            // Get the queue runner instance
+            $runner = new ActionScheduler_WPCLI_QueueRunner( null, null, $cleaner );
 
-			// Determine how many tasks will be run in the first batch.
-			$total = $runner->setup( $batch, $hooks, $group, $force );
+            // Determine how many tasks will be run in the first batch.
+            $total = $runner->setup( $batch, $hooks, $group, $force );
 
-			// Run actions for as long as possible.
-			while ( $total > 0 ) {
-				$this->print_total_actions( $total );
-				$actions_completed += $runner->run();
-				$batches_completed++;
+            // Run actions for as long as possible.
+            while ( $total > 0 ) {
+                $this->print_total_actions( $total );
+                $actions_completed += $runner->run();
+                $batches_completed++;
 
-				// Maybe set up tasks for the next batch.
-				$total = ( $unlimited || $batches_completed < $batches ) ? $runner->setup( $batch, $hooks, $group, $force ) : 0;
-			}
-		} catch ( Exception $e ) {
-			$this->print_error( $e );
-		}
+                // Maybe set up tasks for the next batch.
+                $total = ( $unlimited || $batches_completed < $batches ) ? $runner->setup( $batch, $hooks, $group, $force ) : 0;
+            }
+        } catch ( Exception $e ) {
+            $this->print_error( $e );
+        }
 
-		$this->print_total_batches( $batches_completed );
-		$this->print_success( $actions_completed );
-	}
+        $this->print_total_batches( $batches_completed );
+        $this->print_success( $actions_completed );
+    }
 
-	/**
-	 * Print WP CLI message about how many actions are about to be processed.
-	 *
-	 * @author Jeremy Pry
-	 *
-	 * @param int $total
-	 */
-	protected function print_total_actions( $total ) {
-		WP_CLI::log(
-			sprintf(
-				/* translators: %d refers to how many scheduled taks were found to run */
-				_n( 'Found %d scheduled task', 'Found %d scheduled tasks', $total, 'action-scheduler' ),
-				number_format_i18n( $total )
-			)
-		);
-	}
+    /**
+     * Print WP CLI message about how many actions are about to be processed.
+     *
+     * @author Jeremy Pry
+     *
+     * @param int $total
+     */
+    protected function print_total_actions( $total ) {
+        WP_CLI::log(
+            sprintf(
+                /* translators: %d refers to how many scheduled taks were found to run */
+                _n( 'Found %d scheduled task', 'Found %d scheduled tasks', $total, 'action-scheduler' ),
+                number_format_i18n( $total )
+            )
+        );
+    }
 
-	/**
-	 * Print WP CLI message about how many batches of actions were processed.
-	 *
-	 * @author Jeremy Pry
-	 *
-	 * @param int $batches_completed
-	 */
-	protected function print_total_batches( $batches_completed ) {
-		WP_CLI::log(
-			sprintf(
-				/* translators: %d refers to the total number of batches executed */
-				_n( '%d batch executed.', '%d batches executed.', $batches_completed, 'action-scheduler' ),
-				number_format_i18n( $batches_completed )
-			)
-		);
-	}
+    /**
+     * Print WP CLI message about how many batches of actions were processed.
+     *
+     * @author Jeremy Pry
+     *
+     * @param int $batches_completed
+     */
+    protected function print_total_batches( $batches_completed ) {
+        WP_CLI::log(
+            sprintf(
+                /* translators: %d refers to the total number of batches executed */
+                _n( '%d batch executed.', '%d batches executed.', $batches_completed, 'action-scheduler' ),
+                number_format_i18n( $batches_completed )
+            )
+        );
+    }
 
-	/**
-	 * Convert an exception into a WP CLI error.
-	 *
-	 * @author Jeremy Pry
-	 *
-	 * @param Exception $e The error object.
-	 *
-	 * @throws \WP_CLI\ExitException
-	 */
-	protected function print_error( Exception $e ) {
-		WP_CLI::error(
-			sprintf(
-				/* translators: %s refers to the exception error message */
-				__( 'There was an error running the action scheduler: %s', 'action-scheduler' ),
-				$e->getMessage()
-			)
-		);
-	}
+    /**
+     * Convert an exception into a WP CLI error.
+     *
+     * @author Jeremy Pry
+     *
+     * @param Exception $e The error object.
+     *
+     * @throws \WP_CLI\ExitException
+     */
+    protected function print_error( Exception $e ) {
+        WP_CLI::error(
+            sprintf(
+                /* translators: %s refers to the exception error message */
+                __( 'There was an error running the action scheduler: %s', 'action-scheduler' ),
+                $e->getMessage()
+            )
+        );
+    }
 
-	/**
-	 * Print a success message with the number of completed actions.
-	 *
-	 * @author Jeremy Pry
-	 *
-	 * @param int $actions_completed
-	 */
-	protected function print_success( $actions_completed ) {
-		WP_CLI::success(
-			sprintf(
-				/* translators: %d refers to the total number of taskes completed */
-				_n( '%d scheduled task completed.', '%d scheduled tasks completed.', $actions_completed, 'action-scheduler' ),
-				number_format_i18n( $actions_completed )
-			)
-		);
-	}
+    /**
+     * Print a success message with the number of completed actions.
+     *
+     * @author Jeremy Pry
+     *
+     * @param int $actions_completed
+     */
+    protected function print_success( $actions_completed ) {
+        WP_CLI::success(
+            sprintf(
+                /* translators: %d refers to the total number of taskes completed */
+                _n( '%d scheduled task completed.', '%d scheduled tasks completed.', $actions_completed, 'action-scheduler' ),
+                number_format_i18n( $actions_completed )
+            )
+        );
+    }
 }

Spacing +33 added lines, -33 removed lines

@@ -40,20 +40,20 @@ 
 	 *
 	 * @subcommand run
 	 */
-	public function run( $args, $assoc_args ) {
+	public function run($args, $assoc_args) {
 		// Handle passed arguments.
-		$batch   = absint( \WP_CLI\Utils\get_flag_value( $assoc_args, 'batch-size', 100 ) );
-		$batches = absint( \WP_CLI\Utils\get_flag_value( $assoc_args, 'batches', 0 ) );
-		$clean   = absint( \WP_CLI\Utils\get_flag_value( $assoc_args, 'cleanup-batch-size', $batch ) );
-		$hooks   = explode( ',', WP_CLI\Utils\get_flag_value( $assoc_args, 'hooks', '' ) );
-		$hooks   = array_filter( array_map( 'trim', $hooks ) );
-		$group   = \WP_CLI\Utils\get_flag_value( $assoc_args, 'group', '' );
-		$free_on = \WP_CLI\Utils\get_flag_value( $assoc_args, 'free-memory-on', '' );
-		$sleep   = \WP_CLI\Utils\get_flag_value( $assoc_args, 'pause', '' );
-		$force   = \WP_CLI\Utils\get_flag_value( $assoc_args, 'force', false );
+		$batch   = absint(\WP_CLI\Utils\get_flag_value($assoc_args, 'batch-size', 100));
+		$batches = absint(\WP_CLI\Utils\get_flag_value($assoc_args, 'batches', 0));
+		$clean   = absint(\WP_CLI\Utils\get_flag_value($assoc_args, 'cleanup-batch-size', $batch));
+		$hooks   = explode(',', WP_CLI\Utils\get_flag_value($assoc_args, 'hooks', ''));
+		$hooks   = array_filter(array_map('trim', $hooks));
+		$group   = \WP_CLI\Utils\get_flag_value($assoc_args, 'group', '');
+		$free_on = \WP_CLI\Utils\get_flag_value($assoc_args, 'free-memory-on', '');
+		$sleep   = \WP_CLI\Utils\get_flag_value($assoc_args, 'pause', '');
+		$force   = \WP_CLI\Utils\get_flag_value($assoc_args, 'force', false);
 
-		ActionScheduler_DataController::set_free_ticks( $free_on );
-		ActionScheduler_DataController::set_sleep_time( $sleep );
+		ActionScheduler_DataController::set_free_ticks($free_on);
+		ActionScheduler_DataController::set_sleep_time($sleep);
 
 		$batches_completed = 0;
 		$actions_completed = 0;
@@ -61,29 +61,29 @@ 
 
 		try {
 			// Custom queue cleaner instance.
-			$cleaner = new ActionScheduler_QueueCleaner( null, $clean );
+			$cleaner = new ActionScheduler_QueueCleaner(null, $clean);
 
 			// Get the queue runner instance
-			$runner = new ActionScheduler_WPCLI_QueueRunner( null, null, $cleaner );
+			$runner = new ActionScheduler_WPCLI_QueueRunner(null, null, $cleaner);
 
 			// Determine how many tasks will be run in the first batch.
-			$total = $runner->setup( $batch, $hooks, $group, $force );
+			$total = $runner->setup($batch, $hooks, $group, $force);
 
 			// Run actions for as long as possible.
-			while ( $total > 0 ) {
-				$this->print_total_actions( $total );
+			while ($total > 0) {
+				$this->print_total_actions($total);
 				$actions_completed += $runner->run();
 				$batches_completed++;
 
 				// Maybe set up tasks for the next batch.
-				$total = ( $unlimited || $batches_completed < $batches ) ? $runner->setup( $batch, $hooks, $group, $force ) : 0;
+				$total = ($unlimited || $batches_completed < $batches) ? $runner->setup($batch, $hooks, $group, $force) : 0;
 			}
-		} catch ( Exception $e ) {
-			$this->print_error( $e );
+		} catch (Exception $e) {
+			$this->print_error($e);
 		}
 
-		$this->print_total_batches( $batches_completed );
-		$this->print_success( $actions_completed );
+		$this->print_total_batches($batches_completed);
+		$this->print_success($actions_completed);
 	}
 
 	/**
@@ -93,12 +93,12 @@ 
 	 *
 	 * @param int $total
 	 */
-	protected function print_total_actions( $total ) {
+	protected function print_total_actions($total) {
 		WP_CLI::log(
 			sprintf(
 				/* translators: %d refers to how many scheduled taks were found to run */
-				_n( 'Found %d scheduled task', 'Found %d scheduled tasks', $total, 'action-scheduler' ),
-				number_format_i18n( $total )
+				_n('Found %d scheduled task', 'Found %d scheduled tasks', $total, 'action-scheduler'),
+				number_format_i18n($total)
 			)
 		);
 	}
@@ -110,12 +110,12 @@ 
 	 *
 	 * @param int $batches_completed
 	 */
-	protected function print_total_batches( $batches_completed ) {
+	protected function print_total_batches($batches_completed) {
 		WP_CLI::log(
 			sprintf(
 				/* translators: %d refers to the total number of batches executed */
-				_n( '%d batch executed.', '%d batches executed.', $batches_completed, 'action-scheduler' ),
-				number_format_i18n( $batches_completed )
+				_n('%d batch executed.', '%d batches executed.', $batches_completed, 'action-scheduler'),
+				number_format_i18n($batches_completed)
 			)
 		);
 	}
@@ -129,11 +129,11 @@ 
 	 *
 	 * @throws \WP_CLI\ExitException
 	 */
-	protected function print_error( Exception $e ) {
+	protected function print_error(Exception $e) {
 		WP_CLI::error(
 			sprintf(
 				/* translators: %s refers to the exception error message */
-				__( 'There was an error running the action scheduler: %s', 'action-scheduler' ),
+				__('There was an error running the action scheduler: %s', 'action-scheduler'),
 				$e->getMessage()
 			)
 		);
@@ -146,12 +146,12 @@ 
 	 *
 	 * @param int $actions_completed
 	 */
-	protected function print_success( $actions_completed ) {
+	protected function print_success($actions_completed) {
 		WP_CLI::success(
 			sprintf(
 				/* translators: %d refers to the total number of taskes completed */
-				_n( '%d scheduled task completed.', '%d scheduled tasks completed.', $actions_completed, 'action-scheduler' ),
-				number_format_i18n( $actions_completed )
+				_n('%d scheduled task completed.', '%d scheduled tasks completed.', $actions_completed, 'action-scheduler'),
+				number_format_i18n($actions_completed)
 			)
 		);
 	}

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

Indentation +60 added lines, -60 removed lines

@@ -7,70 +7,70 @@
  */
 class ActionScheduler_DateTime extends DateTime {
 
-	/**
-	 * UTC offset.
-	 *
-	 * Only used when a timezone is not set. When a timezone string is
-	 * used, this will be set to 0.
-	 *
-	 * @var int
-	 */
-	protected $utcOffset = 0;
+    /**
+     * UTC offset.
+     *
+     * Only used when a timezone is not set. When a timezone string is
+     * used, this will be set to 0.
+     *
+     * @var int
+     */
+    protected $utcOffset = 0;
 
-	/**
-	 * Get the unix timestamp of the current object.
-	 *
-	 * Missing in PHP 5.2 so just here so it can be supported consistently.
-	 *
-	 * @return int
-	 */
-	public function getTimestamp() {
-		return method_exists( 'DateTime', 'getTimestamp' ) ? parent::getTimestamp() : $this->format( 'U' );
-	}
+    /**
+     * Get the unix timestamp of the current object.
+     *
+     * Missing in PHP 5.2 so just here so it can be supported consistently.
+     *
+     * @return int
+     */
+    public function getTimestamp() {
+        return method_exists( 'DateTime', 'getTimestamp' ) ? parent::getTimestamp() : $this->format( 'U' );
+    }
 
-	/**
-	 * Set the UTC offset.
-	 *
-	 * This represents a fixed offset instead of a timezone setting.
-	 *
-	 * @param $offset
-	 */
-	public function setUtcOffset( $offset ) {
-		$this->utcOffset = intval( $offset );
-	}
+    /**
+     * Set the UTC offset.
+     *
+     * This represents a fixed offset instead of a timezone setting.
+     *
+     * @param $offset
+     */
+    public function setUtcOffset( $offset ) {
+        $this->utcOffset = intval( $offset );
+    }
 
-	/**
-	 * Returns the timezone offset.
-	 *
-	 * @return int
-	 * @link http://php.net/manual/en/datetime.getoffset.php
-	 */
-	public function getOffset() {
-		return $this->utcOffset ? $this->utcOffset : parent::getOffset();
-	}
+    /**
+     * Returns the timezone offset.
+     *
+     * @return int
+     * @link http://php.net/manual/en/datetime.getoffset.php
+     */
+    public function getOffset() {
+        return $this->utcOffset ? $this->utcOffset : parent::getOffset();
+    }
 
-	/**
-	 * Set the TimeZone associated with the DateTime
-	 *
-	 * @param DateTimeZone $timezone
-	 *
-	 * @return static
-	 * @link http://php.net/manual/en/datetime.settimezone.php
-	 */
-	public function setTimezone( $timezone ) {
-		$this->utcOffset = 0;
-		parent::setTimezone( $timezone );
+    /**
+     * Set the TimeZone associated with the DateTime
+     *
+     * @param DateTimeZone $timezone
+     *
+     * @return static
+     * @link http://php.net/manual/en/datetime.settimezone.php
+     */
+    public function setTimezone( $timezone ) {
+        $this->utcOffset = 0;
+        parent::setTimezone( $timezone );
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Get the timestamp with the WordPress timezone offset added or subtracted.
-	 *
-	 * @since  3.0.0
-	 * @return int
-	 */
-	public function getOffsetTimestamp() {
-		return $this->getTimestamp() + $this->getOffset();
-	}
+    /**
+     * Get the timestamp with the WordPress timezone offset added or subtracted.
+     *
+     * @since  3.0.0
+     * @return int
+     */
+    public function getOffsetTimestamp() {
+        return $this->getTimestamp() + $this->getOffset();
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 	 * @return int
 	 */
 	public function getTimestamp() {
-		return method_exists( 'DateTime', 'getTimestamp' ) ? parent::getTimestamp() : $this->format( 'U' );
+		return method_exists('DateTime', 'getTimestamp') ? parent::getTimestamp() : $this->format('U');
 	}
 
 	/**
@@ -35,8 +35,8 @@ 
 	 *
 	 * @param $offset
 	 */
-	public function setUtcOffset( $offset ) {
-		$this->utcOffset = intval( $offset );
+	public function setUtcOffset($offset) {
+		$this->utcOffset = intval($offset);
 	}
 
 	/**
@@ -57,9 +57,9 @@ 
 	 * @return static
 	 * @link http://php.net/manual/en/datetime.settimezone.php
 	 */
-	public function setTimezone( $timezone ) {
+	public function setTimezone($timezone) {
 		$this->utcOffset = 0;
-		parent::setTimezone( $timezone );
+		parent::setTimezone($timezone);
 
 		return $this;
 	}

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

Indentation +44 added lines, -44 removed lines

@@ -5,63 +5,63 @@
  */
 class ActionScheduler_LogEntry {
 
-	/**
-	 * @var int $action_id
-	 */
-	protected $action_id =  '';
+    /**
+     * @var int $action_id
+     */
+    protected $action_id =  '';
 
-	/**
-	 * @var string $message
-	 */
-	protected $message =  '';
+    /**
+     * @var string $message
+     */
+    protected $message =  '';
 
-	/**
-	 * @var Datetime $date
-	 */
-	protected $date;
+    /**
+     * @var Datetime $date
+     */
+    protected $date;
 
-	/**
-	 * Constructor
-	 *
-	 * @param mixed  $action_id Action ID
-	 * @param string $message   Message
-	 * @param Datetime $date    Datetime object with the time when this log entry was created. If this parameter is
-	 *                          not provided a new Datetime object (with current time) will be created.
-	 */
-	public function __construct( $action_id, $message, $date = null ) {
+    /**
+     * Constructor
+     *
+     * @param mixed  $action_id Action ID
+     * @param string $message   Message
+     * @param Datetime $date    Datetime object with the time when this log entry was created. If this parameter is
+     *                          not provided a new Datetime object (with current time) will be created.
+     */
+    public function __construct( $action_id, $message, $date = null ) {
 
-		/*
+        /*
 		 * ActionScheduler_wpCommentLogger::get_entry() previously passed a 3rd param of $comment->comment_type
 		 * to ActionScheduler_LogEntry::__construct(), goodness knows why, and the Follow-up Emails plugin
 		 * hard-codes loading its own version of ActionScheduler_wpCommentLogger with that out-dated method,
 		 * goodness knows why, so we need to guard against that here instead of using a DateTime type declaration
 		 * for the constructor's 3rd param of $date and causing a fatal error with older versions of FUE.
 		 */
-		if ( null !== $date && ! is_a( $date, 'DateTime' ) ) {
-			_doing_it_wrong( __METHOD__, 'The third parameter must be a valid DateTime instance, or null.', '2.0.0' );
-			$date = null;
-		}
+        if ( null !== $date && ! is_a( $date, 'DateTime' ) ) {
+            _doing_it_wrong( __METHOD__, 'The third parameter must be a valid DateTime instance, or null.', '2.0.0' );
+            $date = null;
+        }
 
-		$this->action_id = $action_id;
-		$this->message   = $message;
-		$this->date      = $date ? $date : new Datetime;
-	}
+        $this->action_id = $action_id;
+        $this->message   = $message;
+        $this->date      = $date ? $date : new Datetime;
+    }
 
-	/**
-	 * Returns the date when this log entry was created
-	 *
-	 * @return Datetime
-	 */
-	public function get_date() {
-		return $this->date;
-	}
+    /**
+     * Returns the date when this log entry was created
+     *
+     * @return Datetime
+     */
+    public function get_date() {
+        return $this->date;
+    }
 
-	public function get_action_id() {
-		return $this->action_id;
-	}
+    public function get_action_id() {
+        return $this->action_id;
+    }
 
-	public function get_message() {
-		return $this->message;
-	}
+    public function get_message() {
+        return $this->message;
+    }
 }
 

Spacing +5 added lines, -5 removed lines

@@ -8,12 +8,12 @@ 
 	/**
 	 * @var int $action_id
 	 */
-	protected $action_id =  '';
+	protected $action_id = '';
 
 	/**
 	 * @var string $message
 	 */
-	protected $message =  '';
+	protected $message = '';
 
 	/**
 	 * @var Datetime $date
@@ -28,7 +28,7 @@ 
 	 * @param Datetime $date    Datetime object with the time when this log entry was created. If this parameter is
 	 *                          not provided a new Datetime object (with current time) will be created.
 	 */
-	public function __construct( $action_id, $message, $date = null ) {
+	public function __construct($action_id, $message, $date = null) {
 
 		/*
 		 * ActionScheduler_wpCommentLogger::get_entry() previously passed a 3rd param of $comment->comment_type
@@ -37,8 +37,8 @@ 
 		 * goodness knows why, so we need to guard against that here instead of using a DateTime type declaration
 		 * for the constructor's 3rd param of $date and causing a fatal error with older versions of FUE.
 		 */
-		if ( null !== $date && ! is_a( $date, 'DateTime' ) ) {
-			_doing_it_wrong( __METHOD__, 'The third parameter must be a valid DateTime instance, or null.', '2.0.0' );
+		if (null !== $date && !is_a($date, 'DateTime')) {
+			_doing_it_wrong(__METHOD__, 'The third parameter must be a valid DateTime instance, or null.', '2.0.0');
 			$date = null;
 		}
 

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

Indentation +170 added lines, -170 removed lines

@@ -14,174 +14,174 @@
  * @since 3.0.0
  */
 class ActionScheduler_DataController {
-	/** Action data store class name. */
-	const DATASTORE_CLASS = 'ActionScheduler_DBStore';
-
-	/** Logger data store class name. */
-	const LOGGER_CLASS    = 'ActionScheduler_DBLogger';
-
-	/** Migration status option name. */
-	const STATUS_FLAG     = 'action_scheduler_migration_status';
-
-	/** Migration status option value. */
-	const STATUS_COMPLETE = 'complete';
-
-	/** Migration minimum required PHP version. */
-	const MIN_PHP_VERSION = '5.5';
-
-	/** @var ActionScheduler_DataController */
-	private static $instance;
-
-	/** @var int */
-	private static $sleep_time = 0;
-
-	/** @var int */
-	private static $free_ticks = 50;
-
-	/**
-	 * Get a flag indicating whether the migration environment dependencies are met.
-	 *
-	 * @return bool
-	 */
-	public static function dependencies_met() {
-		$php_support = version_compare( PHP_VERSION, self::MIN_PHP_VERSION, '>=' );
-		return $php_support && apply_filters( 'action_scheduler_migration_dependencies_met', true );
-	}
-
-	/**
-	 * Get a flag indicating whether the migration is complete.
-	 *
-	 * @return bool Whether the flag has been set marking the migration as complete
-	 */
-	public static function is_migration_complete() {
-		return get_option( self::STATUS_FLAG ) === self::STATUS_COMPLETE;
-	}
-
-	/**
-	 * Mark the migration as complete.
-	 */
-	public static function mark_migration_complete() {
-		update_option( self::STATUS_FLAG, self::STATUS_COMPLETE );
-	}
-
-	/**
-	 * Unmark migration when a plugin is de-activated. Will not work in case of silent activation, for example in an update.
-	 * We do this to mitigate the bug of lost actions which happens if there was an AS 2.x to AS 3.x migration in the past, but that plugin is now
-	 * deactivated and the site was running on AS 2.x again.
-	 */
-	public static function mark_migration_incomplete() {
-		delete_option( self::STATUS_FLAG );
-	}
-
-	/**
-	 * Set the action store class name.
-	 *
-	 * @param string $class Classname of the store class.
-	 *
-	 * @return string
-	 */
-	public static function set_store_class( $class ) {
-		return self::DATASTORE_CLASS;
-	}
-
-	/**
-	 * Set the action logger class name.
-	 *
-	 * @param string $class Classname of the logger class.
-	 *
-	 * @return string
-	 */
-	public static function set_logger_class( $class ) {
-		return self::LOGGER_CLASS;
-	}
-
-	/**
-	 * Set the sleep time in seconds.
-	 *
-	 * @param integer $sleep_time The number of seconds to pause before resuming operation.
-	 */
-	public static function set_sleep_time( $sleep_time ) {
-		self::$sleep_time = $sleep_time;
-	}
-
-	/**
-	 * Set the tick count required for freeing memory.
-	 *
-	 * @param integer $free_ticks The number of ticks to free memory on.
-	 */
-	public static function set_free_ticks( $free_ticks ) {
-		self::$free_ticks = $free_ticks;
-	}
-
-	/**
-	 * Free memory if conditions are met.
-	 *
-	 * @param int $ticks Current tick count.
-	 */
-	public static function maybe_free_memory( $ticks ) {
-		if ( self::$free_ticks && 0 === $ticks % self::$free_ticks ) {
-			self::free_memory();
-		}
-	}
-
-	/**
-	 * Reduce memory footprint by clearing the database query and object caches.
-	 */
-	public static function free_memory() {
-		if ( 0 < self::$sleep_time ) {
-			/* translators: %d: amount of time */
-			\WP_CLI::warning( sprintf( _n( 'Stopped the insanity for %d second', 'Stopped the insanity for %d seconds', self::$sleep_time, 'action-scheduler' ), self::$sleep_time ) );
-			sleep( self::$sleep_time );
-		}
-
-		\WP_CLI::warning( __( 'Attempting to reduce used memory...', 'action-scheduler' ) );
-
-		/**
-		 * @var $wpdb            \wpdb
-		 * @var $wp_object_cache \WP_Object_Cache
-		 */
-		global $wpdb, $wp_object_cache;
-
-		$wpdb->queries = array();
-
-		if ( ! is_a( $wp_object_cache, 'WP_Object_Cache' ) ) {
-			return;
-		}
-
-		$wp_object_cache->group_ops      = array();
-		$wp_object_cache->stats          = array();
-		$wp_object_cache->memcache_debug = array();
-		$wp_object_cache->cache          = array();
-
-		if ( is_callable( array( $wp_object_cache, '__remoteset' ) ) ) {
-			call_user_func( array( $wp_object_cache, '__remoteset' ) ); // important
-		}
-	}
-
-	/**
-	 * Connect to table datastores if migration is complete.
-	 * Otherwise, proceed with the migration if the dependencies have been met.
-	 */
-	public static function init() {
-		if ( self::is_migration_complete() ) {
-			add_filter( 'action_scheduler_store_class', array( 'ActionScheduler_DataController', 'set_store_class' ), 100 );
-			add_filter( 'action_scheduler_logger_class', array( 'ActionScheduler_DataController', 'set_logger_class' ), 100 );
-			add_action( 'deactivate_plugin', array( 'ActionScheduler_DataController', 'mark_migration_incomplete' ) );
-		} elseif ( self::dependencies_met() ) {
-			Controller::init();
-		}
-
-		add_action( 'action_scheduler/progress_tick', array( 'ActionScheduler_DataController', 'maybe_free_memory' ) );
-	}
-
-	/**
-	 * Singleton factory.
-	 */
-	public static function instance() {
-		if ( ! isset( self::$instance ) ) {
-			self::$instance = new static();
-		}
-
-		return self::$instance;
-	}
+    /** Action data store class name. */
+    const DATASTORE_CLASS = 'ActionScheduler_DBStore';
+
+    /** Logger data store class name. */
+    const LOGGER_CLASS    = 'ActionScheduler_DBLogger';
+
+    /** Migration status option name. */
+    const STATUS_FLAG     = 'action_scheduler_migration_status';
+
+    /** Migration status option value. */
+    const STATUS_COMPLETE = 'complete';
+
+    /** Migration minimum required PHP version. */
+    const MIN_PHP_VERSION = '5.5';
+
+    /** @var ActionScheduler_DataController */
+    private static $instance;
+
+    /** @var int */
+    private static $sleep_time = 0;
+
+    /** @var int */
+    private static $free_ticks = 50;
+
+    /**
+     * Get a flag indicating whether the migration environment dependencies are met.
+     *
+     * @return bool
+     */
+    public static function dependencies_met() {
+        $php_support = version_compare( PHP_VERSION, self::MIN_PHP_VERSION, '>=' );
+        return $php_support && apply_filters( 'action_scheduler_migration_dependencies_met', true );
+    }
+
+    /**
+     * Get a flag indicating whether the migration is complete.
+     *
+     * @return bool Whether the flag has been set marking the migration as complete
+     */
+    public static function is_migration_complete() {
+        return get_option( self::STATUS_FLAG ) === self::STATUS_COMPLETE;
+    }
+
+    /**
+     * Mark the migration as complete.
+     */
+    public static function mark_migration_complete() {
+        update_option( self::STATUS_FLAG, self::STATUS_COMPLETE );
+    }
+
+    /**
+     * Unmark migration when a plugin is de-activated. Will not work in case of silent activation, for example in an update.
+     * We do this to mitigate the bug of lost actions which happens if there was an AS 2.x to AS 3.x migration in the past, but that plugin is now
+     * deactivated and the site was running on AS 2.x again.
+     */
+    public static function mark_migration_incomplete() {
+        delete_option( self::STATUS_FLAG );
+    }
+
+    /**
+     * Set the action store class name.
+     *
+     * @param string $class Classname of the store class.
+     *
+     * @return string
+     */
+    public static function set_store_class( $class ) {
+        return self::DATASTORE_CLASS;
+    }
+
+    /**
+     * Set the action logger class name.
+     *
+     * @param string $class Classname of the logger class.
+     *
+     * @return string
+     */
+    public static function set_logger_class( $class ) {
+        return self::LOGGER_CLASS;
+    }
+
+    /**
+     * Set the sleep time in seconds.
+     *
+     * @param integer $sleep_time The number of seconds to pause before resuming operation.
+     */
+    public static function set_sleep_time( $sleep_time ) {
+        self::$sleep_time = $sleep_time;
+    }
+
+    /**
+     * Set the tick count required for freeing memory.
+     *
+     * @param integer $free_ticks The number of ticks to free memory on.
+     */
+    public static function set_free_ticks( $free_ticks ) {
+        self::$free_ticks = $free_ticks;
+    }
+
+    /**
+     * Free memory if conditions are met.
+     *
+     * @param int $ticks Current tick count.
+     */
+    public static function maybe_free_memory( $ticks ) {
+        if ( self::$free_ticks && 0 === $ticks % self::$free_ticks ) {
+            self::free_memory();
+        }
+    }
+
+    /**
+     * Reduce memory footprint by clearing the database query and object caches.
+     */
+    public static function free_memory() {
+        if ( 0 < self::$sleep_time ) {
+            /* translators: %d: amount of time */
+            \WP_CLI::warning( sprintf( _n( 'Stopped the insanity for %d second', 'Stopped the insanity for %d seconds', self::$sleep_time, 'action-scheduler' ), self::$sleep_time ) );
+            sleep( self::$sleep_time );
+        }
+
+        \WP_CLI::warning( __( 'Attempting to reduce used memory...', 'action-scheduler' ) );
+
+        /**
+         * @var $wpdb            \wpdb
+         * @var $wp_object_cache \WP_Object_Cache
+         */
+        global $wpdb, $wp_object_cache;
+
+        $wpdb->queries = array();
+
+        if ( ! is_a( $wp_object_cache, 'WP_Object_Cache' ) ) {
+            return;
+        }
+
+        $wp_object_cache->group_ops      = array();
+        $wp_object_cache->stats          = array();
+        $wp_object_cache->memcache_debug = array();
+        $wp_object_cache->cache          = array();
+
+        if ( is_callable( array( $wp_object_cache, '__remoteset' ) ) ) {
+            call_user_func( array( $wp_object_cache, '__remoteset' ) ); // important
+        }
+    }
+
+    /**
+     * Connect to table datastores if migration is complete.
+     * Otherwise, proceed with the migration if the dependencies have been met.
+     */
+    public static function init() {
+        if ( self::is_migration_complete() ) {
+            add_filter( 'action_scheduler_store_class', array( 'ActionScheduler_DataController', 'set_store_class' ), 100 );
+            add_filter( 'action_scheduler_logger_class', array( 'ActionScheduler_DataController', 'set_logger_class' ), 100 );
+            add_action( 'deactivate_plugin', array( 'ActionScheduler_DataController', 'mark_migration_incomplete' ) );
+        } elseif ( self::dependencies_met() ) {
+            Controller::init();
+        }
+
+        add_action( 'action_scheduler/progress_tick', array( 'ActionScheduler_DataController', 'maybe_free_memory' ) );
+    }
+
+    /**
+     * Singleton factory.
+     */
+    public static function instance() {
+        if ( ! isset( self::$instance ) ) {
+            self::$instance = new static();
+        }
+
+        return self::$instance;
+    }
 }

Spacing +25 added lines, -25 removed lines

@@ -44,8 +44,8 @@ 
 	 * @return bool
 	 */
 	public static function dependencies_met() {
-		$php_support = version_compare( PHP_VERSION, self::MIN_PHP_VERSION, '>=' );
-		return $php_support && apply_filters( 'action_scheduler_migration_dependencies_met', true );
+		$php_support = version_compare(PHP_VERSION, self::MIN_PHP_VERSION, '>=');
+		return $php_support && apply_filters('action_scheduler_migration_dependencies_met', true);
 	}
 
 	/**
@@ -54,14 +54,14 @@ 
 	 * @return bool Whether the flag has been set marking the migration as complete
 	 */
 	public static function is_migration_complete() {
-		return get_option( self::STATUS_FLAG ) === self::STATUS_COMPLETE;
+		return get_option(self::STATUS_FLAG) === self::STATUS_COMPLETE;
 	}
 
 	/**
 	 * Mark the migration as complete.
 	 */
 	public static function mark_migration_complete() {
-		update_option( self::STATUS_FLAG, self::STATUS_COMPLETE );
+		update_option(self::STATUS_FLAG, self::STATUS_COMPLETE);
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 * deactivated and the site was running on AS 2.x again.
 	 */
 	public static function mark_migration_incomplete() {
-		delete_option( self::STATUS_FLAG );
+		delete_option(self::STATUS_FLAG);
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 *
 	 * @return string
 	 */
-	public static function set_store_class( $class ) {
+	public static function set_store_class($class) {
 		return self::DATASTORE_CLASS;
 	}
 
@@ -91,7 +91,7 @@ 
 	 *
 	 * @return string
 	 */
-	public static function set_logger_class( $class ) {
+	public static function set_logger_class($class) {
 		return self::LOGGER_CLASS;
 	}
 
@@ -100,7 +100,7 @@ 
 	 *
 	 * @param integer $sleep_time The number of seconds to pause before resuming operation.
 	 */
-	public static function set_sleep_time( $sleep_time ) {
+	public static function set_sleep_time($sleep_time) {
 		self::$sleep_time = $sleep_time;
 	}
 
@@ -109,7 +109,7 @@ 
 	 *
 	 * @param integer $free_ticks The number of ticks to free memory on.
 	 */
-	public static function set_free_ticks( $free_ticks ) {
+	public static function set_free_ticks($free_ticks) {
 		self::$free_ticks = $free_ticks;
 	}
 
@@ -118,8 +118,8 @@ 
 	 *
 	 * @param int $ticks Current tick count.
 	 */
-	public static function maybe_free_memory( $ticks ) {
-		if ( self::$free_ticks && 0 === $ticks % self::$free_ticks ) {
+	public static function maybe_free_memory($ticks) {
+		if (self::$free_ticks && 0 === $ticks % self::$free_ticks) {
 			self::free_memory();
 		}
 	}
@@ -128,13 +128,13 @@ 
 	 * Reduce memory footprint by clearing the database query and object caches.
 	 */
 	public static function free_memory() {
-		if ( 0 < self::$sleep_time ) {
+		if (0 < self::$sleep_time) {
 			/* translators: %d: amount of time */
-			\WP_CLI::warning( sprintf( _n( 'Stopped the insanity for %d second', 'Stopped the insanity for %d seconds', self::$sleep_time, 'action-scheduler' ), self::$sleep_time ) );
-			sleep( self::$sleep_time );
+			\WP_CLI::warning(sprintf(_n('Stopped the insanity for %d second', 'Stopped the insanity for %d seconds', self::$sleep_time, 'action-scheduler'), self::$sleep_time));
+			sleep(self::$sleep_time);
 		}
 
-		\WP_CLI::warning( __( 'Attempting to reduce used memory...', 'action-scheduler' ) );
+		\WP_CLI::warning(__('Attempting to reduce used memory...', 'action-scheduler'));
 
 		/**
 		 * @var $wpdb            \wpdb
@@ -144,7 +144,7 @@ 
 
 		$wpdb->queries = array();
 
-		if ( ! is_a( $wp_object_cache, 'WP_Object_Cache' ) ) {
+		if (!is_a($wp_object_cache, 'WP_Object_Cache')) {
 			return;
 		}
 
@@ -153,8 +153,8 @@ 
 		$wp_object_cache->memcache_debug = array();
 		$wp_object_cache->cache          = array();
 
-		if ( is_callable( array( $wp_object_cache, '__remoteset' ) ) ) {
-			call_user_func( array( $wp_object_cache, '__remoteset' ) ); // important
+		if (is_callable(array($wp_object_cache, '__remoteset'))) {
+			call_user_func(array($wp_object_cache, '__remoteset')); // important
 		}
 	}
 
@@ -163,22 +163,22 @@ 
 	 * Otherwise, proceed with the migration if the dependencies have been met.
 	 */
 	public static function init() {
-		if ( self::is_migration_complete() ) {
-			add_filter( 'action_scheduler_store_class', array( 'ActionScheduler_DataController', 'set_store_class' ), 100 );
-			add_filter( 'action_scheduler_logger_class', array( 'ActionScheduler_DataController', 'set_logger_class' ), 100 );
-			add_action( 'deactivate_plugin', array( 'ActionScheduler_DataController', 'mark_migration_incomplete' ) );
-		} elseif ( self::dependencies_met() ) {
+		if (self::is_migration_complete()) {
+			add_filter('action_scheduler_store_class', array('ActionScheduler_DataController', 'set_store_class'), 100);
+			add_filter('action_scheduler_logger_class', array('ActionScheduler_DataController', 'set_logger_class'), 100);
+			add_action('deactivate_plugin', array('ActionScheduler_DataController', 'mark_migration_incomplete'));
+		} elseif (self::dependencies_met()) {
 			Controller::init();
 		}
 
-		add_action( 'action_scheduler/progress_tick', array( 'ActionScheduler_DataController', 'maybe_free_memory' ) );
+		add_action('action_scheduler/progress_tick', array('ActionScheduler_DataController', 'maybe_free_memory'));
 	}
 
 	/**
 	 * Singleton factory.
 	 */
 	public static function instance() {
-		if ( ! isset( self::$instance ) ) {
+		if (!isset(self::$instance)) {
 			self::$instance = new static();
 		}
 

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

Indentation +32 added lines, -32 removed lines

@@ -9,39 +9,39 @@
  */
 class ActionScheduler_InvalidActionException extends \InvalidArgumentException implements ActionScheduler_Exception {
 
-	/**
-	 * Create a new exception when the action's schedule cannot be fetched.
-	 *
-	 * @param string $action_id The action ID with bad args.
-	 * @return static
-	 */
-	public static function from_schedule( $action_id, $schedule ) {
-		$message = sprintf(
-			/* translators: 1: action ID 2: schedule */
-			__( 'Action [%1$s] has an invalid schedule: %2$s', 'action-scheduler' ),
-			$action_id,
-			var_export( $schedule, true )
-		);
+    /**
+     * Create a new exception when the action's schedule cannot be fetched.
+     *
+     * @param string $action_id The action ID with bad args.
+     * @return static
+     */
+    public static function from_schedule( $action_id, $schedule ) {
+        $message = sprintf(
+            /* translators: 1: action ID 2: schedule */
+            __( 'Action [%1$s] has an invalid schedule: %2$s', 'action-scheduler' ),
+            $action_id,
+            var_export( $schedule, true )
+        );
 
-		return new static( $message );
-	}
+        return new static( $message );
+    }
 
-	/**
-	 * Create a new exception when the action's args cannot be decoded to an array.
-	 *
-	 * @author Jeremy Pry
-	 *
-	 * @param string $action_id The action ID with bad args.
-	 * @return static
-	 */
-	public static function from_decoding_args( $action_id, $args = array() ) {
-		$message = sprintf(
-			/* translators: 1: action ID 2: arguments */
-			__( 'Action [%1$s] has invalid arguments. It cannot be JSON decoded to an array. $args = %2$s', 'action-scheduler' ),
-			$action_id,
-			var_export( $args, true )
-		);
+    /**
+     * Create a new exception when the action's args cannot be decoded to an array.
+     *
+     * @author Jeremy Pry
+     *
+     * @param string $action_id The action ID with bad args.
+     * @return static
+     */
+    public static function from_decoding_args( $action_id, $args = array() ) {
+        $message = sprintf(
+            /* translators: 1: action ID 2: arguments */
+            __( 'Action [%1$s] has invalid arguments. It cannot be JSON decoded to an array. $args = %2$s', 'action-scheduler' ),
+            $action_id,
+            var_export( $args, true )
+        );
 
-		return new static( $message );
-	}
+        return new static( $message );
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -15,15 +15,15 @@ 
 	 * @param string $action_id The action ID with bad args.
 	 * @return static
 	 */
-	public static function from_schedule( $action_id, $schedule ) {
+	public static function from_schedule($action_id, $schedule) {
 		$message = sprintf(
 			/* translators: 1: action ID 2: schedule */
-			__( 'Action [%1$s] has an invalid schedule: %2$s', 'action-scheduler' ),
+			__('Action [%1$s] has an invalid schedule: %2$s', 'action-scheduler'),
 			$action_id,
-			var_export( $schedule, true )
+			var_export($schedule, true)
 		);
 
-		return new static( $message );
+		return new static($message);
 	}
 
 	/**
@@ -34,14 +34,14 @@ 
 	 * @param string $action_id The action ID with bad args.
 	 * @return static
 	 */
-	public static function from_decoding_args( $action_id, $args = array() ) {
+	public static function from_decoding_args($action_id, $args = array()) {
 		$message = sprintf(
 			/* translators: 1: action ID 2: arguments */
-			__( 'Action [%1$s] has invalid arguments. It cannot be JSON decoded to an array. $args = %2$s', 'action-scheduler' ),
+			__('Action [%1$s] has invalid arguments. It cannot be JSON decoded to an array. $args = %2$s', 'action-scheduler'),
 			$action_id,
-			var_export( $args, true )
+			var_export($args, true)
 		);
 
-		return new static( $message );
+		return new static($message);
 	}
 }

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

Indentation +55 added lines, -55 removed lines

@@ -4,59 +4,59 @@
  * Class ActionScheduler_Versions
  */
 class ActionScheduler_Versions {
-	/**
-	 * @var ActionScheduler_Versions
-	 */
-	private static $instance = NULL;
-
-	private $versions = array();
-
-	public function register( $version_string, $initialization_callback ) {
-		if ( isset($this->versions[$version_string]) ) {
-			return FALSE;
-		}
-		$this->versions[$version_string] = $initialization_callback;
-		return TRUE;
-	}
-
-	public function get_versions() {
-		return $this->versions;
-	}
-
-	public function latest_version() {
-		$keys = array_keys($this->versions);
-		if ( empty($keys) ) {
-			return false;
-		}
-		uasort( $keys, 'version_compare' );
-		return end($keys);
-	}
-
-	public function latest_version_callback() {
-		$latest = $this->latest_version();
-		if ( empty($latest) || !isset($this->versions[$latest]) ) {
-			return '__return_null';
-		}
-		return $this->versions[$latest];
-	}
-
-	/**
-	 * @return ActionScheduler_Versions
-	 * @codeCoverageIgnore
-	 */
-	public static function instance() {
-		if ( empty(self::$instance) ) {
-			self::$instance = new self();
-		}
-		return self::$instance;
-	}
-
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public static function initialize_latest_version() {
-		$self = self::instance();
-		call_user_func($self->latest_version_callback());
-	}
+    /**
+     * @var ActionScheduler_Versions
+     */
+    private static $instance = NULL;
+
+    private $versions = array();
+
+    public function register( $version_string, $initialization_callback ) {
+        if ( isset($this->versions[$version_string]) ) {
+            return FALSE;
+        }
+        $this->versions[$version_string] = $initialization_callback;
+        return TRUE;
+    }
+
+    public function get_versions() {
+        return $this->versions;
+    }
+
+    public function latest_version() {
+        $keys = array_keys($this->versions);
+        if ( empty($keys) ) {
+            return false;
+        }
+        uasort( $keys, 'version_compare' );
+        return end($keys);
+    }
+
+    public function latest_version_callback() {
+        $latest = $this->latest_version();
+        if ( empty($latest) || !isset($this->versions[$latest]) ) {
+            return '__return_null';
+        }
+        return $this->versions[$latest];
+    }
+
+    /**
+     * @return ActionScheduler_Versions
+     * @codeCoverageIgnore
+     */
+    public static function instance() {
+        if ( empty(self::$instance) ) {
+            self::$instance = new self();
+        }
+        return self::$instance;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public static function initialize_latest_version() {
+        $self = self::instance();
+        call_user_func($self->latest_version_callback());
+    }
 }
- 
\ No newline at end of file
+    
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -11,8 +11,8 @@ 
 
 	private $versions = array();
 
-	public function register( $version_string, $initialization_callback ) {
-		if ( isset($this->versions[$version_string]) ) {
+	public function register($version_string, $initialization_callback) {
+		if (isset($this->versions[$version_string])) {
 			return FALSE;
 		}
 		$this->versions[$version_string] = $initialization_callback;
@@ -25,16 +25,16 @@ 
 
 	public function latest_version() {
 		$keys = array_keys($this->versions);
-		if ( empty($keys) ) {
+		if (empty($keys)) {
 			return false;
 		}
-		uasort( $keys, 'version_compare' );
+		uasort($keys, 'version_compare');
 		return end($keys);
 	}
 
 	public function latest_version_callback() {
 		$latest = $this->latest_version();
-		if ( empty($latest) || !isset($this->versions[$latest]) ) {
+		if (empty($latest) || !isset($this->versions[$latest])) {
 			return '__return_null';
 		}
 		return $this->versions[$latest];
@@ -45,7 +45,7 @@ 
 	 * @codeCoverageIgnore
 	 */
 	public static function instance() {
-		if ( empty(self::$instance) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new self();
 		}
 		return self::$instance;

includes/libraries/action-scheduler/classes/abstracts/ActionScheduler_Abstract_QueueRunner.php

Indentation +232 added lines, -232 removed lines

@@ -5,236 +5,236 @@
  */
 abstract class ActionScheduler_Abstract_QueueRunner extends ActionScheduler_Abstract_QueueRunner_Deprecated {
 
-	/** @var ActionScheduler_QueueCleaner */
-	protected $cleaner;
-
-	/** @var ActionScheduler_FatalErrorMonitor */
-	protected $monitor;
-
-	/** @var ActionScheduler_Store */
-	protected $store;
-
-	/**
-	 * The created time.
-	 *
-	 * Represents when the queue runner was constructed and used when calculating how long a PHP request has been running.
-	 * For this reason it should be as close as possible to the PHP request start time.
-	 *
-	 * @var int
-	 */
-	private $created_time;
-
-	/**
-	 * ActionScheduler_Abstract_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 ) {
-
-		$this->created_time = microtime( true );
-
-		$this->store   = $store ? $store : ActionScheduler_Store::instance();
-		$this->monitor = $monitor ? $monitor : new ActionScheduler_FatalErrorMonitor( $this->store );
-		$this->cleaner = $cleaner ? $cleaner : new ActionScheduler_QueueCleaner( $this->store );
-	}
-
-	/**
-	 * Process an individual action.
-	 *
-	 * @param int $action_id The action ID to process.
-	 * @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.
-	 */
-	public function process_action( $action_id, $context = '' ) {
-		try {
-			$valid_action = false;
-			do_action( 'action_scheduler_before_execute', $action_id, $context );
-
-			if ( ActionScheduler_Store::STATUS_PENDING !== $this->store->get_status( $action_id ) ) {
-				do_action( 'action_scheduler_execution_ignored', $action_id, $context );
-				return;
-			}
-
-			$valid_action = true;
-			do_action( 'action_scheduler_begin_execute', $action_id, $context );
-
-			$action = $this->store->fetch_action( $action_id );
-			$this->store->log_execution( $action_id );
-			$action->execute();
-			do_action( 'action_scheduler_after_execute', $action_id, $action, $context );
-			$this->store->mark_complete( $action_id );
-		} catch ( Exception $e ) {
-			if ( $valid_action ) {
-				$this->store->mark_failure( $action_id );
-				do_action( 'action_scheduler_failed_execution', $action_id, $e, $context );
-			} else {
-				do_action( 'action_scheduler_failed_validation', $action_id, $e, $context );
-			}
-		}
-
-		if ( isset( $action ) && is_a( $action, 'ActionScheduler_Action' ) && $action->get_schedule()->is_recurring() ) {
-			$this->schedule_next_instance( $action, $action_id );
-		}
-	}
-
-	/**
-	 * Schedule the next instance of the action if necessary.
-	 *
-	 * @param ActionScheduler_Action $action
-	 * @param int $action_id
-	 */
-	protected function schedule_next_instance( ActionScheduler_Action $action, $action_id ) {
-		try {
-			ActionScheduler::factory()->repeat( $action );
-		} catch ( Exception $e ) {
-			do_action( 'action_scheduler_failed_to_schedule_next_instance', $action_id, $e, $action );
-		}
-	}
-
-	/**
-	 * Run the queue cleaner.
-	 *
-	 * @author Jeremy Pry
-	 */
-	protected function run_cleanup() {
-		$this->cleaner->clean( 10 * $this->get_time_limit() );
-	}
-
-	/**
-	 * Get the number of concurrent batches a runner allows.
-	 *
-	 * @return int
-	 */
-	public function get_allowed_concurrent_batches() {
-		return apply_filters( 'action_scheduler_queue_runner_concurrent_batches', 1 );
-	}
-
-	/**
-	 * Check if the number of allowed concurrent batches is met or exceeded.
-	 *
-	 * @return bool
-	 */
-	public function has_maximum_concurrent_batches() {
-		return $this->store->get_claim_count() >= $this->get_allowed_concurrent_batches();
-	}
-
-	/**
-	 * Get the maximum number of seconds a batch can run for.
-	 *
-	 * @return int The number of seconds.
-	 */
-	protected function get_time_limit() {
-
-		$time_limit = 30;
-
-		// Apply deprecated filter from deprecated get_maximum_execution_time() method
-		if ( has_filter( 'action_scheduler_maximum_execution_time' ) ) {
-			_deprecated_function( 'action_scheduler_maximum_execution_time', '2.1.1', 'action_scheduler_queue_runner_time_limit' );
-			$time_limit = apply_filters( 'action_scheduler_maximum_execution_time', $time_limit );
-		}
-
-		return absint( apply_filters( 'action_scheduler_queue_runner_time_limit', $time_limit ) );
-	}
-
-	/**
-	 * Get the number of seconds the process has been running.
-	 *
-	 * @return int The number of seconds.
-	 */
-	protected function get_execution_time() {
-		$execution_time = microtime( true ) - $this->created_time;
-
-		// Get the CPU time if the hosting environment uses it rather than wall-clock time to calculate a process's execution time.
-		if ( function_exists( 'getrusage' ) && apply_filters( 'action_scheduler_use_cpu_execution_time', defined( 'PANTHEON_ENVIRONMENT' ) ) ) {
-			$resource_usages = getrusage();
-
-			if ( isset( $resource_usages['ru_stime.tv_usec'], $resource_usages['ru_stime.tv_usec'] ) ) {
-				$execution_time = $resource_usages['ru_stime.tv_sec'] + ( $resource_usages['ru_stime.tv_usec'] / 1000000 );
-			}
-		}
-
-		return $execution_time;
-	}
-
-	/**
-	 * Check if the host's max execution time is (likely) to be exceeded if processing more actions.
-	 *
-	 * @param int $processed_actions The number of actions processed so far - used to determine the likelihood of exceeding the time limit if processing another action
-	 * @return bool
-	 */
-	protected function time_likely_to_be_exceeded( $processed_actions ) {
-
-		$execution_time        = $this->get_execution_time();
-		$max_execution_time    = $this->get_time_limit();
-		$time_per_action       = $execution_time / $processed_actions;
-		$estimated_time        = $execution_time + ( $time_per_action * 3 );
-		$likely_to_be_exceeded = $estimated_time > $max_execution_time;
-
-		return apply_filters( 'action_scheduler_maximum_execution_time_likely_to_be_exceeded', $likely_to_be_exceeded, $this, $processed_actions, $execution_time, $max_execution_time );
-	}
-
-	/**
-	 * Get memory limit
-	 *
-	 * Based on WP_Background_Process::get_memory_limit()
-	 *
-	 * @return int
-	 */
-	protected function get_memory_limit() {
-		if ( function_exists( 'ini_get' ) ) {
-			$memory_limit = ini_get( 'memory_limit' );
-		} else {
-			$memory_limit = '128M'; // Sensible default, and minimum required by WooCommerce
-		}
-
-		if ( ! $memory_limit || -1 === $memory_limit || '-1' === $memory_limit ) {
-			// Unlimited, set to 32GB.
-			$memory_limit = '32G';
-		}
-
-		return ActionScheduler_Compatibility::convert_hr_to_bytes( $memory_limit );
-	}
-
-	/**
-	 * Memory exceeded
-	 *
-	 * Ensures the batch process never exceeds 90% of the maximum WordPress memory.
-	 *
-	 * Based on WP_Background_Process::memory_exceeded()
-	 *
-	 * @return bool
-	 */
-	protected function memory_exceeded() {
-
-		$memory_limit    = $this->get_memory_limit() * 0.90;
-		$current_memory  = memory_get_usage( true );
-		$memory_exceeded = $current_memory >= $memory_limit;
-
-		return apply_filters( 'action_scheduler_memory_exceeded', $memory_exceeded, $this );
-	}
-
-	/**
-	 * See if the batch limits have been exceeded, which is when memory usage is almost at
-	 * the maximum limit, or the time to process more actions will exceed the max time limit.
-	 *
-	 * Based on WC_Background_Process::batch_limits_exceeded()
-	 *
-	 * @param int $processed_actions The number of actions processed so far - used to determine the likelihood of exceeding the time limit if processing another action
-	 * @return bool
-	 */
-	protected function batch_limits_exceeded( $processed_actions ) {
-		return $this->memory_exceeded() || $this->time_likely_to_be_exceeded( $processed_actions );
-	}
-
-	/**
-	 * Process actions in the queue.
-	 *
-	 * @author Jeremy Pry
-	 * @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.
-	 */
-	abstract public function run( $context = '' );
+    /** @var ActionScheduler_QueueCleaner */
+    protected $cleaner;
+
+    /** @var ActionScheduler_FatalErrorMonitor */
+    protected $monitor;
+
+    /** @var ActionScheduler_Store */
+    protected $store;
+
+    /**
+     * The created time.
+     *
+     * Represents when the queue runner was constructed and used when calculating how long a PHP request has been running.
+     * For this reason it should be as close as possible to the PHP request start time.
+     *
+     * @var int
+     */
+    private $created_time;
+
+    /**
+     * ActionScheduler_Abstract_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 ) {
+
+        $this->created_time = microtime( true );
+
+        $this->store   = $store ? $store : ActionScheduler_Store::instance();
+        $this->monitor = $monitor ? $monitor : new ActionScheduler_FatalErrorMonitor( $this->store );
+        $this->cleaner = $cleaner ? $cleaner : new ActionScheduler_QueueCleaner( $this->store );
+    }
+
+    /**
+     * Process an individual action.
+     *
+     * @param int $action_id The action ID to process.
+     * @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.
+     */
+    public function process_action( $action_id, $context = '' ) {
+        try {
+            $valid_action = false;
+            do_action( 'action_scheduler_before_execute', $action_id, $context );
+
+            if ( ActionScheduler_Store::STATUS_PENDING !== $this->store->get_status( $action_id ) ) {
+                do_action( 'action_scheduler_execution_ignored', $action_id, $context );
+                return;
+            }
+
+            $valid_action = true;
+            do_action( 'action_scheduler_begin_execute', $action_id, $context );
+
+            $action = $this->store->fetch_action( $action_id );
+            $this->store->log_execution( $action_id );
+            $action->execute();
+            do_action( 'action_scheduler_after_execute', $action_id, $action, $context );
+            $this->store->mark_complete( $action_id );
+        } catch ( Exception $e ) {
+            if ( $valid_action ) {
+                $this->store->mark_failure( $action_id );
+                do_action( 'action_scheduler_failed_execution', $action_id, $e, $context );
+            } else {
+                do_action( 'action_scheduler_failed_validation', $action_id, $e, $context );
+            }
+        }
+
+        if ( isset( $action ) && is_a( $action, 'ActionScheduler_Action' ) && $action->get_schedule()->is_recurring() ) {
+            $this->schedule_next_instance( $action, $action_id );
+        }
+    }
+
+    /**
+     * Schedule the next instance of the action if necessary.
+     *
+     * @param ActionScheduler_Action $action
+     * @param int $action_id
+     */
+    protected function schedule_next_instance( ActionScheduler_Action $action, $action_id ) {
+        try {
+            ActionScheduler::factory()->repeat( $action );
+        } catch ( Exception $e ) {
+            do_action( 'action_scheduler_failed_to_schedule_next_instance', $action_id, $e, $action );
+        }
+    }
+
+    /**
+     * Run the queue cleaner.
+     *
+     * @author Jeremy Pry
+     */
+    protected function run_cleanup() {
+        $this->cleaner->clean( 10 * $this->get_time_limit() );
+    }
+
+    /**
+     * Get the number of concurrent batches a runner allows.
+     *
+     * @return int
+     */
+    public function get_allowed_concurrent_batches() {
+        return apply_filters( 'action_scheduler_queue_runner_concurrent_batches', 1 );
+    }
+
+    /**
+     * Check if the number of allowed concurrent batches is met or exceeded.
+     *
+     * @return bool
+     */
+    public function has_maximum_concurrent_batches() {
+        return $this->store->get_claim_count() >= $this->get_allowed_concurrent_batches();
+    }
+
+    /**
+     * Get the maximum number of seconds a batch can run for.
+     *
+     * @return int The number of seconds.
+     */
+    protected function get_time_limit() {
+
+        $time_limit = 30;
+
+        // Apply deprecated filter from deprecated get_maximum_execution_time() method
+        if ( has_filter( 'action_scheduler_maximum_execution_time' ) ) {
+            _deprecated_function( 'action_scheduler_maximum_execution_time', '2.1.1', 'action_scheduler_queue_runner_time_limit' );
+            $time_limit = apply_filters( 'action_scheduler_maximum_execution_time', $time_limit );
+        }
+
+        return absint( apply_filters( 'action_scheduler_queue_runner_time_limit', $time_limit ) );
+    }
+
+    /**
+     * Get the number of seconds the process has been running.
+     *
+     * @return int The number of seconds.
+     */
+    protected function get_execution_time() {
+        $execution_time = microtime( true ) - $this->created_time;
+
+        // Get the CPU time if the hosting environment uses it rather than wall-clock time to calculate a process's execution time.
+        if ( function_exists( 'getrusage' ) && apply_filters( 'action_scheduler_use_cpu_execution_time', defined( 'PANTHEON_ENVIRONMENT' ) ) ) {
+            $resource_usages = getrusage();
+
+            if ( isset( $resource_usages['ru_stime.tv_usec'], $resource_usages['ru_stime.tv_usec'] ) ) {
+                $execution_time = $resource_usages['ru_stime.tv_sec'] + ( $resource_usages['ru_stime.tv_usec'] / 1000000 );
+            }
+        }
+
+        return $execution_time;
+    }
+
+    /**
+     * Check if the host's max execution time is (likely) to be exceeded if processing more actions.
+     *
+     * @param int $processed_actions The number of actions processed so far - used to determine the likelihood of exceeding the time limit if processing another action
+     * @return bool
+     */
+    protected function time_likely_to_be_exceeded( $processed_actions ) {
+
+        $execution_time        = $this->get_execution_time();
+        $max_execution_time    = $this->get_time_limit();
+        $time_per_action       = $execution_time / $processed_actions;
+        $estimated_time        = $execution_time + ( $time_per_action * 3 );
+        $likely_to_be_exceeded = $estimated_time > $max_execution_time;
+
+        return apply_filters( 'action_scheduler_maximum_execution_time_likely_to_be_exceeded', $likely_to_be_exceeded, $this, $processed_actions, $execution_time, $max_execution_time );
+    }
+
+    /**
+     * Get memory limit
+     *
+     * Based on WP_Background_Process::get_memory_limit()
+     *
+     * @return int
+     */
+    protected function get_memory_limit() {
+        if ( function_exists( 'ini_get' ) ) {
+            $memory_limit = ini_get( 'memory_limit' );
+        } else {
+            $memory_limit = '128M'; // Sensible default, and minimum required by WooCommerce
+        }
+
+        if ( ! $memory_limit || -1 === $memory_limit || '-1' === $memory_limit ) {
+            // Unlimited, set to 32GB.
+            $memory_limit = '32G';
+        }
+
+        return ActionScheduler_Compatibility::convert_hr_to_bytes( $memory_limit );
+    }
+
+    /**
+     * Memory exceeded
+     *
+     * Ensures the batch process never exceeds 90% of the maximum WordPress memory.
+     *
+     * Based on WP_Background_Process::memory_exceeded()
+     *
+     * @return bool
+     */
+    protected function memory_exceeded() {
+
+        $memory_limit    = $this->get_memory_limit() * 0.90;
+        $current_memory  = memory_get_usage( true );
+        $memory_exceeded = $current_memory >= $memory_limit;
+
+        return apply_filters( 'action_scheduler_memory_exceeded', $memory_exceeded, $this );
+    }
+
+    /**
+     * See if the batch limits have been exceeded, which is when memory usage is almost at
+     * the maximum limit, or the time to process more actions will exceed the max time limit.
+     *
+     * Based on WC_Background_Process::batch_limits_exceeded()
+     *
+     * @param int $processed_actions The number of actions processed so far - used to determine the likelihood of exceeding the time limit if processing another action
+     * @return bool
+     */
+    protected function batch_limits_exceeded( $processed_actions ) {
+        return $this->memory_exceeded() || $this->time_likely_to_be_exceeded( $processed_actions );
+    }
+
+    /**
+     * Process actions in the queue.
+     *
+     * @author Jeremy Pry
+     * @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.
+     */
+    abstract public function run( $context = '' );
 }

Spacing +46 added lines, -46 removed lines

@@ -31,13 +31,13 @@ 
 	 * @param ActionScheduler_FatalErrorMonitor $monitor
 	 * @param ActionScheduler_QueueCleaner      $cleaner
 	 */
-	public function __construct( ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null ) {
+	public function __construct(ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null) {
 
-		$this->created_time = microtime( true );
+		$this->created_time = microtime(true);
 
 		$this->store   = $store ? $store : ActionScheduler_Store::instance();
-		$this->monitor = $monitor ? $monitor : new ActionScheduler_FatalErrorMonitor( $this->store );
-		$this->cleaner = $cleaner ? $cleaner : new ActionScheduler_QueueCleaner( $this->store );
+		$this->monitor = $monitor ? $monitor : new ActionScheduler_FatalErrorMonitor($this->store);
+		$this->cleaner = $cleaner ? $cleaner : new ActionScheduler_QueueCleaner($this->store);
 	}
 
 	/**
@@ -47,35 +47,35 @@ 
 	 * @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.
 	 */
-	public function process_action( $action_id, $context = '' ) {
+	public function process_action($action_id, $context = '') {
 		try {
 			$valid_action = false;
-			do_action( 'action_scheduler_before_execute', $action_id, $context );
+			do_action('action_scheduler_before_execute', $action_id, $context);
 
-			if ( ActionScheduler_Store::STATUS_PENDING !== $this->store->get_status( $action_id ) ) {
-				do_action( 'action_scheduler_execution_ignored', $action_id, $context );
+			if (ActionScheduler_Store::STATUS_PENDING !== $this->store->get_status($action_id)) {
+				do_action('action_scheduler_execution_ignored', $action_id, $context);
 				return;
 			}
 
 			$valid_action = true;
-			do_action( 'action_scheduler_begin_execute', $action_id, $context );
+			do_action('action_scheduler_begin_execute', $action_id, $context);
 
-			$action = $this->store->fetch_action( $action_id );
-			$this->store->log_execution( $action_id );
+			$action = $this->store->fetch_action($action_id);
+			$this->store->log_execution($action_id);
 			$action->execute();
-			do_action( 'action_scheduler_after_execute', $action_id, $action, $context );
-			$this->store->mark_complete( $action_id );
-		} catch ( Exception $e ) {
-			if ( $valid_action ) {
-				$this->store->mark_failure( $action_id );
-				do_action( 'action_scheduler_failed_execution', $action_id, $e, $context );
+			do_action('action_scheduler_after_execute', $action_id, $action, $context);
+			$this->store->mark_complete($action_id);
+		} catch (Exception $e) {
+			if ($valid_action) {
+				$this->store->mark_failure($action_id);
+				do_action('action_scheduler_failed_execution', $action_id, $e, $context);
 			} else {
-				do_action( 'action_scheduler_failed_validation', $action_id, $e, $context );
+				do_action('action_scheduler_failed_validation', $action_id, $e, $context);
 			}
 		}
 
-		if ( isset( $action ) && is_a( $action, 'ActionScheduler_Action' ) && $action->get_schedule()->is_recurring() ) {
-			$this->schedule_next_instance( $action, $action_id );
+		if (isset($action) && is_a($action, 'ActionScheduler_Action') && $action->get_schedule()->is_recurring()) {
+			$this->schedule_next_instance($action, $action_id);
 		}
 	}
 
@@ -85,11 +85,11 @@ 
 	 * @param ActionScheduler_Action $action
 	 * @param int $action_id
 	 */
-	protected function schedule_next_instance( ActionScheduler_Action $action, $action_id ) {
+	protected function schedule_next_instance(ActionScheduler_Action $action, $action_id) {
 		try {
-			ActionScheduler::factory()->repeat( $action );
-		} catch ( Exception $e ) {
-			do_action( 'action_scheduler_failed_to_schedule_next_instance', $action_id, $e, $action );
+			ActionScheduler::factory()->repeat($action);
+		} catch (Exception $e) {
+			do_action('action_scheduler_failed_to_schedule_next_instance', $action_id, $e, $action);
 		}
 	}
 
@@ -99,7 +99,7 @@ 
 	 * @author Jeremy Pry
 	 */
 	protected function run_cleanup() {
-		$this->cleaner->clean( 10 * $this->get_time_limit() );
+		$this->cleaner->clean(10 * $this->get_time_limit());
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	 * @return int
 	 */
 	public function get_allowed_concurrent_batches() {
-		return apply_filters( 'action_scheduler_queue_runner_concurrent_batches', 1 );
+		return apply_filters('action_scheduler_queue_runner_concurrent_batches', 1);
 	}
 
 	/**
@@ -130,12 +130,12 @@ 
 		$time_limit = 30;
 
 		// Apply deprecated filter from deprecated get_maximum_execution_time() method
-		if ( has_filter( 'action_scheduler_maximum_execution_time' ) ) {
-			_deprecated_function( 'action_scheduler_maximum_execution_time', '2.1.1', 'action_scheduler_queue_runner_time_limit' );
-			$time_limit = apply_filters( 'action_scheduler_maximum_execution_time', $time_limit );
+		if (has_filter('action_scheduler_maximum_execution_time')) {
+			_deprecated_function('action_scheduler_maximum_execution_time', '2.1.1', 'action_scheduler_queue_runner_time_limit');
+			$time_limit = apply_filters('action_scheduler_maximum_execution_time', $time_limit);
 		}
 
-		return absint( apply_filters( 'action_scheduler_queue_runner_time_limit', $time_limit ) );
+		return absint(apply_filters('action_scheduler_queue_runner_time_limit', $time_limit));
 	}
 
 	/**
@@ -144,14 +144,14 @@ 
 	 * @return int The number of seconds.
 	 */
 	protected function get_execution_time() {
-		$execution_time = microtime( true ) - $this->created_time;
+		$execution_time = microtime(true) - $this->created_time;
 
 		// Get the CPU time if the hosting environment uses it rather than wall-clock time to calculate a process's execution time.
-		if ( function_exists( 'getrusage' ) && apply_filters( 'action_scheduler_use_cpu_execution_time', defined( 'PANTHEON_ENVIRONMENT' ) ) ) {
+		if (function_exists('getrusage') && apply_filters('action_scheduler_use_cpu_execution_time', defined('PANTHEON_ENVIRONMENT'))) {
 			$resource_usages = getrusage();
 
-			if ( isset( $resource_usages['ru_stime.tv_usec'], $resource_usages['ru_stime.tv_usec'] ) ) {
-				$execution_time = $resource_usages['ru_stime.tv_sec'] + ( $resource_usages['ru_stime.tv_usec'] / 1000000 );
+			if (isset($resource_usages['ru_stime.tv_usec'], $resource_usages['ru_stime.tv_usec'])) {
+				$execution_time = $resource_usages['ru_stime.tv_sec'] + ($resource_usages['ru_stime.tv_usec'] / 1000000);
 			}
 		}
 
@@ -164,15 +164,15 @@ 
 	 * @param int $processed_actions The number of actions processed so far - used to determine the likelihood of exceeding the time limit if processing another action
 	 * @return bool
 	 */
-	protected function time_likely_to_be_exceeded( $processed_actions ) {
+	protected function time_likely_to_be_exceeded($processed_actions) {
 
 		$execution_time        = $this->get_execution_time();
 		$max_execution_time    = $this->get_time_limit();
 		$time_per_action       = $execution_time / $processed_actions;
-		$estimated_time        = $execution_time + ( $time_per_action * 3 );
+		$estimated_time        = $execution_time + ($time_per_action * 3);
 		$likely_to_be_exceeded = $estimated_time > $max_execution_time;
 
-		return apply_filters( 'action_scheduler_maximum_execution_time_likely_to_be_exceeded', $likely_to_be_exceeded, $this, $processed_actions, $execution_time, $max_execution_time );
+		return apply_filters('action_scheduler_maximum_execution_time_likely_to_be_exceeded', $likely_to_be_exceeded, $this, $processed_actions, $execution_time, $max_execution_time);
 	}
 
 	/**
@@ -183,18 +183,18 @@ 
 	 * @return int
 	 */
 	protected function get_memory_limit() {
-		if ( function_exists( 'ini_get' ) ) {
-			$memory_limit = ini_get( 'memory_limit' );
+		if (function_exists('ini_get')) {
+			$memory_limit = ini_get('memory_limit');
 		} else {
 			$memory_limit = '128M'; // Sensible default, and minimum required by WooCommerce
 		}
 
-		if ( ! $memory_limit || -1 === $memory_limit || '-1' === $memory_limit ) {
+		if (!$memory_limit || -1 === $memory_limit || '-1' === $memory_limit) {
 			// Unlimited, set to 32GB.
 			$memory_limit = '32G';
 		}
 
-		return ActionScheduler_Compatibility::convert_hr_to_bytes( $memory_limit );
+		return ActionScheduler_Compatibility::convert_hr_to_bytes($memory_limit);
 	}
 
 	/**
@@ -209,10 +209,10 @@ 
 	protected function memory_exceeded() {
 
 		$memory_limit    = $this->get_memory_limit() * 0.90;
-		$current_memory  = memory_get_usage( true );
+		$current_memory  = memory_get_usage(true);
 		$memory_exceeded = $current_memory >= $memory_limit;
 
-		return apply_filters( 'action_scheduler_memory_exceeded', $memory_exceeded, $this );
+		return apply_filters('action_scheduler_memory_exceeded', $memory_exceeded, $this);
 	}
 
 	/**
@@ -224,8 +224,8 @@ 
 	 * @param int $processed_actions The number of actions processed so far - used to determine the likelihood of exceeding the time limit if processing another action
 	 * @return bool
 	 */
-	protected function batch_limits_exceeded( $processed_actions ) {
-		return $this->memory_exceeded() || $this->time_likely_to_be_exceeded( $processed_actions );
+	protected function batch_limits_exceeded($processed_actions) {
+		return $this->memory_exceeded() || $this->time_likely_to_be_exceeded($processed_actions);
 	}
 
 	/**
@@ -236,5 +236,5 @@ 
 	 *        Generally, this should be capitalised and not localised as it's a proper noun.
 	 * @return int The number of actions processed.
 	 */
-	abstract public function run( $context = '' );
+	abstract public function run($context = '');
 }