AyeCode / invoicing

includes/libraries/action-scheduler/classes/data-stores/ActionScheduler_wpCommentLogger.php

Indentation +232 added lines, -232 removed lines

@@ -4,237 +4,237 @@
  * Class ActionScheduler_wpCommentLogger
  */
 class ActionScheduler_wpCommentLogger extends ActionScheduler_Logger {
-	const AGENT = 'ActionScheduler';
-	const TYPE = 'action_log';
-
-	/**
-	 * @param string $action_id
-	 * @param string $message
-	 * @param DateTime $date
-	 *
-	 * @return string The log entry ID
-	 */
-	public function log( $action_id, $message, DateTime $date = NULL ) {
-		if ( empty($date) ) {
-			$date = as_get_datetime_object();
-		} else {
-			$date = as_get_datetime_object( clone $date );
-		}
-		$comment_id = $this->create_wp_comment( $action_id, $message, $date );
-		return $comment_id;
-	}
-
-	protected function create_wp_comment( $action_id, $message, DateTime $date ) {
-
-		$comment_date_gmt = $date->format('Y-m-d H:i:s');
-		ActionScheduler_TimezoneHelper::set_local_timezone( $date );
-		$comment_data = array(
-			'comment_post_ID' => $action_id,
-			'comment_date' => $date->format('Y-m-d H:i:s'),
-			'comment_date_gmt' => $comment_date_gmt,
-			'comment_author' => self::AGENT,
-			'comment_content' => $message,
-			'comment_agent' => self::AGENT,
-			'comment_type' => self::TYPE,
-		);
-		return wp_insert_comment($comment_data);
-	}
-
-	/**
-	 * @param string $entry_id
-	 *
-	 * @return ActionScheduler_LogEntry
-	 */
-	public function get_entry( $entry_id ) {
-		$comment = $this->get_comment( $entry_id );
-		if ( empty($comment) || $comment->comment_type != self::TYPE ) {
-			return new ActionScheduler_NullLogEntry();
-		}
-
-		$date = as_get_datetime_object( $comment->comment_date_gmt );
-		ActionScheduler_TimezoneHelper::set_local_timezone( $date );
-		return new ActionScheduler_LogEntry( $comment->comment_post_ID, $comment->comment_content, $date );
-	}
-
-	/**
-	 * @param string $action_id
-	 *
-	 * @return ActionScheduler_LogEntry[]
-	 */
-	public function get_logs( $action_id ) {
-		$status = 'all';
-		if ( get_post_status($action_id) == 'trash' ) {
-			$status = 'post-trashed';
-		}
-		$comments = get_comments(array(
-			'post_id' => $action_id,
-			'orderby' => 'comment_date_gmt',
-			'order' => 'ASC',
-			'type' => self::TYPE,
-			'status' => $status,
-		));
-		$logs = array();
-		foreach ( $comments as $c ) {
-			$entry = $this->get_entry( $c );
-			if ( !empty($entry) ) {
-				$logs[] = $entry;
-			}
-		}
-		return $logs;
-	}
-
-	protected function get_comment( $comment_id ) {
-		return get_comment( $comment_id );
-	}
-
-
-
-	/**
-	 * @param WP_Comment_Query $query
-	 */
-	public function filter_comment_queries( $query ) {
-		foreach ( array('ID', 'parent', 'post_author', 'post_name', 'post_parent', 'type', 'post_type', 'post_id', 'post_ID') as $key ) {
-			if ( !empty($query->query_vars[$key]) ) {
-				return; // don't slow down queries that wouldn't include action_log comments anyway
-			}
-		}
-		$query->query_vars['action_log_filter'] = TRUE;
-		add_filter( 'comments_clauses', array( $this, 'filter_comment_query_clauses' ), 10, 2 );
-	}
-
-	/**
-	 * @param array $clauses
-	 * @param WP_Comment_Query $query
-	 *
-	 * @return array
-	 */
-	public function filter_comment_query_clauses( $clauses, $query ) {
-		if ( !empty($query->query_vars['action_log_filter']) ) {
-			$clauses['where'] .= $this->get_where_clause();
-		}
-		return $clauses;
-	}
-
-	/**
-	 * Make sure Action Scheduler logs are excluded from comment feeds, which use WP_Query, not
-	 * the WP_Comment_Query class handled by @see self::filter_comment_queries().
-	 *
-	 * @param string $where
-	 * @param WP_Query $query
-	 *
-	 * @return string
-	 */
-	public function filter_comment_feed( $where, $query ) {
-		if ( is_comment_feed() ) {
-			$where .= $this->get_where_clause();
-		}
-		return $where;
-	}
-
-	/**
-	 * Return a SQL clause to exclude Action Scheduler comments.
-	 *
-	 * @return string
-	 */
-	protected function get_where_clause() {
-		global $wpdb;
-		return sprintf( " AND {$wpdb->comments}.comment_type != '%s'", self::TYPE );
-	}
-
-	/**
-	 * Remove action log entries from wp_count_comments()
-	 *
-	 * @param array $stats
-	 * @param int $post_id
-	 *
-	 * @return object
-	 */
-	public function filter_comment_count( $stats, $post_id ) {
-		global $wpdb;
-
-		if ( 0 === $post_id ) {
-			$stats = $this->get_comment_count();
-		}
-
-		return $stats;
-	}
-
-	/**
-	 * Retrieve the comment counts from our cache, or the database if the cached version isn't set.
-	 *
-	 * @return object
-	 */
-	protected function get_comment_count() {
-		global $wpdb;
-
-		$stats = get_transient( 'as_comment_count' );
-
-		if ( ! $stats ) {
-			$stats = array();
-
-			$count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN('order_note','action_log') GROUP BY comment_approved", ARRAY_A );
-
-			$total = 0;
-			$stats = array();
-			$approved = array( '0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed' );
-
-			foreach ( (array) $count as $row ) {
-				// Don't count post-trashed toward totals
-				if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] ) {
-					$total += $row['num_comments'];
-				}
-				if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-					$stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
-				}
-			}
-
-			$stats['total_comments'] = $total;
-			$stats['all']            = $total;
-
-			foreach ( $approved as $key ) {
-				if ( empty( $stats[ $key ] ) ) {
-					$stats[ $key ] = 0;
-				}
-			}
-
-			$stats = (object) $stats;
-			set_transient( 'as_comment_count', $stats );
-		}
-
-		return $stats;
-	}
-
-	/**
-	 * Delete comment count cache whenever there is new comment or the status of a comment changes. Cache
-	 * will be regenerated next time ActionScheduler_wpCommentLogger::filter_comment_count() is called.
-	 */
-	public function delete_comment_count_cache() {
-		delete_transient( 'as_comment_count' );
-	}
-
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public function init() {
-		add_action( 'action_scheduler_before_process_queue', array( $this, 'disable_comment_counting' ), 10, 0 );
-		add_action( 'action_scheduler_after_process_queue', array( $this, 'enable_comment_counting' ), 10, 0 );
-
-		parent::init();
-
-		add_action( 'pre_get_comments', array( $this, 'filter_comment_queries' ), 10, 1 );
-		add_action( 'wp_count_comments', array( $this, 'filter_comment_count' ), 20, 2 ); // run after WC_Comments::wp_count_comments() to make sure we exclude order notes and action logs
-		add_action( 'comment_feed_where', array( $this, 'filter_comment_feed' ), 10, 2 );
-
-		// Delete comments count cache whenever there is a new comment or a comment status changes
-		add_action( 'wp_insert_comment', array( $this, 'delete_comment_count_cache' ) );
-		add_action( 'wp_set_comment_status', array( $this, 'delete_comment_count_cache' ) );
-	}
-
-	public function disable_comment_counting() {
-		wp_defer_comment_counting(true);
-	}
-	public function enable_comment_counting() {
-		wp_defer_comment_counting(false);
-	}
+    const AGENT = 'ActionScheduler';
+    const TYPE = 'action_log';
+
+    /**
+     * @param string $action_id
+     * @param string $message
+     * @param DateTime $date
+     *
+     * @return string The log entry ID
+     */
+    public function log( $action_id, $message, DateTime $date = NULL ) {
+        if ( empty($date) ) {
+            $date = as_get_datetime_object();
+        } else {
+            $date = as_get_datetime_object( clone $date );
+        }
+        $comment_id = $this->create_wp_comment( $action_id, $message, $date );
+        return $comment_id;
+    }
+
+    protected function create_wp_comment( $action_id, $message, DateTime $date ) {
+
+        $comment_date_gmt = $date->format('Y-m-d H:i:s');
+        ActionScheduler_TimezoneHelper::set_local_timezone( $date );
+        $comment_data = array(
+            'comment_post_ID' => $action_id,
+            'comment_date' => $date->format('Y-m-d H:i:s'),
+            'comment_date_gmt' => $comment_date_gmt,
+            'comment_author' => self::AGENT,
+            'comment_content' => $message,
+            'comment_agent' => self::AGENT,
+            'comment_type' => self::TYPE,
+        );
+        return wp_insert_comment($comment_data);
+    }
+
+    /**
+     * @param string $entry_id
+     *
+     * @return ActionScheduler_LogEntry
+     */
+    public function get_entry( $entry_id ) {
+        $comment = $this->get_comment( $entry_id );
+        if ( empty($comment) || $comment->comment_type != self::TYPE ) {
+            return new ActionScheduler_NullLogEntry();
+        }
+
+        $date = as_get_datetime_object( $comment->comment_date_gmt );
+        ActionScheduler_TimezoneHelper::set_local_timezone( $date );
+        return new ActionScheduler_LogEntry( $comment->comment_post_ID, $comment->comment_content, $date );
+    }
+
+    /**
+     * @param string $action_id
+     *
+     * @return ActionScheduler_LogEntry[]
+     */
+    public function get_logs( $action_id ) {
+        $status = 'all';
+        if ( get_post_status($action_id) == 'trash' ) {
+            $status = 'post-trashed';
+        }
+        $comments = get_comments(array(
+            'post_id' => $action_id,
+            'orderby' => 'comment_date_gmt',
+            'order' => 'ASC',
+            'type' => self::TYPE,
+            'status' => $status,
+        ));
+        $logs = array();
+        foreach ( $comments as $c ) {
+            $entry = $this->get_entry( $c );
+            if ( !empty($entry) ) {
+                $logs[] = $entry;
+            }
+        }
+        return $logs;
+    }
+
+    protected function get_comment( $comment_id ) {
+        return get_comment( $comment_id );
+    }
+
+
+
+    /**
+     * @param WP_Comment_Query $query
+     */
+    public function filter_comment_queries( $query ) {
+        foreach ( array('ID', 'parent', 'post_author', 'post_name', 'post_parent', 'type', 'post_type', 'post_id', 'post_ID') as $key ) {
+            if ( !empty($query->query_vars[$key]) ) {
+                return; // don't slow down queries that wouldn't include action_log comments anyway
+            }
+        }
+        $query->query_vars['action_log_filter'] = TRUE;
+        add_filter( 'comments_clauses', array( $this, 'filter_comment_query_clauses' ), 10, 2 );
+    }
+
+    /**
+     * @param array $clauses
+     * @param WP_Comment_Query $query
+     *
+     * @return array
+     */
+    public function filter_comment_query_clauses( $clauses, $query ) {
+        if ( !empty($query->query_vars['action_log_filter']) ) {
+            $clauses['where'] .= $this->get_where_clause();
+        }
+        return $clauses;
+    }
+
+    /**
+     * Make sure Action Scheduler logs are excluded from comment feeds, which use WP_Query, not
+     * the WP_Comment_Query class handled by @see self::filter_comment_queries().
+     *
+     * @param string $where
+     * @param WP_Query $query
+     *
+     * @return string
+     */
+    public function filter_comment_feed( $where, $query ) {
+        if ( is_comment_feed() ) {
+            $where .= $this->get_where_clause();
+        }
+        return $where;
+    }
+
+    /**
+     * Return a SQL clause to exclude Action Scheduler comments.
+     *
+     * @return string
+     */
+    protected function get_where_clause() {
+        global $wpdb;
+        return sprintf( " AND {$wpdb->comments}.comment_type != '%s'", self::TYPE );
+    }
+
+    /**
+     * Remove action log entries from wp_count_comments()
+     *
+     * @param array $stats
+     * @param int $post_id
+     *
+     * @return object
+     */
+    public function filter_comment_count( $stats, $post_id ) {
+        global $wpdb;
+
+        if ( 0 === $post_id ) {
+            $stats = $this->get_comment_count();
+        }
+
+        return $stats;
+    }
+
+    /**
+     * Retrieve the comment counts from our cache, or the database if the cached version isn't set.
+     *
+     * @return object
+     */
+    protected function get_comment_count() {
+        global $wpdb;
+
+        $stats = get_transient( 'as_comment_count' );
+
+        if ( ! $stats ) {
+            $stats = array();
+
+            $count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN('order_note','action_log') GROUP BY comment_approved", ARRAY_A );
+
+            $total = 0;
+            $stats = array();
+            $approved = array( '0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed' );
+
+            foreach ( (array) $count as $row ) {
+                // Don't count post-trashed toward totals
+                if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] ) {
+                    $total += $row['num_comments'];
+                }
+                if ( isset( $approved[ $row['comment_approved'] ] ) ) {
+                    $stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+                }
+            }
+
+            $stats['total_comments'] = $total;
+            $stats['all']            = $total;
+
+            foreach ( $approved as $key ) {
+                if ( empty( $stats[ $key ] ) ) {
+                    $stats[ $key ] = 0;
+                }
+            }
+
+            $stats = (object) $stats;
+            set_transient( 'as_comment_count', $stats );
+        }
+
+        return $stats;
+    }
+
+    /**
+     * Delete comment count cache whenever there is new comment or the status of a comment changes. Cache
+     * will be regenerated next time ActionScheduler_wpCommentLogger::filter_comment_count() is called.
+     */
+    public function delete_comment_count_cache() {
+        delete_transient( 'as_comment_count' );
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function init() {
+        add_action( 'action_scheduler_before_process_queue', array( $this, 'disable_comment_counting' ), 10, 0 );
+        add_action( 'action_scheduler_after_process_queue', array( $this, 'enable_comment_counting' ), 10, 0 );
+
+        parent::init();
+
+        add_action( 'pre_get_comments', array( $this, 'filter_comment_queries' ), 10, 1 );
+        add_action( 'wp_count_comments', array( $this, 'filter_comment_count' ), 20, 2 ); // run after WC_Comments::wp_count_comments() to make sure we exclude order notes and action logs
+        add_action( 'comment_feed_where', array( $this, 'filter_comment_feed' ), 10, 2 );
+
+        // Delete comments count cache whenever there is a new comment or a comment status changes
+        add_action( 'wp_insert_comment', array( $this, 'delete_comment_count_cache' ) );
+        add_action( 'wp_set_comment_status', array( $this, 'delete_comment_count_cache' ) );
+    }
+
+    public function disable_comment_counting() {
+        wp_defer_comment_counting(true);
+    }
+    public function enable_comment_counting() {
+        wp_defer_comment_counting(false);
+    }
 
 }

Spacing +50 added lines, -50 removed lines

@@ -14,20 +14,20 @@ 
 	 *
 	 * @return string The log entry ID
 	 */
-	public function log( $action_id, $message, DateTime $date = NULL ) {
-		if ( empty($date) ) {
+	public function log($action_id, $message, DateTime $date = NULL) {
+		if (empty($date)) {
 			$date = as_get_datetime_object();
 		} else {
-			$date = as_get_datetime_object( clone $date );
+			$date = as_get_datetime_object(clone $date);
 		}
-		$comment_id = $this->create_wp_comment( $action_id, $message, $date );
+		$comment_id = $this->create_wp_comment($action_id, $message, $date);
 		return $comment_id;
 	}
 
-	protected function create_wp_comment( $action_id, $message, DateTime $date ) {
+	protected function create_wp_comment($action_id, $message, DateTime $date) {
 
 		$comment_date_gmt = $date->format('Y-m-d H:i:s');
-		ActionScheduler_TimezoneHelper::set_local_timezone( $date );
+		ActionScheduler_TimezoneHelper::set_local_timezone($date);
 		$comment_data = array(
 			'comment_post_ID' => $action_id,
 			'comment_date' => $date->format('Y-m-d H:i:s'),
@@ -45,15 +45,15 @@ 
 	 *
 	 * @return ActionScheduler_LogEntry
 	 */
-	public function get_entry( $entry_id ) {
-		$comment = $this->get_comment( $entry_id );
-		if ( empty($comment) || $comment->comment_type != self::TYPE ) {
+	public function get_entry($entry_id) {
+		$comment = $this->get_comment($entry_id);
+		if (empty($comment) || $comment->comment_type != self::TYPE) {
 			return new ActionScheduler_NullLogEntry();
 		}
 
-		$date = as_get_datetime_object( $comment->comment_date_gmt );
-		ActionScheduler_TimezoneHelper::set_local_timezone( $date );
-		return new ActionScheduler_LogEntry( $comment->comment_post_ID, $comment->comment_content, $date );
+		$date = as_get_datetime_object($comment->comment_date_gmt);
+		ActionScheduler_TimezoneHelper::set_local_timezone($date);
+		return new ActionScheduler_LogEntry($comment->comment_post_ID, $comment->comment_content, $date);
 	}
 
 	/**
@@ -61,9 +61,9 @@ 
 	 *
 	 * @return ActionScheduler_LogEntry[]
 	 */
-	public function get_logs( $action_id ) {
+	public function get_logs($action_id) {
 		$status = 'all';
-		if ( get_post_status($action_id) == 'trash' ) {
+		if (get_post_status($action_id) == 'trash') {
 			$status = 'post-trashed';
 		}
 		$comments = get_comments(array(
@@ -74,17 +74,17 @@ 
 			'status' => $status,
 		));
 		$logs = array();
-		foreach ( $comments as $c ) {
-			$entry = $this->get_entry( $c );
-			if ( !empty($entry) ) {
+		foreach ($comments as $c) {
+			$entry = $this->get_entry($c);
+			if (!empty($entry)) {
 				$logs[] = $entry;
 			}
 		}
 		return $logs;
 	}
 
-	protected function get_comment( $comment_id ) {
-		return get_comment( $comment_id );
+	protected function get_comment($comment_id) {
+		return get_comment($comment_id);
 	}
 
 
@@ -92,14 +92,14 @@ 
 	/**
 	 * @param WP_Comment_Query $query
 	 */
-	public function filter_comment_queries( $query ) {
-		foreach ( array('ID', 'parent', 'post_author', 'post_name', 'post_parent', 'type', 'post_type', 'post_id', 'post_ID') as $key ) {
-			if ( !empty($query->query_vars[$key]) ) {
+	public function filter_comment_queries($query) {
+		foreach (array('ID', 'parent', 'post_author', 'post_name', 'post_parent', 'type', 'post_type', 'post_id', 'post_ID') as $key) {
+			if (!empty($query->query_vars[$key])) {
 				return; // don't slow down queries that wouldn't include action_log comments anyway
 			}
 		}
 		$query->query_vars['action_log_filter'] = TRUE;
-		add_filter( 'comments_clauses', array( $this, 'filter_comment_query_clauses' ), 10, 2 );
+		add_filter('comments_clauses', array($this, 'filter_comment_query_clauses'), 10, 2);
 	}
 
 	/**
@@ -108,8 +108,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function filter_comment_query_clauses( $clauses, $query ) {
-		if ( !empty($query->query_vars['action_log_filter']) ) {
+	public function filter_comment_query_clauses($clauses, $query) {
+		if (!empty($query->query_vars['action_log_filter'])) {
 			$clauses['where'] .= $this->get_where_clause();
 		}
 		return $clauses;
@@ -124,8 +124,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function filter_comment_feed( $where, $query ) {
-		if ( is_comment_feed() ) {
+	public function filter_comment_feed($where, $query) {
+		if (is_comment_feed()) {
 			$where .= $this->get_where_clause();
 		}
 		return $where;
@@ -138,7 +138,7 @@ 
 	 */
 	protected function get_where_clause() {
 		global $wpdb;
-		return sprintf( " AND {$wpdb->comments}.comment_type != '%s'", self::TYPE );
+		return sprintf(" AND {$wpdb->comments}.comment_type != '%s'", self::TYPE);
 	}
 
 	/**
@@ -149,10 +149,10 @@ 
 	 *
 	 * @return object
 	 */
-	public function filter_comment_count( $stats, $post_id ) {
+	public function filter_comment_count($stats, $post_id) {
 		global $wpdb;
 
-		if ( 0 === $post_id ) {
+		if (0 === $post_id) {
 			$stats = $this->get_comment_count();
 		}
 
@@ -167,38 +167,38 @@ 
 	protected function get_comment_count() {
 		global $wpdb;
 
-		$stats = get_transient( 'as_comment_count' );
+		$stats = get_transient('as_comment_count');
 
-		if ( ! $stats ) {
+		if (!$stats) {
 			$stats = array();
 
-			$count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN('order_note','action_log') GROUP BY comment_approved", ARRAY_A );
+			$count = $wpdb->get_results("SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} WHERE comment_type NOT IN('order_note','action_log') GROUP BY comment_approved", ARRAY_A);
 
 			$total = 0;
 			$stats = array();
-			$approved = array( '0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed' );
+			$approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
 
-			foreach ( (array) $count as $row ) {
+			foreach ((array) $count as $row) {
 				// Don't count post-trashed toward totals
-				if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] ) {
+				if ('post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved']) {
 					$total += $row['num_comments'];
 				}
-				if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-					$stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+				if (isset($approved[$row['comment_approved']])) {
+					$stats[$approved[$row['comment_approved']]] = $row['num_comments'];
 				}
 			}
 
 			$stats['total_comments'] = $total;
 			$stats['all']            = $total;
 
-			foreach ( $approved as $key ) {
-				if ( empty( $stats[ $key ] ) ) {
-					$stats[ $key ] = 0;
+			foreach ($approved as $key) {
+				if (empty($stats[$key])) {
+					$stats[$key] = 0;
 				}
 			}
 
 			$stats = (object) $stats;
-			set_transient( 'as_comment_count', $stats );
+			set_transient('as_comment_count', $stats);
 		}
 
 		return $stats;
@@ -209,25 +209,25 @@ 
 	 * will be regenerated next time ActionScheduler_wpCommentLogger::filter_comment_count() is called.
 	 */
 	public function delete_comment_count_cache() {
-		delete_transient( 'as_comment_count' );
+		delete_transient('as_comment_count');
 	}
 
 	/**
 	 * @codeCoverageIgnore
 	 */
 	public function init() {
-		add_action( 'action_scheduler_before_process_queue', array( $this, 'disable_comment_counting' ), 10, 0 );
-		add_action( 'action_scheduler_after_process_queue', array( $this, 'enable_comment_counting' ), 10, 0 );
+		add_action('action_scheduler_before_process_queue', array($this, 'disable_comment_counting'), 10, 0);
+		add_action('action_scheduler_after_process_queue', array($this, 'enable_comment_counting'), 10, 0);
 
 		parent::init();
 
-		add_action( 'pre_get_comments', array( $this, 'filter_comment_queries' ), 10, 1 );
-		add_action( 'wp_count_comments', array( $this, 'filter_comment_count' ), 20, 2 ); // run after WC_Comments::wp_count_comments() to make sure we exclude order notes and action logs
-		add_action( 'comment_feed_where', array( $this, 'filter_comment_feed' ), 10, 2 );
+		add_action('pre_get_comments', array($this, 'filter_comment_queries'), 10, 1);
+		add_action('wp_count_comments', array($this, 'filter_comment_count'), 20, 2); // run after WC_Comments::wp_count_comments() to make sure we exclude order notes and action logs
+		add_action('comment_feed_where', array($this, 'filter_comment_feed'), 10, 2);
 
 		// Delete comments count cache whenever there is a new comment or a comment status changes
-		add_action( 'wp_insert_comment', array( $this, 'delete_comment_count_cache' ) );
-		add_action( 'wp_set_comment_status', array( $this, 'delete_comment_count_cache' ) );
+		add_action('wp_insert_comment', array($this, 'delete_comment_count_cache'));
+		add_action('wp_set_comment_status', array($this, 'delete_comment_count_cache'));
 	}
 
 	public function disable_comment_counting() {

includes/libraries/action-scheduler/classes/data-stores/ActionScheduler_wpPostStore.php

Indentation +844 added lines, -844 removed lines

@@ -4,857 +4,857 @@
  * Class ActionScheduler_wpPostStore
  */
 class ActionScheduler_wpPostStore extends ActionScheduler_Store {
-	const POST_TYPE = 'scheduled-action';
-	const GROUP_TAXONOMY = 'action-group';
-	const SCHEDULE_META_KEY = '_action_manager_schedule';
-	const DEPENDENCIES_MET = 'as-post-store-dependencies-met';
-
-	/** @var DateTimeZone */
-	protected $local_timezone = NULL;
-
-	public function save_action( ActionScheduler_Action $action, DateTime $scheduled_date = NULL ){
-		try {
-			$this->validate_action( $action );
-			$post_array = $this->create_post_array( $action, $scheduled_date );
-			$post_id = $this->save_post_array( $post_array );
-			$this->save_post_schedule( $post_id, $action->get_schedule() );
-			$this->save_action_group( $post_id, $action->get_group() );
-			do_action( 'action_scheduler_stored_action', $post_id );
-			return $post_id;
-		} catch ( Exception $e ) {
-			throw new RuntimeException( sprintf( __( 'Error saving action: %s', 'action-scheduler' ), $e->getMessage() ), 0 );
-		}
-	}
-
-	protected function create_post_array( ActionScheduler_Action $action, DateTime $scheduled_date = NULL ) {
-		$post = array(
-			'post_type' => self::POST_TYPE,
-			'post_title' => $action->get_hook(),
-			'post_content' => json_encode($action->get_args()),
-			'post_status' => ( $action->is_finished() ? 'publish' : 'pending' ),
-			'post_date_gmt' => $this->get_scheduled_date_string( $action, $scheduled_date ),
-			'post_date'     => $this->get_scheduled_date_string_local( $action, $scheduled_date ),
-		);
-		return $post;
-	}
-
-	protected function save_post_array( $post_array ) {
-		add_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10, 1 );
-		add_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10, 5 );
-
-		$has_kses = false !== has_filter( 'content_save_pre', 'wp_filter_post_kses' );
-
-		if ( $has_kses ) {
-			// Prevent KSES from corrupting JSON in post_content.
-			kses_remove_filters();
-		}
-
-		$post_id = wp_insert_post($post_array);
-
-		if ( $has_kses ) {
-			kses_init_filters();
-		}
-
-		remove_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10 );
-		remove_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10 );
-
-		if ( is_wp_error($post_id) || empty($post_id) ) {
-			throw new RuntimeException( __( 'Unable to save action.', 'action-scheduler' ) );
-		}
-		return $post_id;
-	}
-
-	public function filter_insert_post_data( $postdata ) {
-		if ( $postdata['post_type'] == self::POST_TYPE ) {
-			$postdata['post_author'] = 0;
-			if ( $postdata['post_status'] == 'future' ) {
-				$postdata['post_status'] = 'publish';
-			}
-		}
-		return $postdata;
-	}
-
-	/**
-	 * Create a (probably unique) post name for scheduled actions in a more performant manner than wp_unique_post_slug().
-	 *
-	 * When an action's post status is transitioned to something other than 'draft', 'pending' or 'auto-draft, like 'publish'
-	 * or 'failed' or 'trash', WordPress will find a unique slug (stored in post_name column) using the wp_unique_post_slug()
-	 * function. This is done to ensure URL uniqueness. The approach taken by wp_unique_post_slug() is to iterate over existing
-	 * post_name values that match, and append a number 1 greater than the largest. This makes sense when manually creating a
-	 * post from the Edit Post screen. It becomes a bottleneck when automatically processing thousands of actions, with a
-	 * database containing thousands of related post_name values.
-	 *
-	 * WordPress 5.1 introduces the 'pre_wp_unique_post_slug' filter for plugins to address this issue.
-	 *
-	 * We can short-circuit WordPress's wp_unique_post_slug() approach using the 'pre_wp_unique_post_slug' filter. This
-	 * method is available to be used as a callback on that filter. It provides a more scalable approach to generating a
-	 * post_name/slug that is probably unique. Because Action Scheduler never actually uses the post_name field, or an
-	 * action's slug, being probably unique is good enough.
-	 *
-	 * For more backstory on this issue, see:
-	 * - https://github.com/woocommerce/action-scheduler/issues/44 and
-	 * - https://core.trac.wordpress.org/ticket/21112
-	 *
-	 * @param string $override_slug Short-circuit return value.
-	 * @param string $slug          The desired slug (post_name).
-	 * @param int    $post_ID       Post ID.
-	 * @param string $post_status   The post status.
-	 * @param string $post_type     Post type.
-	 * @return string
-	 */
-	public function set_unique_post_slug( $override_slug, $slug, $post_ID, $post_status, $post_type ) {
-		if ( self::POST_TYPE == $post_type ) {
-			$override_slug = uniqid( self::POST_TYPE . '-', true ) . '-' . wp_generate_password( 32, false );
-		}
-		return $override_slug;
-	}
-
-	protected function save_post_schedule( $post_id, $schedule ) {
-		update_post_meta( $post_id, self::SCHEDULE_META_KEY, $schedule );
-	}
-
-	protected function save_action_group( $post_id, $group ) {
-		if ( empty($group) ) {
-			wp_set_object_terms( $post_id, array(), self::GROUP_TAXONOMY, FALSE );
-		} else {
-			wp_set_object_terms( $post_id, array($group), self::GROUP_TAXONOMY, FALSE );
-		}
-	}
-
-	public function fetch_action( $action_id ) {
-		$post = $this->get_post( $action_id );
-		if ( empty($post) || $post->post_type != self::POST_TYPE ) {
-			return $this->get_null_action();
-		}
-
-		try {
-			$action = $this->make_action_from_post( $post );
-		} catch ( ActionScheduler_InvalidActionException $exception ) {
-			do_action( 'action_scheduler_failed_fetch_action', $post->ID, $exception );
-			return $this->get_null_action();
-		}
-
-		return $action;
-	}
-
-	protected function get_post( $action_id ) {
-		if ( empty($action_id) ) {
-			return NULL;
-		}
-		return get_post($action_id);
-	}
-
-	protected function get_null_action() {
-		return new ActionScheduler_NullAction();
-	}
-
-	protected function make_action_from_post( $post ) {
-		$hook = $post->post_title;
-
-		$args = json_decode( $post->post_content, true );
-		$this->validate_args( $args, $post->ID );
-
-		$schedule = get_post_meta( $post->ID, self::SCHEDULE_META_KEY, true );
-		$this->validate_schedule( $schedule, $post->ID );
-
-		$group = wp_get_object_terms( $post->ID, self::GROUP_TAXONOMY, array('fields' => 'names') );
-		$group = empty( $group ) ? '' : reset($group);
-
-		return ActionScheduler::factory()->get_stored_action( $this->get_action_status_by_post_status( $post->post_status ), $hook, $args, $schedule, $group );
-	}
-
-	/**
-	 * @param string $post_status
-	 *
-	 * @throws InvalidArgumentException if $post_status not in known status fields returned by $this->get_status_labels()
-	 * @return string
-	 */
-	protected function get_action_status_by_post_status( $post_status ) {
-
-		switch ( $post_status ) {
-			case 'publish' :
-				$action_status = self::STATUS_COMPLETE;
-				break;
-			case 'trash' :
-				$action_status = self::STATUS_CANCELED;
-				break;
-			default :
-				if ( ! array_key_exists( $post_status, $this->get_status_labels() ) ) {
-					throw new InvalidArgumentException( sprintf( 'Invalid post status: "%s". No matching action status available.', $post_status ) );
-				}
-				$action_status = $post_status;
-				break;
-		}
-
-		return $action_status;
-	}
-
-	/**
-	 * @param string $action_status
-	 * @throws InvalidArgumentException if $post_status not in known status fields returned by $this->get_status_labels()
-	 * @return string
-	 */
-	protected function get_post_status_by_action_status( $action_status ) {
-
-		switch ( $action_status ) {
-			case self::STATUS_COMPLETE :
-				$post_status = 'publish';
-				break;
-			case self::STATUS_CANCELED :
-				$post_status = 'trash';
-				break;
-			default :
-				if ( ! array_key_exists( $action_status, $this->get_status_labels() ) ) {
-					throw new InvalidArgumentException( sprintf( 'Invalid action status: "%s".', $action_status ) );
-				}
-				$post_status = $action_status;
-				break;
-		}
-
-		return $post_status;
-	}
-
-	/**
-	 * @param string $hook
-	 * @param array $params
-	 *
-	 * @return string ID of the next action matching the criteria or NULL if not found
-	 */
-	public function find_action( $hook, $params = array() ) {
-		$params = wp_parse_args( $params, array(
-			'args' => NULL,
-			'status' => ActionScheduler_Store::STATUS_PENDING,
-			'group' => '',
-		));
-		/** @var wpdb $wpdb */
-		global $wpdb;
-		$query = "SELECT p.ID FROM {$wpdb->posts} p";
-		$args = array();
-		if ( !empty($params['group']) ) {
-			$query .= " INNER JOIN {$wpdb->term_relationships} tr ON tr.object_id=p.ID";
-			$query .= " INNER JOIN {$wpdb->term_taxonomy} tt ON tr.term_taxonomy_id=tt.term_taxonomy_id";
-			$query .= " INNER JOIN {$wpdb->terms} t ON tt.term_id=t.term_id AND t.slug=%s";
-			$args[] = $params['group'];
-		}
-		$query .= " WHERE p.post_title=%s";
-		$args[] = $hook;
-		$query .= " AND p.post_type=%s";
-		$args[] = self::POST_TYPE;
-		if ( !is_null($params['args']) ) {
-			$query .= " AND p.post_content=%s";
-			$args[] = json_encode($params['args']);
-		}
-
-		if ( ! empty( $params['status'] ) ) {
-			$query .= " AND p.post_status=%s";
-			$args[] = $this->get_post_status_by_action_status( $params['status'] );
-		}
-
-		switch ( $params['status'] ) {
-			case self::STATUS_COMPLETE:
-			case self::STATUS_RUNNING:
-			case self::STATUS_FAILED:
-				$order = 'DESC'; // Find the most recent action that matches
-				break;
-			case self::STATUS_PENDING:
-			default:
-				$order = 'ASC'; // Find the next action that matches
-				break;
-		}
-		$query .= " ORDER BY post_date_gmt $order LIMIT 1";
-
-		$query = $wpdb->prepare( $query, $args );
-
-		$id = $wpdb->get_var($query);
-		return $id;
-	}
-
-	/**
-	 * Returns the SQL statement to query (or count) actions.
-	 *
-	 * @param array $query Filtering options
-	 * @param string $select_or_count  Whether the SQL should select and return the IDs or just the row count
-	 * @throws InvalidArgumentException if $select_or_count not count or select
-	 * @return string SQL statement. The returned SQL is already properly escaped.
-	 */
-	protected function get_query_actions_sql( array $query, $select_or_count = 'select' ) {
-
-		if ( ! in_array( $select_or_count, array( 'select', 'count' ) ) ) {
-			throw new InvalidArgumentException( __( 'Invalid schedule. Cannot save action.', 'action-scheduler' ) );
-		}
-
-		$query = wp_parse_args( $query, array(
-			'hook' => '',
-			'args' => NULL,
-			'date' => NULL,
-			'date_compare' => '<=',
-			'modified' => NULL,
-			'modified_compare' => '<=',
-			'group' => '',
-			'status' => '',
-			'claimed' => NULL,
-			'per_page' => 5,
-			'offset' => 0,
-			'orderby' => 'date',
-			'order' => 'ASC',
-			'search' => '',
-		) );
-
-		/** @var wpdb $wpdb */
-		global $wpdb;
-		$sql  = ( 'count' === $select_or_count ) ? 'SELECT count(p.ID)' : 'SELECT p.ID ';
-		$sql .= "FROM {$wpdb->posts} p";
-		$sql_params = array();
-		if ( empty( $query['group'] ) && 'group' === $query['orderby'] ) {
-			$sql .= " LEFT JOIN {$wpdb->term_relationships} tr ON tr.object_id=p.ID";
-			$sql .= " LEFT JOIN {$wpdb->term_taxonomy} tt ON tr.term_taxonomy_id=tt.term_taxonomy_id";
-			$sql .= " LEFT JOIN {$wpdb->terms} t ON tt.term_id=t.term_id";
-		} elseif ( ! empty( $query['group'] ) ) {
-			$sql .= " INNER JOIN {$wpdb->term_relationships} tr ON tr.object_id=p.ID";
-			$sql .= " INNER JOIN {$wpdb->term_taxonomy} tt ON tr.term_taxonomy_id=tt.term_taxonomy_id";
-			$sql .= " INNER JOIN {$wpdb->terms} t ON tt.term_id=t.term_id";
-			$sql .= " AND t.slug=%s";
-			$sql_params[] = $query['group'];
-		}
-		$sql .= " WHERE post_type=%s";
-		$sql_params[] = self::POST_TYPE;
-		if ( $query['hook'] ) {
-			$sql .= " AND p.post_title=%s";
-			$sql_params[] = $query['hook'];
-		}
-		if ( !is_null($query['args']) ) {
-			$sql .= " AND p.post_content=%s";
-			$sql_params[] = json_encode($query['args']);
-		}
-
-		if ( ! empty( $query['status'] ) ) {
-			$sql .= " AND p.post_status=%s";
-			$sql_params[] = $this->get_post_status_by_action_status( $query['status'] );
-		}
-
-		if ( $query['date'] instanceof DateTime ) {
-			$date = clone $query['date'];
-			$date->setTimezone( new DateTimeZone('UTC') );
-			$date_string = $date->format('Y-m-d H:i:s');
-			$comparator = $this->validate_sql_comparator($query['date_compare']);
-			$sql .= " AND p.post_date_gmt $comparator %s";
-			$sql_params[] = $date_string;
-		}
-
-		if ( $query['modified'] instanceof DateTime ) {
-			$modified = clone $query['modified'];
-			$modified->setTimezone( new DateTimeZone('UTC') );
-			$date_string = $modified->format('Y-m-d H:i:s');
-			$comparator = $this->validate_sql_comparator($query['modified_compare']);
-			$sql .= " AND p.post_modified_gmt $comparator %s";
-			$sql_params[] = $date_string;
-		}
-
-		if ( $query['claimed'] === TRUE ) {
-			$sql .= " AND p.post_password != ''";
-		} elseif ( $query['claimed'] === FALSE ) {
-			$sql .= " AND p.post_password = ''";
-		} elseif ( !is_null($query['claimed']) ) {
-			$sql .= " AND p.post_password = %s";
-			$sql_params[] = $query['claimed'];
-		}
-
-		if ( ! empty( $query['search'] ) ) {
-			$sql .= " AND (p.post_title LIKE %s OR p.post_content LIKE %s OR p.post_password LIKE %s)";
-			for( $i = 0; $i < 3; $i++ ) {
-				$sql_params[] = sprintf( '%%%s%%', $query['search'] );
-			}
-		}
-
-		if ( 'select' === $select_or_count ) {
-			switch ( $query['orderby'] ) {
-				case 'hook':
-					$orderby = 'p.post_title';
-					break;
-				case 'group':
-					$orderby = 't.name';
-					break;
-				case 'status':
-					$orderby = 'p.post_status';
-					break;
-				case 'modified':
-					$orderby = 'p.post_modified';
-					break;
-				case 'claim_id':
-					$orderby = 'p.post_password';
-					break;
-				case 'schedule':
-				case 'date':
-				default:
-					$orderby = 'p.post_date_gmt';
-					break;
-			}
-			if ( 'ASC' === strtoupper( $query['order'] ) ) {
-				$order = 'ASC';
-			} else {
-				$order = 'DESC';
-			}
-			$sql .= " ORDER BY $orderby $order";
-			if ( $query['per_page'] > 0 ) {
-				$sql .= " LIMIT %d, %d";
-				$sql_params[] = $query['offset'];
-				$sql_params[] = $query['per_page'];
-			}
-		}
-
-		return $wpdb->prepare( $sql, $sql_params );
-	}
-
-	/**
-	 * @param array $query
-	 * @param string $query_type Whether to select or count the results. Default, select.
-	 * @return string|array The IDs of actions matching the query
-	 */
-	public function query_actions( $query = array(), $query_type = 'select' ) {
-		/** @var wpdb $wpdb */
-		global $wpdb;
-
-		$sql = $this->get_query_actions_sql( $query, $query_type );
-
-		return ( 'count' === $query_type ) ? $wpdb->get_var( $sql ) : $wpdb->get_col( $sql );
-	}
-
-	/**
-	 * Get a count of all actions in the store, grouped by status
-	 *
-	 * @return array
-	 */
-	public function action_counts() {
-
-		$action_counts_by_status = array();
-		$action_stati_and_labels = $this->get_status_labels();
-		$posts_count_by_status   = (array) wp_count_posts( self::POST_TYPE, 'readable' );
-
-		foreach ( $posts_count_by_status as $post_status_name => $count ) {
-
-			try {
-				$action_status_name = $this->get_action_status_by_post_status( $post_status_name );
-			} catch ( Exception $e ) {
-				// Ignore any post statuses that aren't for actions
-				continue;
-			}
-			if ( array_key_exists( $action_status_name, $action_stati_and_labels ) ) {
-				$action_counts_by_status[ $action_status_name ] = $count;
-			}
-		}
-
-		return $action_counts_by_status;
-	}
-
-	/**
-	 * @param string $action_id
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	public function cancel_action( $action_id ) {
-		$post = get_post( $action_id );
-		if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
-			throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
-		}
-		do_action( 'action_scheduler_canceled_action', $action_id );
-		add_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10, 5 );
-		wp_trash_post( $action_id );
-		remove_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10 );
-	}
-
-	public function delete_action( $action_id ) {
-		$post = get_post( $action_id );
-		if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
-			throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
-		}
-		do_action( 'action_scheduler_deleted_action', $action_id );
-
-		wp_delete_post( $action_id, TRUE );
-	}
-
-	/**
-	 * @param string $action_id
-	 *
-	 * @throws InvalidArgumentException
-	 * @return ActionScheduler_DateTime The date the action is schedule to run, or the date that it ran.
-	 */
-	public function get_date( $action_id ) {
-		$next = $this->get_date_gmt( $action_id );
-		return ActionScheduler_TimezoneHelper::set_local_timezone( $next );
-	}
-
-	/**
-	 * @param string $action_id
-	 *
-	 * @throws InvalidArgumentException
-	 * @return ActionScheduler_DateTime The date the action is schedule to run, or the date that it ran.
-	 */
-	public function get_date_gmt( $action_id ) {
-		$post = get_post( $action_id );
-		if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
-			throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
-		}
-		if ( $post->post_status == 'publish' ) {
-			return as_get_datetime_object( $post->post_modified_gmt );
-		} else {
-			return as_get_datetime_object( $post->post_date_gmt );
-		}
-	}
-
-	/**
-	 * @param int      $max_actions
-	 * @param DateTime $before_date Jobs must be schedule before this date. Defaults to now.
-	 * @param array    $hooks       Claim only actions with a hook or hooks.
-	 * @param string   $group       Claim only actions in the given group.
-	 *
-	 * @return ActionScheduler_ActionClaim
-	 * @throws RuntimeException When there is an error staking a claim.
-	 * @throws InvalidArgumentException When the given group is not valid.
-	 */
-	public function stake_claim( $max_actions = 10, DateTime $before_date = null, $hooks = array(), $group = '' ) {
-		$claim_id = $this->generate_claim_id();
-		$this->claim_actions( $claim_id, $max_actions, $before_date, $hooks, $group );
-		$action_ids = $this->find_actions_by_claim_id( $claim_id );
-
-		return new ActionScheduler_ActionClaim( $claim_id, $action_ids );
-	}
-
-	/**
-	 * @return int
-	 */
-	public function get_claim_count(){
-		global $wpdb;
-
-		$sql = "SELECT COUNT(DISTINCT post_password) FROM {$wpdb->posts} WHERE post_password != '' AND post_type = %s AND post_status IN ('in-progress','pending')";
-		$sql = $wpdb->prepare( $sql, array( self::POST_TYPE ) );
-
-		return $wpdb->get_var( $sql );
-	}
-
-	protected function generate_claim_id() {
-		$claim_id = md5(microtime(true) . rand(0,1000));
-		return substr($claim_id, 0, 20); // to fit in db field with 20 char limit
-	}
-
-	/**
-	 * @param string   $claim_id
-	 * @param int      $limit
-	 * @param DateTime $before_date Should use UTC timezone.
-	 * @param array    $hooks       Claim only actions with a hook or hooks.
-	 * @param string   $group       Claim only actions in the given group.
-	 *
-	 * @return int The number of actions that were claimed
-	 * @throws RuntimeException When there is a database error.
-	 * @throws InvalidArgumentException When the group is invalid.
-	 */
-	protected function claim_actions( $claim_id, $limit, DateTime $before_date = null, $hooks = array(), $group = '' ) {
-		// Set up initial variables.
-		$date      = null === $before_date ? as_get_datetime_object() : clone $before_date;
-		$limit_ids = ! empty( $group );
-		$ids       = $limit_ids ? $this->get_actions_by_group( $group, $limit, $date ) : array();
-
-		// If limiting by IDs and no posts found, then return early since we have nothing to update.
-		if ( $limit_ids && 0 === count( $ids ) ) {
-			return 0;
-		}
-
-		/** @var wpdb $wpdb */
-		global $wpdb;
-
-		/*
+    const POST_TYPE = 'scheduled-action';
+    const GROUP_TAXONOMY = 'action-group';
+    const SCHEDULE_META_KEY = '_action_manager_schedule';
+    const DEPENDENCIES_MET = 'as-post-store-dependencies-met';
+
+    /** @var DateTimeZone */
+    protected $local_timezone = NULL;
+
+    public function save_action( ActionScheduler_Action $action, DateTime $scheduled_date = NULL ){
+        try {
+            $this->validate_action( $action );
+            $post_array = $this->create_post_array( $action, $scheduled_date );
+            $post_id = $this->save_post_array( $post_array );
+            $this->save_post_schedule( $post_id, $action->get_schedule() );
+            $this->save_action_group( $post_id, $action->get_group() );
+            do_action( 'action_scheduler_stored_action', $post_id );
+            return $post_id;
+        } catch ( Exception $e ) {
+            throw new RuntimeException( sprintf( __( 'Error saving action: %s', 'action-scheduler' ), $e->getMessage() ), 0 );
+        }
+    }
+
+    protected function create_post_array( ActionScheduler_Action $action, DateTime $scheduled_date = NULL ) {
+        $post = array(
+            'post_type' => self::POST_TYPE,
+            'post_title' => $action->get_hook(),
+            'post_content' => json_encode($action->get_args()),
+            'post_status' => ( $action->is_finished() ? 'publish' : 'pending' ),
+            'post_date_gmt' => $this->get_scheduled_date_string( $action, $scheduled_date ),
+            'post_date'     => $this->get_scheduled_date_string_local( $action, $scheduled_date ),
+        );
+        return $post;
+    }
+
+    protected function save_post_array( $post_array ) {
+        add_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10, 1 );
+        add_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10, 5 );
+
+        $has_kses = false !== has_filter( 'content_save_pre', 'wp_filter_post_kses' );
+
+        if ( $has_kses ) {
+            // Prevent KSES from corrupting JSON in post_content.
+            kses_remove_filters();
+        }
+
+        $post_id = wp_insert_post($post_array);
+
+        if ( $has_kses ) {
+            kses_init_filters();
+        }
+
+        remove_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10 );
+        remove_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10 );
+
+        if ( is_wp_error($post_id) || empty($post_id) ) {
+            throw new RuntimeException( __( 'Unable to save action.', 'action-scheduler' ) );
+        }
+        return $post_id;
+    }
+
+    public function filter_insert_post_data( $postdata ) {
+        if ( $postdata['post_type'] == self::POST_TYPE ) {
+            $postdata['post_author'] = 0;
+            if ( $postdata['post_status'] == 'future' ) {
+                $postdata['post_status'] = 'publish';
+            }
+        }
+        return $postdata;
+    }
+
+    /**
+     * Create a (probably unique) post name for scheduled actions in a more performant manner than wp_unique_post_slug().
+     *
+     * When an action's post status is transitioned to something other than 'draft', 'pending' or 'auto-draft, like 'publish'
+     * or 'failed' or 'trash', WordPress will find a unique slug (stored in post_name column) using the wp_unique_post_slug()
+     * function. This is done to ensure URL uniqueness. The approach taken by wp_unique_post_slug() is to iterate over existing
+     * post_name values that match, and append a number 1 greater than the largest. This makes sense when manually creating a
+     * post from the Edit Post screen. It becomes a bottleneck when automatically processing thousands of actions, with a
+     * database containing thousands of related post_name values.
+     *
+     * WordPress 5.1 introduces the 'pre_wp_unique_post_slug' filter for plugins to address this issue.
+     *
+     * We can short-circuit WordPress's wp_unique_post_slug() approach using the 'pre_wp_unique_post_slug' filter. This
+     * method is available to be used as a callback on that filter. It provides a more scalable approach to generating a
+     * post_name/slug that is probably unique. Because Action Scheduler never actually uses the post_name field, or an
+     * action's slug, being probably unique is good enough.
+     *
+     * For more backstory on this issue, see:
+     * - https://github.com/woocommerce/action-scheduler/issues/44 and
+     * - https://core.trac.wordpress.org/ticket/21112
+     *
+     * @param string $override_slug Short-circuit return value.
+     * @param string $slug          The desired slug (post_name).
+     * @param int    $post_ID       Post ID.
+     * @param string $post_status   The post status.
+     * @param string $post_type     Post type.
+     * @return string
+     */
+    public function set_unique_post_slug( $override_slug, $slug, $post_ID, $post_status, $post_type ) {
+        if ( self::POST_TYPE == $post_type ) {
+            $override_slug = uniqid( self::POST_TYPE . '-', true ) . '-' . wp_generate_password( 32, false );
+        }
+        return $override_slug;
+    }
+
+    protected function save_post_schedule( $post_id, $schedule ) {
+        update_post_meta( $post_id, self::SCHEDULE_META_KEY, $schedule );
+    }
+
+    protected function save_action_group( $post_id, $group ) {
+        if ( empty($group) ) {
+            wp_set_object_terms( $post_id, array(), self::GROUP_TAXONOMY, FALSE );
+        } else {
+            wp_set_object_terms( $post_id, array($group), self::GROUP_TAXONOMY, FALSE );
+        }
+    }
+
+    public function fetch_action( $action_id ) {
+        $post = $this->get_post( $action_id );
+        if ( empty($post) || $post->post_type != self::POST_TYPE ) {
+            return $this->get_null_action();
+        }
+
+        try {
+            $action = $this->make_action_from_post( $post );
+        } catch ( ActionScheduler_InvalidActionException $exception ) {
+            do_action( 'action_scheduler_failed_fetch_action', $post->ID, $exception );
+            return $this->get_null_action();
+        }
+
+        return $action;
+    }
+
+    protected function get_post( $action_id ) {
+        if ( empty($action_id) ) {
+            return NULL;
+        }
+        return get_post($action_id);
+    }
+
+    protected function get_null_action() {
+        return new ActionScheduler_NullAction();
+    }
+
+    protected function make_action_from_post( $post ) {
+        $hook = $post->post_title;
+
+        $args = json_decode( $post->post_content, true );
+        $this->validate_args( $args, $post->ID );
+
+        $schedule = get_post_meta( $post->ID, self::SCHEDULE_META_KEY, true );
+        $this->validate_schedule( $schedule, $post->ID );
+
+        $group = wp_get_object_terms( $post->ID, self::GROUP_TAXONOMY, array('fields' => 'names') );
+        $group = empty( $group ) ? '' : reset($group);
+
+        return ActionScheduler::factory()->get_stored_action( $this->get_action_status_by_post_status( $post->post_status ), $hook, $args, $schedule, $group );
+    }
+
+    /**
+     * @param string $post_status
+     *
+     * @throws InvalidArgumentException if $post_status not in known status fields returned by $this->get_status_labels()
+     * @return string
+     */
+    protected function get_action_status_by_post_status( $post_status ) {
+
+        switch ( $post_status ) {
+            case 'publish' :
+                $action_status = self::STATUS_COMPLETE;
+                break;
+            case 'trash' :
+                $action_status = self::STATUS_CANCELED;
+                break;
+            default :
+                if ( ! array_key_exists( $post_status, $this->get_status_labels() ) ) {
+                    throw new InvalidArgumentException( sprintf( 'Invalid post status: "%s". No matching action status available.', $post_status ) );
+                }
+                $action_status = $post_status;
+                break;
+        }
+
+        return $action_status;
+    }
+
+    /**
+     * @param string $action_status
+     * @throws InvalidArgumentException if $post_status not in known status fields returned by $this->get_status_labels()
+     * @return string
+     */
+    protected function get_post_status_by_action_status( $action_status ) {
+
+        switch ( $action_status ) {
+            case self::STATUS_COMPLETE :
+                $post_status = 'publish';
+                break;
+            case self::STATUS_CANCELED :
+                $post_status = 'trash';
+                break;
+            default :
+                if ( ! array_key_exists( $action_status, $this->get_status_labels() ) ) {
+                    throw new InvalidArgumentException( sprintf( 'Invalid action status: "%s".', $action_status ) );
+                }
+                $post_status = $action_status;
+                break;
+        }
+
+        return $post_status;
+    }
+
+    /**
+     * @param string $hook
+     * @param array $params
+     *
+     * @return string ID of the next action matching the criteria or NULL if not found
+     */
+    public function find_action( $hook, $params = array() ) {
+        $params = wp_parse_args( $params, array(
+            'args' => NULL,
+            'status' => ActionScheduler_Store::STATUS_PENDING,
+            'group' => '',
+        ));
+        /** @var wpdb $wpdb */
+        global $wpdb;
+        $query = "SELECT p.ID FROM {$wpdb->posts} p";
+        $args = array();
+        if ( !empty($params['group']) ) {
+            $query .= " INNER JOIN {$wpdb->term_relationships} tr ON tr.object_id=p.ID";
+            $query .= " INNER JOIN {$wpdb->term_taxonomy} tt ON tr.term_taxonomy_id=tt.term_taxonomy_id";
+            $query .= " INNER JOIN {$wpdb->terms} t ON tt.term_id=t.term_id AND t.slug=%s";
+            $args[] = $params['group'];
+        }
+        $query .= " WHERE p.post_title=%s";
+        $args[] = $hook;
+        $query .= " AND p.post_type=%s";
+        $args[] = self::POST_TYPE;
+        if ( !is_null($params['args']) ) {
+            $query .= " AND p.post_content=%s";
+            $args[] = json_encode($params['args']);
+        }
+
+        if ( ! empty( $params['status'] ) ) {
+            $query .= " AND p.post_status=%s";
+            $args[] = $this->get_post_status_by_action_status( $params['status'] );
+        }
+
+        switch ( $params['status'] ) {
+            case self::STATUS_COMPLETE:
+            case self::STATUS_RUNNING:
+            case self::STATUS_FAILED:
+                $order = 'DESC'; // Find the most recent action that matches
+                break;
+            case self::STATUS_PENDING:
+            default:
+                $order = 'ASC'; // Find the next action that matches
+                break;
+        }
+        $query .= " ORDER BY post_date_gmt $order LIMIT 1";
+
+        $query = $wpdb->prepare( $query, $args );
+
+        $id = $wpdb->get_var($query);
+        return $id;
+    }
+
+    /**
+     * Returns the SQL statement to query (or count) actions.
+     *
+     * @param array $query Filtering options
+     * @param string $select_or_count  Whether the SQL should select and return the IDs or just the row count
+     * @throws InvalidArgumentException if $select_or_count not count or select
+     * @return string SQL statement. The returned SQL is already properly escaped.
+     */
+    protected function get_query_actions_sql( array $query, $select_or_count = 'select' ) {
+
+        if ( ! in_array( $select_or_count, array( 'select', 'count' ) ) ) {
+            throw new InvalidArgumentException( __( 'Invalid schedule. Cannot save action.', 'action-scheduler' ) );
+        }
+
+        $query = wp_parse_args( $query, array(
+            'hook' => '',
+            'args' => NULL,
+            'date' => NULL,
+            'date_compare' => '<=',
+            'modified' => NULL,
+            'modified_compare' => '<=',
+            'group' => '',
+            'status' => '',
+            'claimed' => NULL,
+            'per_page' => 5,
+            'offset' => 0,
+            'orderby' => 'date',
+            'order' => 'ASC',
+            'search' => '',
+        ) );
+
+        /** @var wpdb $wpdb */
+        global $wpdb;
+        $sql  = ( 'count' === $select_or_count ) ? 'SELECT count(p.ID)' : 'SELECT p.ID ';
+        $sql .= "FROM {$wpdb->posts} p";
+        $sql_params = array();
+        if ( empty( $query['group'] ) && 'group' === $query['orderby'] ) {
+            $sql .= " LEFT JOIN {$wpdb->term_relationships} tr ON tr.object_id=p.ID";
+            $sql .= " LEFT JOIN {$wpdb->term_taxonomy} tt ON tr.term_taxonomy_id=tt.term_taxonomy_id";
+            $sql .= " LEFT JOIN {$wpdb->terms} t ON tt.term_id=t.term_id";
+        } elseif ( ! empty( $query['group'] ) ) {
+            $sql .= " INNER JOIN {$wpdb->term_relationships} tr ON tr.object_id=p.ID";
+            $sql .= " INNER JOIN {$wpdb->term_taxonomy} tt ON tr.term_taxonomy_id=tt.term_taxonomy_id";
+            $sql .= " INNER JOIN {$wpdb->terms} t ON tt.term_id=t.term_id";
+            $sql .= " AND t.slug=%s";
+            $sql_params[] = $query['group'];
+        }
+        $sql .= " WHERE post_type=%s";
+        $sql_params[] = self::POST_TYPE;
+        if ( $query['hook'] ) {
+            $sql .= " AND p.post_title=%s";
+            $sql_params[] = $query['hook'];
+        }
+        if ( !is_null($query['args']) ) {
+            $sql .= " AND p.post_content=%s";
+            $sql_params[] = json_encode($query['args']);
+        }
+
+        if ( ! empty( $query['status'] ) ) {
+            $sql .= " AND p.post_status=%s";
+            $sql_params[] = $this->get_post_status_by_action_status( $query['status'] );
+        }
+
+        if ( $query['date'] instanceof DateTime ) {
+            $date = clone $query['date'];
+            $date->setTimezone( new DateTimeZone('UTC') );
+            $date_string = $date->format('Y-m-d H:i:s');
+            $comparator = $this->validate_sql_comparator($query['date_compare']);
+            $sql .= " AND p.post_date_gmt $comparator %s";
+            $sql_params[] = $date_string;
+        }
+
+        if ( $query['modified'] instanceof DateTime ) {
+            $modified = clone $query['modified'];
+            $modified->setTimezone( new DateTimeZone('UTC') );
+            $date_string = $modified->format('Y-m-d H:i:s');
+            $comparator = $this->validate_sql_comparator($query['modified_compare']);
+            $sql .= " AND p.post_modified_gmt $comparator %s";
+            $sql_params[] = $date_string;
+        }
+
+        if ( $query['claimed'] === TRUE ) {
+            $sql .= " AND p.post_password != ''";
+        } elseif ( $query['claimed'] === FALSE ) {
+            $sql .= " AND p.post_password = ''";
+        } elseif ( !is_null($query['claimed']) ) {
+            $sql .= " AND p.post_password = %s";
+            $sql_params[] = $query['claimed'];
+        }
+
+        if ( ! empty( $query['search'] ) ) {
+            $sql .= " AND (p.post_title LIKE %s OR p.post_content LIKE %s OR p.post_password LIKE %s)";
+            for( $i = 0; $i < 3; $i++ ) {
+                $sql_params[] = sprintf( '%%%s%%', $query['search'] );
+            }
+        }
+
+        if ( 'select' === $select_or_count ) {
+            switch ( $query['orderby'] ) {
+                case 'hook':
+                    $orderby = 'p.post_title';
+                    break;
+                case 'group':
+                    $orderby = 't.name';
+                    break;
+                case 'status':
+                    $orderby = 'p.post_status';
+                    break;
+                case 'modified':
+                    $orderby = 'p.post_modified';
+                    break;
+                case 'claim_id':
+                    $orderby = 'p.post_password';
+                    break;
+                case 'schedule':
+                case 'date':
+                default:
+                    $orderby = 'p.post_date_gmt';
+                    break;
+            }
+            if ( 'ASC' === strtoupper( $query['order'] ) ) {
+                $order = 'ASC';
+            } else {
+                $order = 'DESC';
+            }
+            $sql .= " ORDER BY $orderby $order";
+            if ( $query['per_page'] > 0 ) {
+                $sql .= " LIMIT %d, %d";
+                $sql_params[] = $query['offset'];
+                $sql_params[] = $query['per_page'];
+            }
+        }
+
+        return $wpdb->prepare( $sql, $sql_params );
+    }
+
+    /**
+     * @param array $query
+     * @param string $query_type Whether to select or count the results. Default, select.
+     * @return string|array The IDs of actions matching the query
+     */
+    public function query_actions( $query = array(), $query_type = 'select' ) {
+        /** @var wpdb $wpdb */
+        global $wpdb;
+
+        $sql = $this->get_query_actions_sql( $query, $query_type );
+
+        return ( 'count' === $query_type ) ? $wpdb->get_var( $sql ) : $wpdb->get_col( $sql );
+    }
+
+    /**
+     * Get a count of all actions in the store, grouped by status
+     *
+     * @return array
+     */
+    public function action_counts() {
+
+        $action_counts_by_status = array();
+        $action_stati_and_labels = $this->get_status_labels();
+        $posts_count_by_status   = (array) wp_count_posts( self::POST_TYPE, 'readable' );
+
+        foreach ( $posts_count_by_status as $post_status_name => $count ) {
+
+            try {
+                $action_status_name = $this->get_action_status_by_post_status( $post_status_name );
+            } catch ( Exception $e ) {
+                // Ignore any post statuses that aren't for actions
+                continue;
+            }
+            if ( array_key_exists( $action_status_name, $action_stati_and_labels ) ) {
+                $action_counts_by_status[ $action_status_name ] = $count;
+            }
+        }
+
+        return $action_counts_by_status;
+    }
+
+    /**
+     * @param string $action_id
+     *
+     * @throws InvalidArgumentException
+     */
+    public function cancel_action( $action_id ) {
+        $post = get_post( $action_id );
+        if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
+            throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
+        }
+        do_action( 'action_scheduler_canceled_action', $action_id );
+        add_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10, 5 );
+        wp_trash_post( $action_id );
+        remove_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10 );
+    }
+
+    public function delete_action( $action_id ) {
+        $post = get_post( $action_id );
+        if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
+            throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
+        }
+        do_action( 'action_scheduler_deleted_action', $action_id );
+
+        wp_delete_post( $action_id, TRUE );
+    }
+
+    /**
+     * @param string $action_id
+     *
+     * @throws InvalidArgumentException
+     * @return ActionScheduler_DateTime The date the action is schedule to run, or the date that it ran.
+     */
+    public function get_date( $action_id ) {
+        $next = $this->get_date_gmt( $action_id );
+        return ActionScheduler_TimezoneHelper::set_local_timezone( $next );
+    }
+
+    /**
+     * @param string $action_id
+     *
+     * @throws InvalidArgumentException
+     * @return ActionScheduler_DateTime The date the action is schedule to run, or the date that it ran.
+     */
+    public function get_date_gmt( $action_id ) {
+        $post = get_post( $action_id );
+        if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
+            throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
+        }
+        if ( $post->post_status == 'publish' ) {
+            return as_get_datetime_object( $post->post_modified_gmt );
+        } else {
+            return as_get_datetime_object( $post->post_date_gmt );
+        }
+    }
+
+    /**
+     * @param int      $max_actions
+     * @param DateTime $before_date Jobs must be schedule before this date. Defaults to now.
+     * @param array    $hooks       Claim only actions with a hook or hooks.
+     * @param string   $group       Claim only actions in the given group.
+     *
+     * @return ActionScheduler_ActionClaim
+     * @throws RuntimeException When there is an error staking a claim.
+     * @throws InvalidArgumentException When the given group is not valid.
+     */
+    public function stake_claim( $max_actions = 10, DateTime $before_date = null, $hooks = array(), $group = '' ) {
+        $claim_id = $this->generate_claim_id();
+        $this->claim_actions( $claim_id, $max_actions, $before_date, $hooks, $group );
+        $action_ids = $this->find_actions_by_claim_id( $claim_id );
+
+        return new ActionScheduler_ActionClaim( $claim_id, $action_ids );
+    }
+
+    /**
+     * @return int
+     */
+    public function get_claim_count(){
+        global $wpdb;
+
+        $sql = "SELECT COUNT(DISTINCT post_password) FROM {$wpdb->posts} WHERE post_password != '' AND post_type = %s AND post_status IN ('in-progress','pending')";
+        $sql = $wpdb->prepare( $sql, array( self::POST_TYPE ) );
+
+        return $wpdb->get_var( $sql );
+    }
+
+    protected function generate_claim_id() {
+        $claim_id = md5(microtime(true) . rand(0,1000));
+        return substr($claim_id, 0, 20); // to fit in db field with 20 char limit
+    }
+
+    /**
+     * @param string   $claim_id
+     * @param int      $limit
+     * @param DateTime $before_date Should use UTC timezone.
+     * @param array    $hooks       Claim only actions with a hook or hooks.
+     * @param string   $group       Claim only actions in the given group.
+     *
+     * @return int The number of actions that were claimed
+     * @throws RuntimeException When there is a database error.
+     * @throws InvalidArgumentException When the group is invalid.
+     */
+    protected function claim_actions( $claim_id, $limit, DateTime $before_date = null, $hooks = array(), $group = '' ) {
+        // Set up initial variables.
+        $date      = null === $before_date ? as_get_datetime_object() : clone $before_date;
+        $limit_ids = ! empty( $group );
+        $ids       = $limit_ids ? $this->get_actions_by_group( $group, $limit, $date ) : array();
+
+        // If limiting by IDs and no posts found, then return early since we have nothing to update.
+        if ( $limit_ids && 0 === count( $ids ) ) {
+            return 0;
+        }
+
+        /** @var wpdb $wpdb */
+        global $wpdb;
+
+        /*
 		 * Build up custom query to update the affected posts. Parameters are built as a separate array
 		 * to make it easier to identify where they are in the query.
 		 *
 		 * We can't use $wpdb->update() here because of the "ID IN ..." clause.
 		 */
-		$update = "UPDATE {$wpdb->posts} SET post_password = %s, post_modified_gmt = %s, post_modified = %s";
-		$params = array(
-			$claim_id,
-			current_time( 'mysql', true ),
-			current_time( 'mysql' ),
-		);
-
-		// Build initial WHERE clause.
-		$where    = "WHERE post_type = %s AND post_status = %s AND post_password = ''";
-		$params[] = self::POST_TYPE;
-		$params[] = ActionScheduler_Store::STATUS_PENDING;
-
-		if ( ! empty( $hooks ) ) {
-			$placeholders = array_fill( 0, count( $hooks ), '%s' );
-			$where       .= ' AND post_title IN (' . join( ', ', $placeholders ) . ')';
-			$params       = array_merge( $params, array_values( $hooks ) );
-		}
-
-		/*
+        $update = "UPDATE {$wpdb->posts} SET post_password = %s, post_modified_gmt = %s, post_modified = %s";
+        $params = array(
+            $claim_id,
+            current_time( 'mysql', true ),
+            current_time( 'mysql' ),
+        );
+
+        // Build initial WHERE clause.
+        $where    = "WHERE post_type = %s AND post_status = %s AND post_password = ''";
+        $params[] = self::POST_TYPE;
+        $params[] = ActionScheduler_Store::STATUS_PENDING;
+
+        if ( ! empty( $hooks ) ) {
+            $placeholders = array_fill( 0, count( $hooks ), '%s' );
+            $where       .= ' AND post_title IN (' . join( ', ', $placeholders ) . ')';
+            $params       = array_merge( $params, array_values( $hooks ) );
+        }
+
+        /*
 		 * Add the IDs to the WHERE clause. IDs not escaped because they came directly from a prior DB query.
 		 *
 		 * If we're not limiting by IDs, then include the post_date_gmt clause.
 		 */
-		if ( $limit_ids ) {
-			$where .= ' AND ID IN (' . join( ',', $ids ) . ')';
-		} else {
-			$where .= ' AND post_date_gmt <= %s';
-			$params[] = $date->format( 'Y-m-d H:i:s' );
-		}
-
-		// Add the ORDER BY clause and,ms limit.
-		$order    = 'ORDER BY menu_order ASC, post_date_gmt ASC, ID ASC LIMIT %d';
-		$params[] = $limit;
-
-		// Run the query and gather results.
-		$rows_affected = $wpdb->query( $wpdb->prepare( "{$update} {$where} {$order}", $params ) );
-		if ( $rows_affected === false ) {
-			throw new RuntimeException( __( 'Unable to claim actions. Database error.', 'action-scheduler' ) );
-		}
-
-		return (int) $rows_affected;
-	}
-
-	/**
-	 * Get IDs of actions within a certain group and up to a certain date/time.
-	 *
-	 * @param string   $group The group to use in finding actions.
-	 * @param int      $limit The number of actions to retrieve.
-	 * @param DateTime $date  DateTime object representing cutoff time for actions. Actions retrieved will be
-	 *                        up to and including this DateTime.
-	 *
-	 * @return array IDs of actions in the appropriate group and before the appropriate time.
-	 * @throws InvalidArgumentException When the group does not exist.
-	 */
-	protected function get_actions_by_group( $group, $limit, DateTime $date ) {
-		// Ensure the group exists before continuing.
-		if ( ! term_exists( $group, self::GROUP_TAXONOMY )) {
-			throw new InvalidArgumentException( sprintf( __( 'The group "%s" does not exist.', 'action-scheduler' ), $group ) );
-		}
-
-		// Set up a query for post IDs to use later.
-		$query      = new WP_Query();
-		$query_args = array(
-			'fields'           => 'ids',
-			'post_type'        => self::POST_TYPE,
-			'post_status'      => ActionScheduler_Store::STATUS_PENDING,
-			'has_password'     => false,
-			'posts_per_page'   => $limit * 3,
-			'suppress_filters' => true,
-			'no_found_rows'    => true,
-			'orderby'          => array(
-				'menu_order' => 'ASC',
-				'date'       => 'ASC',
-				'ID'         => 'ASC',
-			),
-			'date_query'       => array(
-				'column' => 'post_date_gmt',
-				'before' => $date->format( 'Y-m-d H:i' ),
-				'inclusive' => true,
-			),
-			'tax_query' => array(
-				array(
-					'taxonomy'         => self::GROUP_TAXONOMY,
-					'field'            => 'slug',
-					'terms'            => $group,
-					'include_children' => false,
-				),
-			),
-		);
-
-		return $query->query( $query_args );
-	}
-
-	/**
-	 * @param string $claim_id
-	 * @return array
-	 */
-	public function find_actions_by_claim_id( $claim_id ) {
-		/** @var wpdb $wpdb */
-		global $wpdb;
-		$sql = "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND post_password = %s";
-		$sql = $wpdb->prepare( $sql, array( self::POST_TYPE, $claim_id ) );
-		$action_ids = $wpdb->get_col( $sql );
-		return $action_ids;
-	}
-
-	public function release_claim( ActionScheduler_ActionClaim $claim ) {
-		$action_ids = $this->find_actions_by_claim_id( $claim->get_id() );
-		if ( empty( $action_ids ) ) {
-			return; // nothing to do
-		}
-		$action_id_string = implode( ',', array_map( 'intval', $action_ids ) );
-		/** @var wpdb $wpdb */
-		global $wpdb;
-		$sql = "UPDATE {$wpdb->posts} SET post_password = '' WHERE ID IN ($action_id_string) AND post_password = %s";
-		$sql = $wpdb->prepare( $sql, array( $claim->get_id() ) );
-		$result = $wpdb->query( $sql );
-		if ( $result === false ) {
-			/* translators: %s: claim ID */
-			throw new RuntimeException( sprintf( __( 'Unable to unlock claim %s. Database error.', 'action-scheduler' ), $claim->get_id() ) );
-		}
-	}
-
-	/**
-	 * @param string $action_id
-	 */
-	public function unclaim_action( $action_id ) {
-		/** @var wpdb $wpdb */
-		global $wpdb;
-		$sql = "UPDATE {$wpdb->posts} SET post_password = '' WHERE ID = %d AND post_type = %s";
-		$sql = $wpdb->prepare( $sql, $action_id, self::POST_TYPE );
-		$result = $wpdb->query( $sql );
-		if ( $result === false ) {
-			/* translators: %s: action ID */
-			throw new RuntimeException( sprintf( __( 'Unable to unlock claim on action %s. Database error.', 'action-scheduler' ), $action_id ) );
-		}
-	}
-
-	public function mark_failure( $action_id ) {
-		/** @var wpdb $wpdb */
-		global $wpdb;
-		$sql = "UPDATE {$wpdb->posts} SET post_status = %s WHERE ID = %d AND post_type = %s";
-		$sql = $wpdb->prepare( $sql, self::STATUS_FAILED, $action_id, self::POST_TYPE );
-		$result = $wpdb->query( $sql );
-		if ( $result === false ) {
-			/* translators: %s: action ID */
-			throw new RuntimeException( sprintf( __( 'Unable to mark failure on action %s. Database error.', 'action-scheduler' ), $action_id ) );
-		}
-	}
-
-	/**
-	 * Return an action's claim ID, as stored in the post password column
-	 *
-	 * @param string $action_id
-	 * @return mixed
-	 */
-	public function get_claim_id( $action_id ) {
-		return $this->get_post_column( $action_id, 'post_password' );
-	}
-
-	/**
-	 * Return an action's status, as stored in the post status column
-	 *
-	 * @param string $action_id
-	 * @return mixed
-	 */
-	public function get_status( $action_id ) {
-		$status = $this->get_post_column( $action_id, 'post_status' );
-
-		if ( $status === null ) {
-			throw new InvalidArgumentException( __( 'Invalid action ID. No status found.', 'action-scheduler' ) );
-		}
-
-		return $this->get_action_status_by_post_status( $status );
-	}
-
-	private function get_post_column( $action_id, $column_name ) {
-		/** @var \wpdb $wpdb */
-		global $wpdb;
-		return $wpdb->get_var( $wpdb->prepare( "SELECT {$column_name} FROM {$wpdb->posts} WHERE ID=%d AND post_type=%s", $action_id, self::POST_TYPE ) );
-	}
-
-	/**
-	 * @param string $action_id
-	 */
-	public function log_execution( $action_id ) {
-		/** @var wpdb $wpdb */
-		global $wpdb;
-
-		$sql = "UPDATE {$wpdb->posts} SET menu_order = menu_order+1, post_status=%s, post_modified_gmt = %s, post_modified = %s WHERE ID = %d AND post_type = %s";
-		$sql = $wpdb->prepare( $sql, self::STATUS_RUNNING, current_time('mysql', true), current_time('mysql'), $action_id, self::POST_TYPE );
-		$wpdb->query($sql);
-	}
-
-	/**
-	 * Record that an action was completed.
-	 *
-	 * @param int $action_id ID of the completed action.
-	 * @throws InvalidArgumentException|RuntimeException
-	 */
-	public function mark_complete( $action_id ) {
-		$post = get_post( $action_id );
-		if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
-			throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
-		}
-		add_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10, 1 );
-		add_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10, 5 );
-		$result = wp_update_post(array(
-			'ID' => $action_id,
-			'post_status' => 'publish',
-		), TRUE);
-		remove_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10 );
-		remove_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10 );
-		if ( is_wp_error( $result ) ) {
-			throw new RuntimeException( $result->get_error_message() );
-		}
-	}
-
-	/**
-	 * Mark action as migrated when there is an error deleting the action.
-	 *
-	 * @param int $action_id Action ID.
-	 */
-	public function mark_migrated( $action_id ) {
-		wp_update_post(
-			array(
-				'ID'          => $action_id,
-				'post_status' => 'migrated'
-			)
-		);
-	}
-
-	/**
-	 * Determine whether the post store can be migrated.
-	 *
-	 * @return bool
-	 */
-	public function migration_dependencies_met( $setting ) {
-		global $wpdb;
-
-		$dependencies_met = get_transient( self::DEPENDENCIES_MET );
-		if ( empty( $dependencies_met ) ) {
-			$maximum_args_length = apply_filters( 'action_scheduler_maximum_args_length', 191 );
-			$found_action        = $wpdb->get_var(
-				$wpdb->prepare(
-					"SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND CHAR_LENGTH(post_content) > %d LIMIT 1",
-					$maximum_args_length,
-					self::POST_TYPE
-				)
-			);
-			$dependencies_met = $found_action ? 'no' : 'yes';
-			set_transient( self::DEPENDENCIES_MET, $dependencies_met, DAY_IN_SECONDS );
-		}
-
-		return 'yes' == $dependencies_met ? $setting : false;
-	}
-
-	/**
-	 * InnoDB indexes have a maximum size of 767 bytes by default, which is only 191 characters with utf8mb4.
-	 *
-	 * Previously, AS wasn't concerned about args length, as we used the (unindex) post_content column. However,
-	 * as we prepare to move to custom tables, and can use an indexed VARCHAR column instead, we want to warn
-	 * developers of this impending requirement.
-	 *
-	 * @param ActionScheduler_Action $action
-	 */
-	protected function validate_action( ActionScheduler_Action $action ) {
-		try {
-			parent::validate_action( $action );
-		} catch ( Exception $e ) {
-			$message = sprintf( __( '%s Support for strings longer than this will be removed in a future version.', 'action-scheduler' ), $e->getMessage() );
-			_doing_it_wrong( 'ActionScheduler_Action::$args', $message, '2.1.0' );
-		}
-	}
-
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public function init() {
-		add_filter( 'action_scheduler_migration_dependencies_met', array( $this, 'migration_dependencies_met' ) );
-
-		$post_type_registrar = new ActionScheduler_wpPostStore_PostTypeRegistrar();
-		$post_type_registrar->register();
-
-		$post_status_registrar = new ActionScheduler_wpPostStore_PostStatusRegistrar();
-		$post_status_registrar->register();
-
-		$taxonomy_registrar = new ActionScheduler_wpPostStore_TaxonomyRegistrar();
-		$taxonomy_registrar->register();
-	}
+        if ( $limit_ids ) {
+            $where .= ' AND ID IN (' . join( ',', $ids ) . ')';
+        } else {
+            $where .= ' AND post_date_gmt <= %s';
+            $params[] = $date->format( 'Y-m-d H:i:s' );
+        }
+
+        // Add the ORDER BY clause and,ms limit.
+        $order    = 'ORDER BY menu_order ASC, post_date_gmt ASC, ID ASC LIMIT %d';
+        $params[] = $limit;
+
+        // Run the query and gather results.
+        $rows_affected = $wpdb->query( $wpdb->prepare( "{$update} {$where} {$order}", $params ) );
+        if ( $rows_affected === false ) {
+            throw new RuntimeException( __( 'Unable to claim actions. Database error.', 'action-scheduler' ) );
+        }
+
+        return (int) $rows_affected;
+    }
+
+    /**
+     * Get IDs of actions within a certain group and up to a certain date/time.
+     *
+     * @param string   $group The group to use in finding actions.
+     * @param int      $limit The number of actions to retrieve.
+     * @param DateTime $date  DateTime object representing cutoff time for actions. Actions retrieved will be
+     *                        up to and including this DateTime.
+     *
+     * @return array IDs of actions in the appropriate group and before the appropriate time.
+     * @throws InvalidArgumentException When the group does not exist.
+     */
+    protected function get_actions_by_group( $group, $limit, DateTime $date ) {
+        // Ensure the group exists before continuing.
+        if ( ! term_exists( $group, self::GROUP_TAXONOMY )) {
+            throw new InvalidArgumentException( sprintf( __( 'The group "%s" does not exist.', 'action-scheduler' ), $group ) );
+        }
+
+        // Set up a query for post IDs to use later.
+        $query      = new WP_Query();
+        $query_args = array(
+            'fields'           => 'ids',
+            'post_type'        => self::POST_TYPE,
+            'post_status'      => ActionScheduler_Store::STATUS_PENDING,
+            'has_password'     => false,
+            'posts_per_page'   => $limit * 3,
+            'suppress_filters' => true,
+            'no_found_rows'    => true,
+            'orderby'          => array(
+                'menu_order' => 'ASC',
+                'date'       => 'ASC',
+                'ID'         => 'ASC',
+            ),
+            'date_query'       => array(
+                'column' => 'post_date_gmt',
+                'before' => $date->format( 'Y-m-d H:i' ),
+                'inclusive' => true,
+            ),
+            'tax_query' => array(
+                array(
+                    'taxonomy'         => self::GROUP_TAXONOMY,
+                    'field'            => 'slug',
+                    'terms'            => $group,
+                    'include_children' => false,
+                ),
+            ),
+        );
+
+        return $query->query( $query_args );
+    }
+
+    /**
+     * @param string $claim_id
+     * @return array
+     */
+    public function find_actions_by_claim_id( $claim_id ) {
+        /** @var wpdb $wpdb */
+        global $wpdb;
+        $sql = "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND post_password = %s";
+        $sql = $wpdb->prepare( $sql, array( self::POST_TYPE, $claim_id ) );
+        $action_ids = $wpdb->get_col( $sql );
+        return $action_ids;
+    }
+
+    public function release_claim( ActionScheduler_ActionClaim $claim ) {
+        $action_ids = $this->find_actions_by_claim_id( $claim->get_id() );
+        if ( empty( $action_ids ) ) {
+            return; // nothing to do
+        }
+        $action_id_string = implode( ',', array_map( 'intval', $action_ids ) );
+        /** @var wpdb $wpdb */
+        global $wpdb;
+        $sql = "UPDATE {$wpdb->posts} SET post_password = '' WHERE ID IN ($action_id_string) AND post_password = %s";
+        $sql = $wpdb->prepare( $sql, array( $claim->get_id() ) );
+        $result = $wpdb->query( $sql );
+        if ( $result === false ) {
+            /* translators: %s: claim ID */
+            throw new RuntimeException( sprintf( __( 'Unable to unlock claim %s. Database error.', 'action-scheduler' ), $claim->get_id() ) );
+        }
+    }
+
+    /**
+     * @param string $action_id
+     */
+    public function unclaim_action( $action_id ) {
+        /** @var wpdb $wpdb */
+        global $wpdb;
+        $sql = "UPDATE {$wpdb->posts} SET post_password = '' WHERE ID = %d AND post_type = %s";
+        $sql = $wpdb->prepare( $sql, $action_id, self::POST_TYPE );
+        $result = $wpdb->query( $sql );
+        if ( $result === false ) {
+            /* translators: %s: action ID */
+            throw new RuntimeException( sprintf( __( 'Unable to unlock claim on action %s. Database error.', 'action-scheduler' ), $action_id ) );
+        }
+    }
+
+    public function mark_failure( $action_id ) {
+        /** @var wpdb $wpdb */
+        global $wpdb;
+        $sql = "UPDATE {$wpdb->posts} SET post_status = %s WHERE ID = %d AND post_type = %s";
+        $sql = $wpdb->prepare( $sql, self::STATUS_FAILED, $action_id, self::POST_TYPE );
+        $result = $wpdb->query( $sql );
+        if ( $result === false ) {
+            /* translators: %s: action ID */
+            throw new RuntimeException( sprintf( __( 'Unable to mark failure on action %s. Database error.', 'action-scheduler' ), $action_id ) );
+        }
+    }
+
+    /**
+     * Return an action's claim ID, as stored in the post password column
+     *
+     * @param string $action_id
+     * @return mixed
+     */
+    public function get_claim_id( $action_id ) {
+        return $this->get_post_column( $action_id, 'post_password' );
+    }
+
+    /**
+     * Return an action's status, as stored in the post status column
+     *
+     * @param string $action_id
+     * @return mixed
+     */
+    public function get_status( $action_id ) {
+        $status = $this->get_post_column( $action_id, 'post_status' );
+
+        if ( $status === null ) {
+            throw new InvalidArgumentException( __( 'Invalid action ID. No status found.', 'action-scheduler' ) );
+        }
+
+        return $this->get_action_status_by_post_status( $status );
+    }
+
+    private function get_post_column( $action_id, $column_name ) {
+        /** @var \wpdb $wpdb */
+        global $wpdb;
+        return $wpdb->get_var( $wpdb->prepare( "SELECT {$column_name} FROM {$wpdb->posts} WHERE ID=%d AND post_type=%s", $action_id, self::POST_TYPE ) );
+    }
+
+    /**
+     * @param string $action_id
+     */
+    public function log_execution( $action_id ) {
+        /** @var wpdb $wpdb */
+        global $wpdb;
+
+        $sql = "UPDATE {$wpdb->posts} SET menu_order = menu_order+1, post_status=%s, post_modified_gmt = %s, post_modified = %s WHERE ID = %d AND post_type = %s";
+        $sql = $wpdb->prepare( $sql, self::STATUS_RUNNING, current_time('mysql', true), current_time('mysql'), $action_id, self::POST_TYPE );
+        $wpdb->query($sql);
+    }
+
+    /**
+     * Record that an action was completed.
+     *
+     * @param int $action_id ID of the completed action.
+     * @throws InvalidArgumentException|RuntimeException
+     */
+    public function mark_complete( $action_id ) {
+        $post = get_post( $action_id );
+        if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
+            throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
+        }
+        add_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10, 1 );
+        add_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10, 5 );
+        $result = wp_update_post(array(
+            'ID' => $action_id,
+            'post_status' => 'publish',
+        ), TRUE);
+        remove_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10 );
+        remove_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10 );
+        if ( is_wp_error( $result ) ) {
+            throw new RuntimeException( $result->get_error_message() );
+        }
+    }
+
+    /**
+     * Mark action as migrated when there is an error deleting the action.
+     *
+     * @param int $action_id Action ID.
+     */
+    public function mark_migrated( $action_id ) {
+        wp_update_post(
+            array(
+                'ID'          => $action_id,
+                'post_status' => 'migrated'
+            )
+        );
+    }
+
+    /**
+     * Determine whether the post store can be migrated.
+     *
+     * @return bool
+     */
+    public function migration_dependencies_met( $setting ) {
+        global $wpdb;
+
+        $dependencies_met = get_transient( self::DEPENDENCIES_MET );
+        if ( empty( $dependencies_met ) ) {
+            $maximum_args_length = apply_filters( 'action_scheduler_maximum_args_length', 191 );
+            $found_action        = $wpdb->get_var(
+                $wpdb->prepare(
+                    "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND CHAR_LENGTH(post_content) > %d LIMIT 1",
+                    $maximum_args_length,
+                    self::POST_TYPE
+                )
+            );
+            $dependencies_met = $found_action ? 'no' : 'yes';
+            set_transient( self::DEPENDENCIES_MET, $dependencies_met, DAY_IN_SECONDS );
+        }
+
+        return 'yes' == $dependencies_met ? $setting : false;
+    }
+
+    /**
+     * InnoDB indexes have a maximum size of 767 bytes by default, which is only 191 characters with utf8mb4.
+     *
+     * Previously, AS wasn't concerned about args length, as we used the (unindex) post_content column. However,
+     * as we prepare to move to custom tables, and can use an indexed VARCHAR column instead, we want to warn
+     * developers of this impending requirement.
+     *
+     * @param ActionScheduler_Action $action
+     */
+    protected function validate_action( ActionScheduler_Action $action ) {
+        try {
+            parent::validate_action( $action );
+        } catch ( Exception $e ) {
+            $message = sprintf( __( '%s Support for strings longer than this will be removed in a future version.', 'action-scheduler' ), $e->getMessage() );
+            _doing_it_wrong( 'ActionScheduler_Action::$args', $message, '2.1.0' );
+        }
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function init() {
+        add_filter( 'action_scheduler_migration_dependencies_met', array( $this, 'migration_dependencies_met' ) );
+
+        $post_type_registrar = new ActionScheduler_wpPostStore_PostTypeRegistrar();
+        $post_type_registrar->register();
+
+        $post_status_registrar = new ActionScheduler_wpPostStore_PostStatusRegistrar();
+        $post_status_registrar->register();
+
+        $taxonomy_registrar = new ActionScheduler_wpPostStore_TaxonomyRegistrar();
+        $taxonomy_registrar->register();
+    }
 }

Spacing +210 added lines, -210 removed lines

@@ -12,62 +12,62 @@ 
 	/** @var DateTimeZone */
 	protected $local_timezone = NULL;
 
-	public function save_action( ActionScheduler_Action $action, DateTime $scheduled_date = NULL ){
+	public function save_action(ActionScheduler_Action $action, DateTime $scheduled_date = NULL) {
 		try {
-			$this->validate_action( $action );
-			$post_array = $this->create_post_array( $action, $scheduled_date );
-			$post_id = $this->save_post_array( $post_array );
-			$this->save_post_schedule( $post_id, $action->get_schedule() );
-			$this->save_action_group( $post_id, $action->get_group() );
-			do_action( 'action_scheduler_stored_action', $post_id );
+			$this->validate_action($action);
+			$post_array = $this->create_post_array($action, $scheduled_date);
+			$post_id = $this->save_post_array($post_array);
+			$this->save_post_schedule($post_id, $action->get_schedule());
+			$this->save_action_group($post_id, $action->get_group());
+			do_action('action_scheduler_stored_action', $post_id);
 			return $post_id;
-		} catch ( Exception $e ) {
-			throw new RuntimeException( sprintf( __( 'Error saving action: %s', 'action-scheduler' ), $e->getMessage() ), 0 );
+		} catch (Exception $e) {
+			throw new RuntimeException(sprintf(__('Error saving action: %s', 'action-scheduler'), $e->getMessage()), 0);
 		}
 	}
 
-	protected function create_post_array( ActionScheduler_Action $action, DateTime $scheduled_date = NULL ) {
+	protected function create_post_array(ActionScheduler_Action $action, DateTime $scheduled_date = NULL) {
 		$post = array(
 			'post_type' => self::POST_TYPE,
 			'post_title' => $action->get_hook(),
 			'post_content' => json_encode($action->get_args()),
-			'post_status' => ( $action->is_finished() ? 'publish' : 'pending' ),
-			'post_date_gmt' => $this->get_scheduled_date_string( $action, $scheduled_date ),
-			'post_date'     => $this->get_scheduled_date_string_local( $action, $scheduled_date ),
+			'post_status' => ($action->is_finished() ? 'publish' : 'pending'),
+			'post_date_gmt' => $this->get_scheduled_date_string($action, $scheduled_date),
+			'post_date'     => $this->get_scheduled_date_string_local($action, $scheduled_date),
 		);
 		return $post;
 	}
 
-	protected function save_post_array( $post_array ) {
-		add_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10, 1 );
-		add_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10, 5 );
+	protected function save_post_array($post_array) {
+		add_filter('wp_insert_post_data', array($this, 'filter_insert_post_data'), 10, 1);
+		add_filter('pre_wp_unique_post_slug', array($this, 'set_unique_post_slug'), 10, 5);
 
-		$has_kses = false !== has_filter( 'content_save_pre', 'wp_filter_post_kses' );
+		$has_kses = false !== has_filter('content_save_pre', 'wp_filter_post_kses');
 
-		if ( $has_kses ) {
+		if ($has_kses) {
 			// Prevent KSES from corrupting JSON in post_content.
 			kses_remove_filters();
 		}
 
 		$post_id = wp_insert_post($post_array);
 
-		if ( $has_kses ) {
+		if ($has_kses) {
 			kses_init_filters();
 		}
 
-		remove_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10 );
-		remove_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10 );
+		remove_filter('wp_insert_post_data', array($this, 'filter_insert_post_data'), 10);
+		remove_filter('pre_wp_unique_post_slug', array($this, 'set_unique_post_slug'), 10);
 
-		if ( is_wp_error($post_id) || empty($post_id) ) {
-			throw new RuntimeException( __( 'Unable to save action.', 'action-scheduler' ) );
+		if (is_wp_error($post_id) || empty($post_id)) {
+			throw new RuntimeException(__('Unable to save action.', 'action-scheduler'));
 		}
 		return $post_id;
 	}
 
-	public function filter_insert_post_data( $postdata ) {
-		if ( $postdata['post_type'] == self::POST_TYPE ) {
+	public function filter_insert_post_data($postdata) {
+		if ($postdata['post_type'] == self::POST_TYPE) {
 			$postdata['post_author'] = 0;
-			if ( $postdata['post_status'] == 'future' ) {
+			if ($postdata['post_status'] == 'future') {
 				$postdata['post_status'] = 'publish';
 			}
 		}
@@ -102,43 +102,43 @@ 
 	 * @param string $post_type     Post type.
 	 * @return string
 	 */
-	public function set_unique_post_slug( $override_slug, $slug, $post_ID, $post_status, $post_type ) {
-		if ( self::POST_TYPE == $post_type ) {
-			$override_slug = uniqid( self::POST_TYPE . '-', true ) . '-' . wp_generate_password( 32, false );
+	public function set_unique_post_slug($override_slug, $slug, $post_ID, $post_status, $post_type) {
+		if (self::POST_TYPE == $post_type) {
+			$override_slug = uniqid(self::POST_TYPE . '-', true) . '-' . wp_generate_password(32, false);
 		}
 		return $override_slug;
 	}
 
-	protected function save_post_schedule( $post_id, $schedule ) {
-		update_post_meta( $post_id, self::SCHEDULE_META_KEY, $schedule );
+	protected function save_post_schedule($post_id, $schedule) {
+		update_post_meta($post_id, self::SCHEDULE_META_KEY, $schedule);
 	}
 
-	protected function save_action_group( $post_id, $group ) {
-		if ( empty($group) ) {
-			wp_set_object_terms( $post_id, array(), self::GROUP_TAXONOMY, FALSE );
+	protected function save_action_group($post_id, $group) {
+		if (empty($group)) {
+			wp_set_object_terms($post_id, array(), self::GROUP_TAXONOMY, FALSE);
 		} else {
-			wp_set_object_terms( $post_id, array($group), self::GROUP_TAXONOMY, FALSE );
+			wp_set_object_terms($post_id, array($group), self::GROUP_TAXONOMY, FALSE);
 		}
 	}
 
-	public function fetch_action( $action_id ) {
-		$post = $this->get_post( $action_id );
-		if ( empty($post) || $post->post_type != self::POST_TYPE ) {
+	public function fetch_action($action_id) {
+		$post = $this->get_post($action_id);
+		if (empty($post) || $post->post_type != self::POST_TYPE) {
 			return $this->get_null_action();
 		}
 
 		try {
-			$action = $this->make_action_from_post( $post );
-		} catch ( ActionScheduler_InvalidActionException $exception ) {
-			do_action( 'action_scheduler_failed_fetch_action', $post->ID, $exception );
+			$action = $this->make_action_from_post($post);
+		} catch (ActionScheduler_InvalidActionException $exception) {
+			do_action('action_scheduler_failed_fetch_action', $post->ID, $exception);
 			return $this->get_null_action();
 		}
 
 		return $action;
 	}
 
-	protected function get_post( $action_id ) {
-		if ( empty($action_id) ) {
+	protected function get_post($action_id) {
+		if (empty($action_id)) {
 			return NULL;
 		}
 		return get_post($action_id);
@@ -148,19 +148,19 @@ 
 		return new ActionScheduler_NullAction();
 	}
 
-	protected function make_action_from_post( $post ) {
+	protected function make_action_from_post($post) {
 		$hook = $post->post_title;
 
-		$args = json_decode( $post->post_content, true );
-		$this->validate_args( $args, $post->ID );
+		$args = json_decode($post->post_content, true);
+		$this->validate_args($args, $post->ID);
 
-		$schedule = get_post_meta( $post->ID, self::SCHEDULE_META_KEY, true );
-		$this->validate_schedule( $schedule, $post->ID );
+		$schedule = get_post_meta($post->ID, self::SCHEDULE_META_KEY, true);
+		$this->validate_schedule($schedule, $post->ID);
 
-		$group = wp_get_object_terms( $post->ID, self::GROUP_TAXONOMY, array('fields' => 'names') );
-		$group = empty( $group ) ? '' : reset($group);
+		$group = wp_get_object_terms($post->ID, self::GROUP_TAXONOMY, array('fields' => 'names'));
+		$group = empty($group) ? '' : reset($group);
 
-		return ActionScheduler::factory()->get_stored_action( $this->get_action_status_by_post_status( $post->post_status ), $hook, $args, $schedule, $group );
+		return ActionScheduler::factory()->get_stored_action($this->get_action_status_by_post_status($post->post_status), $hook, $args, $schedule, $group);
 	}
 
 	/**
@@ -169,9 +169,9 @@ 
 	 * @throws InvalidArgumentException if $post_status not in known status fields returned by $this->get_status_labels()
 	 * @return string
 	 */
-	protected function get_action_status_by_post_status( $post_status ) {
+	protected function get_action_status_by_post_status($post_status) {
 
-		switch ( $post_status ) {
+		switch ($post_status) {
 			case 'publish' :
 				$action_status = self::STATUS_COMPLETE;
 				break;
@@ -179,8 +179,8 @@ 
 				$action_status = self::STATUS_CANCELED;
 				break;
 			default :
-				if ( ! array_key_exists( $post_status, $this->get_status_labels() ) ) {
-					throw new InvalidArgumentException( sprintf( 'Invalid post status: "%s". No matching action status available.', $post_status ) );
+				if (!array_key_exists($post_status, $this->get_status_labels())) {
+					throw new InvalidArgumentException(sprintf('Invalid post status: "%s". No matching action status available.', $post_status));
 				}
 				$action_status = $post_status;
 				break;
@@ -194,9 +194,9 @@ 
 	 * @throws InvalidArgumentException if $post_status not in known status fields returned by $this->get_status_labels()
 	 * @return string
 	 */
-	protected function get_post_status_by_action_status( $action_status ) {
+	protected function get_post_status_by_action_status($action_status) {
 
-		switch ( $action_status ) {
+		switch ($action_status) {
 			case self::STATUS_COMPLETE :
 				$post_status = 'publish';
 				break;
@@ -204,8 +204,8 @@ 
 				$post_status = 'trash';
 				break;
 			default :
-				if ( ! array_key_exists( $action_status, $this->get_status_labels() ) ) {
-					throw new InvalidArgumentException( sprintf( 'Invalid action status: "%s".', $action_status ) );
+				if (!array_key_exists($action_status, $this->get_status_labels())) {
+					throw new InvalidArgumentException(sprintf('Invalid action status: "%s".', $action_status));
 				}
 				$post_status = $action_status;
 				break;
@@ -220,8 +220,8 @@ 
 	 *
 	 * @return string ID of the next action matching the criteria or NULL if not found
 	 */
-	public function find_action( $hook, $params = array() ) {
-		$params = wp_parse_args( $params, array(
+	public function find_action($hook, $params = array()) {
+		$params = wp_parse_args($params, array(
 			'args' => NULL,
 			'status' => ActionScheduler_Store::STATUS_PENDING,
 			'group' => '',
@@ -230,7 +230,7 @@ 
 		global $wpdb;
 		$query = "SELECT p.ID FROM {$wpdb->posts} p";
 		$args = array();
-		if ( !empty($params['group']) ) {
+		if (!empty($params['group'])) {
 			$query .= " INNER JOIN {$wpdb->term_relationships} tr ON tr.object_id=p.ID";
 			$query .= " INNER JOIN {$wpdb->term_taxonomy} tt ON tr.term_taxonomy_id=tt.term_taxonomy_id";
 			$query .= " INNER JOIN {$wpdb->terms} t ON tt.term_id=t.term_id AND t.slug=%s";
@@ -240,17 +240,17 @@ 
 		$args[] = $hook;
 		$query .= " AND p.post_type=%s";
 		$args[] = self::POST_TYPE;
-		if ( !is_null($params['args']) ) {
+		if (!is_null($params['args'])) {
 			$query .= " AND p.post_content=%s";
 			$args[] = json_encode($params['args']);
 		}
 
-		if ( ! empty( $params['status'] ) ) {
+		if (!empty($params['status'])) {
 			$query .= " AND p.post_status=%s";
-			$args[] = $this->get_post_status_by_action_status( $params['status'] );
+			$args[] = $this->get_post_status_by_action_status($params['status']);
 		}
 
-		switch ( $params['status'] ) {
+		switch ($params['status']) {
 			case self::STATUS_COMPLETE:
 			case self::STATUS_RUNNING:
 			case self::STATUS_FAILED:
@@ -263,7 +263,7 @@ 
 		}
 		$query .= " ORDER BY post_date_gmt $order LIMIT 1";
 
-		$query = $wpdb->prepare( $query, $args );
+		$query = $wpdb->prepare($query, $args);
 
 		$id = $wpdb->get_var($query);
 		return $id;
@@ -277,13 +277,13 @@ 
 	 * @throws InvalidArgumentException if $select_or_count not count or select
 	 * @return string SQL statement. The returned SQL is already properly escaped.
 	 */
-	protected function get_query_actions_sql( array $query, $select_or_count = 'select' ) {
+	protected function get_query_actions_sql(array $query, $select_or_count = 'select') {
 
-		if ( ! in_array( $select_or_count, array( 'select', 'count' ) ) ) {
-			throw new InvalidArgumentException( __( 'Invalid schedule. Cannot save action.', 'action-scheduler' ) );
+		if (!in_array($select_or_count, array('select', 'count'))) {
+			throw new InvalidArgumentException(__('Invalid schedule. Cannot save action.', 'action-scheduler'));
 		}
 
-		$query = wp_parse_args( $query, array(
+		$query = wp_parse_args($query, array(
 			'hook' => '',
 			'args' => NULL,
 			'date' => NULL,
@@ -298,18 +298,18 @@ 
 			'orderby' => 'date',
 			'order' => 'ASC',
 			'search' => '',
-		) );
+		));
 
 		/** @var wpdb $wpdb */
 		global $wpdb;
-		$sql  = ( 'count' === $select_or_count ) ? 'SELECT count(p.ID)' : 'SELECT p.ID ';
+		$sql  = ('count' === $select_or_count) ? 'SELECT count(p.ID)' : 'SELECT p.ID ';
 		$sql .= "FROM {$wpdb->posts} p";
 		$sql_params = array();
-		if ( empty( $query['group'] ) && 'group' === $query['orderby'] ) {
+		if (empty($query['group']) && 'group' === $query['orderby']) {
 			$sql .= " LEFT JOIN {$wpdb->term_relationships} tr ON tr.object_id=p.ID";
 			$sql .= " LEFT JOIN {$wpdb->term_taxonomy} tt ON tr.term_taxonomy_id=tt.term_taxonomy_id";
 			$sql .= " LEFT JOIN {$wpdb->terms} t ON tt.term_id=t.term_id";
-		} elseif ( ! empty( $query['group'] ) ) {
+		} elseif (!empty($query['group'])) {
 			$sql .= " INNER JOIN {$wpdb->term_relationships} tr ON tr.object_id=p.ID";
 			$sql .= " INNER JOIN {$wpdb->term_taxonomy} tt ON tr.term_taxonomy_id=tt.term_taxonomy_id";
 			$sql .= " INNER JOIN {$wpdb->terms} t ON tt.term_id=t.term_id";
@@ -318,56 +318,56 @@ 
 		}
 		$sql .= " WHERE post_type=%s";
 		$sql_params[] = self::POST_TYPE;
-		if ( $query['hook'] ) {
+		if ($query['hook']) {
 			$sql .= " AND p.post_title=%s";
 			$sql_params[] = $query['hook'];
 		}
-		if ( !is_null($query['args']) ) {
+		if (!is_null($query['args'])) {
 			$sql .= " AND p.post_content=%s";
 			$sql_params[] = json_encode($query['args']);
 		}
 
-		if ( ! empty( $query['status'] ) ) {
+		if (!empty($query['status'])) {
 			$sql .= " AND p.post_status=%s";
-			$sql_params[] = $this->get_post_status_by_action_status( $query['status'] );
+			$sql_params[] = $this->get_post_status_by_action_status($query['status']);
 		}
 
-		if ( $query['date'] instanceof DateTime ) {
+		if ($query['date'] instanceof DateTime) {
 			$date = clone $query['date'];
-			$date->setTimezone( new DateTimeZone('UTC') );
+			$date->setTimezone(new DateTimeZone('UTC'));
 			$date_string = $date->format('Y-m-d H:i:s');
 			$comparator = $this->validate_sql_comparator($query['date_compare']);
 			$sql .= " AND p.post_date_gmt $comparator %s";
 			$sql_params[] = $date_string;
 		}
 
-		if ( $query['modified'] instanceof DateTime ) {
+		if ($query['modified'] instanceof DateTime) {
 			$modified = clone $query['modified'];
-			$modified->setTimezone( new DateTimeZone('UTC') );
+			$modified->setTimezone(new DateTimeZone('UTC'));
 			$date_string = $modified->format('Y-m-d H:i:s');
 			$comparator = $this->validate_sql_comparator($query['modified_compare']);
 			$sql .= " AND p.post_modified_gmt $comparator %s";
 			$sql_params[] = $date_string;
 		}
 
-		if ( $query['claimed'] === TRUE ) {
+		if ($query['claimed'] === TRUE) {
 			$sql .= " AND p.post_password != ''";
-		} elseif ( $query['claimed'] === FALSE ) {
+		} elseif ($query['claimed'] === FALSE) {
 			$sql .= " AND p.post_password = ''";
-		} elseif ( !is_null($query['claimed']) ) {
+		} elseif (!is_null($query['claimed'])) {
 			$sql .= " AND p.post_password = %s";
 			$sql_params[] = $query['claimed'];
 		}
 
-		if ( ! empty( $query['search'] ) ) {
+		if (!empty($query['search'])) {
 			$sql .= " AND (p.post_title LIKE %s OR p.post_content LIKE %s OR p.post_password LIKE %s)";
-			for( $i = 0; $i < 3; $i++ ) {
-				$sql_params[] = sprintf( '%%%s%%', $query['search'] );
+			for ($i = 0; $i < 3; $i++) {
+				$sql_params[] = sprintf('%%%s%%', $query['search']);
 			}
 		}
 
-		if ( 'select' === $select_or_count ) {
-			switch ( $query['orderby'] ) {
+		if ('select' === $select_or_count) {
+			switch ($query['orderby']) {
 				case 'hook':
 					$orderby = 'p.post_title';
 					break;
@@ -389,20 +389,20 @@ 
 					$orderby = 'p.post_date_gmt';
 					break;
 			}
-			if ( 'ASC' === strtoupper( $query['order'] ) ) {
+			if ('ASC' === strtoupper($query['order'])) {
 				$order = 'ASC';
 			} else {
 				$order = 'DESC';
 			}
 			$sql .= " ORDER BY $orderby $order";
-			if ( $query['per_page'] > 0 ) {
+			if ($query['per_page'] > 0) {
 				$sql .= " LIMIT %d, %d";
 				$sql_params[] = $query['offset'];
 				$sql_params[] = $query['per_page'];
 			}
 		}
 
-		return $wpdb->prepare( $sql, $sql_params );
+		return $wpdb->prepare($sql, $sql_params);
 	}
 
 	/**
@@ -410,13 +410,13 @@ 
 	 * @param string $query_type Whether to select or count the results. Default, select.
 	 * @return string|array The IDs of actions matching the query
 	 */
-	public function query_actions( $query = array(), $query_type = 'select' ) {
+	public function query_actions($query = array(), $query_type = 'select') {
 		/** @var wpdb $wpdb */
 		global $wpdb;
 
-		$sql = $this->get_query_actions_sql( $query, $query_type );
+		$sql = $this->get_query_actions_sql($query, $query_type);
 
-		return ( 'count' === $query_type ) ? $wpdb->get_var( $sql ) : $wpdb->get_col( $sql );
+		return ('count' === $query_type) ? $wpdb->get_var($sql) : $wpdb->get_col($sql);
 	}
 
 	/**
@@ -428,18 +428,18 @@ 
 
 		$action_counts_by_status = array();
 		$action_stati_and_labels = $this->get_status_labels();
-		$posts_count_by_status   = (array) wp_count_posts( self::POST_TYPE, 'readable' );
+		$posts_count_by_status   = (array) wp_count_posts(self::POST_TYPE, 'readable');
 
-		foreach ( $posts_count_by_status as $post_status_name => $count ) {
+		foreach ($posts_count_by_status as $post_status_name => $count) {
 
 			try {
-				$action_status_name = $this->get_action_status_by_post_status( $post_status_name );
-			} catch ( Exception $e ) {
+				$action_status_name = $this->get_action_status_by_post_status($post_status_name);
+			} catch (Exception $e) {
 				// Ignore any post statuses that aren't for actions
 				continue;
 			}
-			if ( array_key_exists( $action_status_name, $action_stati_and_labels ) ) {
-				$action_counts_by_status[ $action_status_name ] = $count;
+			if (array_key_exists($action_status_name, $action_stati_and_labels)) {
+				$action_counts_by_status[$action_status_name] = $count;
 			}
 		}
 
@@ -451,25 +451,25 @@ 
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function cancel_action( $action_id ) {
-		$post = get_post( $action_id );
-		if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
-			throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
+	public function cancel_action($action_id) {
+		$post = get_post($action_id);
+		if (empty($post) || ($post->post_type != self::POST_TYPE)) {
+			throw new InvalidArgumentException(sprintf(__('Unidentified action %s', 'action-scheduler'), $action_id));
 		}
-		do_action( 'action_scheduler_canceled_action', $action_id );
-		add_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10, 5 );
-		wp_trash_post( $action_id );
-		remove_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10 );
+		do_action('action_scheduler_canceled_action', $action_id);
+		add_filter('pre_wp_unique_post_slug', array($this, 'set_unique_post_slug'), 10, 5);
+		wp_trash_post($action_id);
+		remove_filter('pre_wp_unique_post_slug', array($this, 'set_unique_post_slug'), 10);
 	}
 
-	public function delete_action( $action_id ) {
-		$post = get_post( $action_id );
-		if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
-			throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
+	public function delete_action($action_id) {
+		$post = get_post($action_id);
+		if (empty($post) || ($post->post_type != self::POST_TYPE)) {
+			throw new InvalidArgumentException(sprintf(__('Unidentified action %s', 'action-scheduler'), $action_id));
 		}
-		do_action( 'action_scheduler_deleted_action', $action_id );
+		do_action('action_scheduler_deleted_action', $action_id);
 
-		wp_delete_post( $action_id, TRUE );
+		wp_delete_post($action_id, TRUE);
 	}
 
 	/**
@@ -478,9 +478,9 @@ 
 	 * @throws InvalidArgumentException
 	 * @return ActionScheduler_DateTime The date the action is schedule to run, or the date that it ran.
 	 */
-	public function get_date( $action_id ) {
-		$next = $this->get_date_gmt( $action_id );
-		return ActionScheduler_TimezoneHelper::set_local_timezone( $next );
+	public function get_date($action_id) {
+		$next = $this->get_date_gmt($action_id);
+		return ActionScheduler_TimezoneHelper::set_local_timezone($next);
 	}
 
 	/**
@@ -489,15 +489,15 @@ 
 	 * @throws InvalidArgumentException
 	 * @return ActionScheduler_DateTime The date the action is schedule to run, or the date that it ran.
 	 */
-	public function get_date_gmt( $action_id ) {
-		$post = get_post( $action_id );
-		if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
-			throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
+	public function get_date_gmt($action_id) {
+		$post = get_post($action_id);
+		if (empty($post) || ($post->post_type != self::POST_TYPE)) {
+			throw new InvalidArgumentException(sprintf(__('Unidentified action %s', 'action-scheduler'), $action_id));
 		}
-		if ( $post->post_status == 'publish' ) {
-			return as_get_datetime_object( $post->post_modified_gmt );
+		if ($post->post_status == 'publish') {
+			return as_get_datetime_object($post->post_modified_gmt);
 		} else {
-			return as_get_datetime_object( $post->post_date_gmt );
+			return as_get_datetime_object($post->post_date_gmt);
 		}
 	}
 
@@ -511,28 +511,28 @@ 
 	 * @throws RuntimeException When there is an error staking a claim.
 	 * @throws InvalidArgumentException When the given group is not valid.
 	 */
-	public function stake_claim( $max_actions = 10, DateTime $before_date = null, $hooks = array(), $group = '' ) {
+	public function stake_claim($max_actions = 10, DateTime $before_date = null, $hooks = array(), $group = '') {
 		$claim_id = $this->generate_claim_id();
-		$this->claim_actions( $claim_id, $max_actions, $before_date, $hooks, $group );
-		$action_ids = $this->find_actions_by_claim_id( $claim_id );
+		$this->claim_actions($claim_id, $max_actions, $before_date, $hooks, $group);
+		$action_ids = $this->find_actions_by_claim_id($claim_id);
 
-		return new ActionScheduler_ActionClaim( $claim_id, $action_ids );
+		return new ActionScheduler_ActionClaim($claim_id, $action_ids);
 	}
 
 	/**
 	 * @return int
 	 */
-	public function get_claim_count(){
+	public function get_claim_count() {
 		global $wpdb;
 
 		$sql = "SELECT COUNT(DISTINCT post_password) FROM {$wpdb->posts} WHERE post_password != '' AND post_type = %s AND post_status IN ('in-progress','pending')";
-		$sql = $wpdb->prepare( $sql, array( self::POST_TYPE ) );
+		$sql = $wpdb->prepare($sql, array(self::POST_TYPE));
 
-		return $wpdb->get_var( $sql );
+		return $wpdb->get_var($sql);
 	}
 
 	protected function generate_claim_id() {
-		$claim_id = md5(microtime(true) . rand(0,1000));
+		$claim_id = md5(microtime(true) . rand(0, 1000));
 		return substr($claim_id, 0, 20); // to fit in db field with 20 char limit
 	}
 
@@ -547,14 +547,14 @@ 
 	 * @throws RuntimeException When there is a database error.
 	 * @throws InvalidArgumentException When the group is invalid.
 	 */
-	protected function claim_actions( $claim_id, $limit, DateTime $before_date = null, $hooks = array(), $group = '' ) {
+	protected function claim_actions($claim_id, $limit, DateTime $before_date = null, $hooks = array(), $group = '') {
 		// Set up initial variables.
 		$date      = null === $before_date ? as_get_datetime_object() : clone $before_date;
-		$limit_ids = ! empty( $group );
-		$ids       = $limit_ids ? $this->get_actions_by_group( $group, $limit, $date ) : array();
+		$limit_ids = !empty($group);
+		$ids       = $limit_ids ? $this->get_actions_by_group($group, $limit, $date) : array();
 
 		// If limiting by IDs and no posts found, then return early since we have nothing to update.
-		if ( $limit_ids && 0 === count( $ids ) ) {
+		if ($limit_ids && 0 === count($ids)) {
 			return 0;
 		}
 
@@ -570,8 +570,8 @@ 
 		$update = "UPDATE {$wpdb->posts} SET post_password = %s, post_modified_gmt = %s, post_modified = %s";
 		$params = array(
 			$claim_id,
-			current_time( 'mysql', true ),
-			current_time( 'mysql' ),
+			current_time('mysql', true),
+			current_time('mysql'),
 		);
 
 		// Build initial WHERE clause.
@@ -579,10 +579,10 @@ 
 		$params[] = self::POST_TYPE;
 		$params[] = ActionScheduler_Store::STATUS_PENDING;
 
-		if ( ! empty( $hooks ) ) {
-			$placeholders = array_fill( 0, count( $hooks ), '%s' );
-			$where       .= ' AND post_title IN (' . join( ', ', $placeholders ) . ')';
-			$params       = array_merge( $params, array_values( $hooks ) );
+		if (!empty($hooks)) {
+			$placeholders = array_fill(0, count($hooks), '%s');
+			$where       .= ' AND post_title IN (' . join(', ', $placeholders) . ')';
+			$params       = array_merge($params, array_values($hooks));
 		}
 
 		/*
@@ -590,11 +590,11 @@ 
 		 *
 		 * If we're not limiting by IDs, then include the post_date_gmt clause.
 		 */
-		if ( $limit_ids ) {
-			$where .= ' AND ID IN (' . join( ',', $ids ) . ')';
+		if ($limit_ids) {
+			$where .= ' AND ID IN (' . join(',', $ids) . ')';
 		} else {
 			$where .= ' AND post_date_gmt <= %s';
-			$params[] = $date->format( 'Y-m-d H:i:s' );
+			$params[] = $date->format('Y-m-d H:i:s');
 		}
 
 		// Add the ORDER BY clause and,ms limit.
@@ -602,9 +602,9 @@ 
 		$params[] = $limit;
 
 		// Run the query and gather results.
-		$rows_affected = $wpdb->query( $wpdb->prepare( "{$update} {$where} {$order}", $params ) );
-		if ( $rows_affected === false ) {
-			throw new RuntimeException( __( 'Unable to claim actions. Database error.', 'action-scheduler' ) );
+		$rows_affected = $wpdb->query($wpdb->prepare("{$update} {$where} {$order}", $params));
+		if ($rows_affected === false) {
+			throw new RuntimeException(__('Unable to claim actions. Database error.', 'action-scheduler'));
 		}
 
 		return (int) $rows_affected;
@@ -621,10 +621,10 @@ 
 	 * @return array IDs of actions in the appropriate group and before the appropriate time.
 	 * @throws InvalidArgumentException When the group does not exist.
 	 */
-	protected function get_actions_by_group( $group, $limit, DateTime $date ) {
+	protected function get_actions_by_group($group, $limit, DateTime $date) {
 		// Ensure the group exists before continuing.
-		if ( ! term_exists( $group, self::GROUP_TAXONOMY )) {
-			throw new InvalidArgumentException( sprintf( __( 'The group "%s" does not exist.', 'action-scheduler' ), $group ) );
+		if (!term_exists($group, self::GROUP_TAXONOMY)) {
+			throw new InvalidArgumentException(sprintf(__('The group "%s" does not exist.', 'action-scheduler'), $group));
 		}
 
 		// Set up a query for post IDs to use later.
@@ -644,7 +644,7 @@ 
 			),
 			'date_query'       => array(
 				'column' => 'post_date_gmt',
-				'before' => $date->format( 'Y-m-d H:i' ),
+				'before' => $date->format('Y-m-d H:i'),
 				'inclusive' => true,
 			),
 			'tax_query' => array(
@@ -657,63 +657,63 @@ 
 			),
 		);
 
-		return $query->query( $query_args );
+		return $query->query($query_args);
 	}
 
 	/**
 	 * @param string $claim_id
 	 * @return array
 	 */
-	public function find_actions_by_claim_id( $claim_id ) {
+	public function find_actions_by_claim_id($claim_id) {
 		/** @var wpdb $wpdb */
 		global $wpdb;
 		$sql = "SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND post_password = %s";
-		$sql = $wpdb->prepare( $sql, array( self::POST_TYPE, $claim_id ) );
-		$action_ids = $wpdb->get_col( $sql );
+		$sql = $wpdb->prepare($sql, array(self::POST_TYPE, $claim_id));
+		$action_ids = $wpdb->get_col($sql);
 		return $action_ids;
 	}
 
-	public function release_claim( ActionScheduler_ActionClaim $claim ) {
-		$action_ids = $this->find_actions_by_claim_id( $claim->get_id() );
-		if ( empty( $action_ids ) ) {
+	public function release_claim(ActionScheduler_ActionClaim $claim) {
+		$action_ids = $this->find_actions_by_claim_id($claim->get_id());
+		if (empty($action_ids)) {
 			return; // nothing to do
 		}
-		$action_id_string = implode( ',', array_map( 'intval', $action_ids ) );
+		$action_id_string = implode(',', array_map('intval', $action_ids));
 		/** @var wpdb $wpdb */
 		global $wpdb;
 		$sql = "UPDATE {$wpdb->posts} SET post_password = '' WHERE ID IN ($action_id_string) AND post_password = %s";
-		$sql = $wpdb->prepare( $sql, array( $claim->get_id() ) );
-		$result = $wpdb->query( $sql );
-		if ( $result === false ) {
+		$sql = $wpdb->prepare($sql, array($claim->get_id()));
+		$result = $wpdb->query($sql);
+		if ($result === false) {
 			/* translators: %s: claim ID */
-			throw new RuntimeException( sprintf( __( 'Unable to unlock claim %s. Database error.', 'action-scheduler' ), $claim->get_id() ) );
+			throw new RuntimeException(sprintf(__('Unable to unlock claim %s. Database error.', 'action-scheduler'), $claim->get_id()));
 		}
 	}
 
 	/**
 	 * @param string $action_id
 	 */
-	public function unclaim_action( $action_id ) {
+	public function unclaim_action($action_id) {
 		/** @var wpdb $wpdb */
 		global $wpdb;
 		$sql = "UPDATE {$wpdb->posts} SET post_password = '' WHERE ID = %d AND post_type = %s";
-		$sql = $wpdb->prepare( $sql, $action_id, self::POST_TYPE );
-		$result = $wpdb->query( $sql );
-		if ( $result === false ) {
+		$sql = $wpdb->prepare($sql, $action_id, self::POST_TYPE);
+		$result = $wpdb->query($sql);
+		if ($result === false) {
 			/* translators: %s: action ID */
-			throw new RuntimeException( sprintf( __( 'Unable to unlock claim on action %s. Database error.', 'action-scheduler' ), $action_id ) );
+			throw new RuntimeException(sprintf(__('Unable to unlock claim on action %s. Database error.', 'action-scheduler'), $action_id));
 		}
 	}
 
-	public function mark_failure( $action_id ) {
+	public function mark_failure($action_id) {
 		/** @var wpdb $wpdb */
 		global $wpdb;
 		$sql = "UPDATE {$wpdb->posts} SET post_status = %s WHERE ID = %d AND post_type = %s";
-		$sql = $wpdb->prepare( $sql, self::STATUS_FAILED, $action_id, self::POST_TYPE );
-		$result = $wpdb->query( $sql );
-		if ( $result === false ) {
+		$sql = $wpdb->prepare($sql, self::STATUS_FAILED, $action_id, self::POST_TYPE);
+		$result = $wpdb->query($sql);
+		if ($result === false) {
 			/* translators: %s: action ID */
-			throw new RuntimeException( sprintf( __( 'Unable to mark failure on action %s. Database error.', 'action-scheduler' ), $action_id ) );
+			throw new RuntimeException(sprintf(__('Unable to mark failure on action %s. Database error.', 'action-scheduler'), $action_id));
 		}
 	}
 
@@ -723,8 +723,8 @@ 
 	 * @param string $action_id
 	 * @return mixed
 	 */
-	public function get_claim_id( $action_id ) {
-		return $this->get_post_column( $action_id, 'post_password' );
+	public function get_claim_id($action_id) {
+		return $this->get_post_column($action_id, 'post_password');
 	}
 
 	/**
@@ -733,31 +733,31 @@ 
 	 * @param string $action_id
 	 * @return mixed
 	 */
-	public function get_status( $action_id ) {
-		$status = $this->get_post_column( $action_id, 'post_status' );
+	public function get_status($action_id) {
+		$status = $this->get_post_column($action_id, 'post_status');
 
-		if ( $status === null ) {
-			throw new InvalidArgumentException( __( 'Invalid action ID. No status found.', 'action-scheduler' ) );
+		if ($status === null) {
+			throw new InvalidArgumentException(__('Invalid action ID. No status found.', 'action-scheduler'));
 		}
 
-		return $this->get_action_status_by_post_status( $status );
+		return $this->get_action_status_by_post_status($status);
 	}
 
-	private function get_post_column( $action_id, $column_name ) {
+	private function get_post_column($action_id, $column_name) {
 		/** @var \wpdb $wpdb */
 		global $wpdb;
-		return $wpdb->get_var( $wpdb->prepare( "SELECT {$column_name} FROM {$wpdb->posts} WHERE ID=%d AND post_type=%s", $action_id, self::POST_TYPE ) );
+		return $wpdb->get_var($wpdb->prepare("SELECT {$column_name} FROM {$wpdb->posts} WHERE ID=%d AND post_type=%s", $action_id, self::POST_TYPE));
 	}
 
 	/**
 	 * @param string $action_id
 	 */
-	public function log_execution( $action_id ) {
+	public function log_execution($action_id) {
 		/** @var wpdb $wpdb */
 		global $wpdb;
 
 		$sql = "UPDATE {$wpdb->posts} SET menu_order = menu_order+1, post_status=%s, post_modified_gmt = %s, post_modified = %s WHERE ID = %d AND post_type = %s";
-		$sql = $wpdb->prepare( $sql, self::STATUS_RUNNING, current_time('mysql', true), current_time('mysql'), $action_id, self::POST_TYPE );
+		$sql = $wpdb->prepare($sql, self::STATUS_RUNNING, current_time('mysql', true), current_time('mysql'), $action_id, self::POST_TYPE);
 		$wpdb->query($sql);
 	}
 
@@ -767,21 +767,21 @@ 
 	 * @param int $action_id ID of the completed action.
 	 * @throws InvalidArgumentException|RuntimeException
 	 */
-	public function mark_complete( $action_id ) {
-		$post = get_post( $action_id );
-		if ( empty( $post ) || ( $post->post_type != self::POST_TYPE ) ) {
-			throw new InvalidArgumentException( sprintf( __( 'Unidentified action %s', 'action-scheduler' ), $action_id ) );
+	public function mark_complete($action_id) {
+		$post = get_post($action_id);
+		if (empty($post) || ($post->post_type != self::POST_TYPE)) {
+			throw new InvalidArgumentException(sprintf(__('Unidentified action %s', 'action-scheduler'), $action_id));
 		}
-		add_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10, 1 );
-		add_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10, 5 );
+		add_filter('wp_insert_post_data', array($this, 'filter_insert_post_data'), 10, 1);
+		add_filter('pre_wp_unique_post_slug', array($this, 'set_unique_post_slug'), 10, 5);
 		$result = wp_update_post(array(
 			'ID' => $action_id,
 			'post_status' => 'publish',
 		), TRUE);
-		remove_filter( 'wp_insert_post_data', array( $this, 'filter_insert_post_data' ), 10 );
-		remove_filter( 'pre_wp_unique_post_slug', array( $this, 'set_unique_post_slug' ), 10 );
-		if ( is_wp_error( $result ) ) {
-			throw new RuntimeException( $result->get_error_message() );
+		remove_filter('wp_insert_post_data', array($this, 'filter_insert_post_data'), 10);
+		remove_filter('pre_wp_unique_post_slug', array($this, 'set_unique_post_slug'), 10);
+		if (is_wp_error($result)) {
+			throw new RuntimeException($result->get_error_message());
 		}
 	}
 
@@ -790,7 +790,7 @@ 
 	 *
 	 * @param int $action_id Action ID.
 	 */
-	public function mark_migrated( $action_id ) {
+	public function mark_migrated($action_id) {
 		wp_update_post(
 			array(
 				'ID'          => $action_id,
@@ -804,12 +804,12 @@ 
 	 *
 	 * @return bool
 	 */
-	public function migration_dependencies_met( $setting ) {
+	public function migration_dependencies_met($setting) {
 		global $wpdb;
 
-		$dependencies_met = get_transient( self::DEPENDENCIES_MET );
-		if ( empty( $dependencies_met ) ) {
-			$maximum_args_length = apply_filters( 'action_scheduler_maximum_args_length', 191 );
+		$dependencies_met = get_transient(self::DEPENDENCIES_MET);
+		if (empty($dependencies_met)) {
+			$maximum_args_length = apply_filters('action_scheduler_maximum_args_length', 191);
 			$found_action        = $wpdb->get_var(
 				$wpdb->prepare(
 					"SELECT ID FROM {$wpdb->posts} WHERE post_type = %s AND CHAR_LENGTH(post_content) > %d LIMIT 1",
@@ -818,7 +818,7 @@ 
 				)
 			);
 			$dependencies_met = $found_action ? 'no' : 'yes';
-			set_transient( self::DEPENDENCIES_MET, $dependencies_met, DAY_IN_SECONDS );
+			set_transient(self::DEPENDENCIES_MET, $dependencies_met, DAY_IN_SECONDS);
 		}
 
 		return 'yes' == $dependencies_met ? $setting : false;
@@ -833,12 +833,12 @@ 
 	 *
 	 * @param ActionScheduler_Action $action
 	 */
-	protected function validate_action( ActionScheduler_Action $action ) {
+	protected function validate_action(ActionScheduler_Action $action) {
 		try {
-			parent::validate_action( $action );
-		} catch ( Exception $e ) {
-			$message = sprintf( __( '%s Support for strings longer than this will be removed in a future version.', 'action-scheduler' ), $e->getMessage() );
-			_doing_it_wrong( 'ActionScheduler_Action::$args', $message, '2.1.0' );
+			parent::validate_action($action);
+		} catch (Exception $e) {
+			$message = sprintf(__('%s Support for strings longer than this will be removed in a future version.', 'action-scheduler'), $e->getMessage());
+			_doing_it_wrong('ActionScheduler_Action::$args', $message, '2.1.0');
 		}
 	}
 
@@ -846,7 +846,7 @@ 
 	 * @codeCoverageIgnore
 	 */
 	public function init() {
-		add_filter( 'action_scheduler_migration_dependencies_met', array( $this, 'migration_dependencies_met' ) );
+		add_filter('action_scheduler_migration_dependencies_met', array($this, 'migration_dependencies_met'));
 
 		$post_type_registrar = new ActionScheduler_wpPostStore_PostTypeRegistrar();
 		$post_type_registrar->register();

includes/libraries/action-scheduler/classes/schema/ActionScheduler_LoggerSchema.php

Indentation +21 added lines, -21 removed lines

@@ -8,28 +8,28 @@ 
  * Creates a custom table for storing action logs
  */
 class ActionScheduler_LoggerSchema extends ActionScheduler_Abstract_Schema {
-	const LOG_TABLE = 'actionscheduler_logs';
+    const LOG_TABLE = 'actionscheduler_logs';
 
-	/**
-	 * @var int Increment this value to trigger a schema update.
-	 */
-	protected $schema_version = 2;
+    /**
+     * @var int Increment this value to trigger a schema update.
+     */
+    protected $schema_version = 2;
 
-	public function __construct() {
-		$this->tables = [
-			self::LOG_TABLE,
-		];
-	}
+    public function __construct() {
+        $this->tables = [
+            self::LOG_TABLE,
+        ];
+    }
 
-	protected function get_table_definition( $table ) {
-		global $wpdb;
-		$table_name       = $wpdb->$table;
-		$charset_collate  = $wpdb->get_charset_collate();
-		switch ( $table ) {
+    protected function get_table_definition( $table ) {
+        global $wpdb;
+        $table_name       = $wpdb->$table;
+        $charset_collate  = $wpdb->get_charset_collate();
+        switch ( $table ) {
 
-			case self::LOG_TABLE:
+            case self::LOG_TABLE:
 
-				return "CREATE TABLE {$table_name} (
+                return "CREATE TABLE {$table_name} (
 				        log_id bigint(20) unsigned NOT NULL auto_increment,
 				        action_id bigint(20) unsigned NOT NULL,
 				        message text NOT NULL,
@@ -40,8 +40,8 @@ 
 				        KEY log_date_gmt (log_date_gmt)
 				        ) $charset_collate";
 
-			default:
-				return '';
-		}
-	}
+            default:
+                return '';
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -21,11 +21,11 @@
 		];
 	}
 
-	protected function get_table_definition( $table ) {
+	protected function get_table_definition($table) {
 		global $wpdb;
 		$table_name       = $wpdb->$table;
 		$charset_collate  = $wpdb->get_charset_collate();
-		switch ( $table ) {
+		switch ($table) {
 
 			case self::LOG_TABLE:
 

includes/libraries/action-scheduler/classes/schema/ActionScheduler_StoreSchema.php

Indentation +30 added lines, -30 removed lines

@@ -8,33 +8,33 @@ 
  * Creates custom tables for storing scheduled actions
  */
 class ActionScheduler_StoreSchema extends ActionScheduler_Abstract_Schema {
-	const ACTIONS_TABLE = 'actionscheduler_actions';
-	const CLAIMS_TABLE  = 'actionscheduler_claims';
-	const GROUPS_TABLE  = 'actionscheduler_groups';
+    const ACTIONS_TABLE = 'actionscheduler_actions';
+    const CLAIMS_TABLE  = 'actionscheduler_claims';
+    const GROUPS_TABLE  = 'actionscheduler_groups';
 
-	/**
-	 * @var int Increment this value to trigger a schema update.
-	 */
-	protected $schema_version = 3;
+    /**
+     * @var int Increment this value to trigger a schema update.
+     */
+    protected $schema_version = 3;
 
-	public function __construct() {
-		$this->tables = [
-			self::ACTIONS_TABLE,
-			self::CLAIMS_TABLE,
-			self::GROUPS_TABLE,
-		];
-	}
+    public function __construct() {
+        $this->tables = [
+            self::ACTIONS_TABLE,
+            self::CLAIMS_TABLE,
+            self::GROUPS_TABLE,
+        ];
+    }
 
-	protected function get_table_definition( $table ) {
-		global $wpdb;
-		$table_name       = $wpdb->$table;
-		$charset_collate  = $wpdb->get_charset_collate();
-		$max_index_length = 191; // @see wp_get_db_schema()
-		switch ( $table ) {
+    protected function get_table_definition( $table ) {
+        global $wpdb;
+        $table_name       = $wpdb->$table;
+        $charset_collate  = $wpdb->get_charset_collate();
+        $max_index_length = 191; // @see wp_get_db_schema()
+        switch ( $table ) {
 
-			case self::ACTIONS_TABLE:
+            case self::ACTIONS_TABLE:
 
-				return "CREATE TABLE {$table_name} (
+                return "CREATE TABLE {$table_name} (
 				        action_id bigint(20) unsigned NOT NULL auto_increment,
 				        hook varchar(191) NOT NULL,
 				        status varchar(20) NOT NULL,
@@ -58,26 +58,26 @@ 
 				        KEY claim_id (claim_id)
 				        ) $charset_collate";
 
-			case self::CLAIMS_TABLE:
+            case self::CLAIMS_TABLE:
 
-				return "CREATE TABLE {$table_name} (
+                return "CREATE TABLE {$table_name} (
 				        claim_id bigint(20) unsigned NOT NULL auto_increment,
 				        date_created_gmt datetime NOT NULL default '0000-00-00 00:00:00',
 				        PRIMARY KEY  (claim_id),
 				        KEY date_created_gmt (date_created_gmt)
 				        ) $charset_collate";
 
-			case self::GROUPS_TABLE:
+            case self::GROUPS_TABLE:
 
-				return "CREATE TABLE {$table_name} (
+                return "CREATE TABLE {$table_name} (
 				        group_id bigint(20) unsigned NOT NULL auto_increment,
 				        slug varchar(255) NOT NULL,
 				        PRIMARY KEY  (group_id),
 				        KEY slug (slug($max_index_length))
 				        ) $charset_collate";
 
-			default:
-				return '';
-		}
-	}
+            default:
+                return '';
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -25,12 +25,12 @@
 		];
 	}
 
-	protected function get_table_definition( $table ) {
+	protected function get_table_definition($table) {
 		global $wpdb;
 		$table_name       = $wpdb->$table;
 		$charset_collate  = $wpdb->get_charset_collate();
 		$max_index_length = 191; // @see wp_get_db_schema()
-		switch ( $table ) {
+		switch ($table) {
 
 			case self::ACTIONS_TABLE:
 

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

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
  * Class ActionScheduler_NullLogEntry
  */
 class ActionScheduler_NullLogEntry extends ActionScheduler_LogEntry {
-	public function __construct( $action_id = '', $message = '' ) {
-		// nothing to see here
-	}
+    public function __construct( $action_id = '', $message = '' ) {
+        // nothing to see here
+    }
 }
- 
\ No newline at end of file
+    
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
  * Class ActionScheduler_NullLogEntry
  */
 class ActionScheduler_NullLogEntry extends ActionScheduler_LogEntry {
-	public function __construct( $action_id = '', $message = '' ) {
+	public function __construct($action_id = '', $message = '') {
 		// nothing to see here
 	}
 }

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

Indentation +147 added lines, -147 removed lines

@@ -5,151 +5,151 @@
  */
 class ActionScheduler_QueueCleaner {
 
-	/** @var int */
-	protected $batch_size;
-
-	/** @var ActionScheduler_Store */
-	private $store = null;
-
-	/**
-	 * 31 days in seconds.
-	 *
-	 * @var int
-	 */
-	private $month_in_seconds = 2678400;
-
-	/**
-	 * ActionScheduler_QueueCleaner constructor.
-	 *
-	 * @param ActionScheduler_Store $store      The store instance.
-	 * @param int                   $batch_size The batch size.
-	 */
-	public function __construct( ActionScheduler_Store $store = null, $batch_size = 20 ) {
-		$this->store = $store ? $store : ActionScheduler_Store::instance();
-		$this->batch_size = $batch_size;
-	}
-
-	public function delete_old_actions() {
-		$lifespan = apply_filters( 'action_scheduler_retention_period', $this->month_in_seconds );
-		$cutoff = as_get_datetime_object($lifespan.' seconds ago');
-
-		$statuses_to_purge = array(
-			ActionScheduler_Store::STATUS_COMPLETE,
-			ActionScheduler_Store::STATUS_CANCELED,
-		);
-
-		foreach ( $statuses_to_purge as $status ) {
-			$actions_to_delete = $this->store->query_actions( array(
-				'status'           => $status,
-				'modified'         => $cutoff,
-				'modified_compare' => '<=',
-				'per_page'         => $this->get_batch_size(),
-			) );
-
-			foreach ( $actions_to_delete as $action_id ) {
-				try {
-					$this->store->delete_action( $action_id );
-				} catch ( Exception $e ) {
-
-					/**
-					 * Notify 3rd party code of exceptions when deleting a completed action older than the retention period
-					 *
-					 * This hook provides a way for 3rd party code to log or otherwise handle exceptions relating to their
-					 * actions.
-					 *
-					 * @since 2.0.0
-					 *
-					 * @param int $action_id The scheduled actions ID in the data store
-					 * @param Exception $e The exception thrown when attempting to delete the action from the data store
-					 * @param int $lifespan The retention period, in seconds, for old actions
-					 * @param int $count_of_actions_to_delete The number of old actions being deleted in this batch
-					 */
-					do_action( 'action_scheduler_failed_old_action_deletion', $action_id, $e, $lifespan, count( $actions_to_delete ) );
-				}
-			}
-		}
-	}
-
-	/**
-	 * Unclaim pending actions that have not been run within a given time limit.
-	 *
-	 * When called by ActionScheduler_Abstract_QueueRunner::run_cleanup(), the time limit passed
-	 * as a parameter is 10x the time limit used for queue processing.
-	 *
-	 * @param int $time_limit The number of seconds to allow a queue to run before unclaiming its pending actions. Default 300 (5 minutes).
-	 */
-	public function reset_timeouts( $time_limit = 300 ) {
-		$timeout = apply_filters( 'action_scheduler_timeout_period', $time_limit );
-		if ( $timeout < 0 ) {
-			return;
-		}
-		$cutoff = as_get_datetime_object($timeout.' seconds ago');
-		$actions_to_reset = $this->store->query_actions( array(
-			'status'           => ActionScheduler_Store::STATUS_PENDING,
-			'modified'         => $cutoff,
-			'modified_compare' => '<=',
-			'claimed'          => true,
-			'per_page'         => $this->get_batch_size(),
-		) );
-
-		foreach ( $actions_to_reset as $action_id ) {
-			$this->store->unclaim_action( $action_id );
-			do_action( 'action_scheduler_reset_action', $action_id );
-		}
-	}
-
-	/**
-	 * Mark actions that have been running for more than a given time limit as failed, based on
-	 * the assumption some uncatachable and unloggable fatal error occurred during processing.
-	 *
-	 * When called by ActionScheduler_Abstract_QueueRunner::run_cleanup(), the time limit passed
-	 * as a parameter is 10x the time limit used for queue processing.
-	 *
-	 * @param int $time_limit The number of seconds to allow an action to run before it is considered to have failed. Default 300 (5 minutes).
-	 */
-	public function mark_failures( $time_limit = 300 ) {
-		$timeout = apply_filters( 'action_scheduler_failure_period', $time_limit );
-		if ( $timeout < 0 ) {
-			return;
-		}
-		$cutoff = as_get_datetime_object($timeout.' seconds ago');
-		$actions_to_reset = $this->store->query_actions( array(
-			'status'           => ActionScheduler_Store::STATUS_RUNNING,
-			'modified'         => $cutoff,
-			'modified_compare' => '<=',
-			'per_page'         => $this->get_batch_size(),
-		) );
-
-		foreach ( $actions_to_reset as $action_id ) {
-			$this->store->mark_failure( $action_id );
-			do_action( 'action_scheduler_failed_action', $action_id, $timeout );
-		}
-	}
-
-	/**
-	 * Do all of the cleaning actions.
-	 *
-	 * @param int $time_limit The number of seconds to use as the timeout and failure period. Default 300 (5 minutes).
-	 * @author Jeremy Pry
-	 */
-	public function clean( $time_limit = 300 ) {
-		$this->delete_old_actions();
-		$this->reset_timeouts( $time_limit );
-		$this->mark_failures( $time_limit );
-	}
-
-	/**
-	 * Get the batch size for cleaning the queue.
-	 *
-	 * @author Jeremy Pry
-	 * @return int
-	 */
-	protected function get_batch_size() {
-		/**
-		 * Filter the batch size when cleaning the queue.
-		 *
-		 * @param int $batch_size The number of actions to clean in one batch.
-		 */
-		return absint( apply_filters( 'action_scheduler_cleanup_batch_size', $this->batch_size ) );
-	}
+    /** @var int */
+    protected $batch_size;
+
+    /** @var ActionScheduler_Store */
+    private $store = null;
+
+    /**
+     * 31 days in seconds.
+     *
+     * @var int
+     */
+    private $month_in_seconds = 2678400;
+
+    /**
+     * ActionScheduler_QueueCleaner constructor.
+     *
+     * @param ActionScheduler_Store $store      The store instance.
+     * @param int                   $batch_size The batch size.
+     */
+    public function __construct( ActionScheduler_Store $store = null, $batch_size = 20 ) {
+        $this->store = $store ? $store : ActionScheduler_Store::instance();
+        $this->batch_size = $batch_size;
+    }
+
+    public function delete_old_actions() {
+        $lifespan = apply_filters( 'action_scheduler_retention_period', $this->month_in_seconds );
+        $cutoff = as_get_datetime_object($lifespan.' seconds ago');
+
+        $statuses_to_purge = array(
+            ActionScheduler_Store::STATUS_COMPLETE,
+            ActionScheduler_Store::STATUS_CANCELED,
+        );
+
+        foreach ( $statuses_to_purge as $status ) {
+            $actions_to_delete = $this->store->query_actions( array(
+                'status'           => $status,
+                'modified'         => $cutoff,
+                'modified_compare' => '<=',
+                'per_page'         => $this->get_batch_size(),
+            ) );
+
+            foreach ( $actions_to_delete as $action_id ) {
+                try {
+                    $this->store->delete_action( $action_id );
+                } catch ( Exception $e ) {
+
+                    /**
+                     * Notify 3rd party code of exceptions when deleting a completed action older than the retention period
+                     *
+                     * This hook provides a way for 3rd party code to log or otherwise handle exceptions relating to their
+                     * actions.
+                     *
+                     * @since 2.0.0
+                     *
+                     * @param int $action_id The scheduled actions ID in the data store
+                     * @param Exception $e The exception thrown when attempting to delete the action from the data store
+                     * @param int $lifespan The retention period, in seconds, for old actions
+                     * @param int $count_of_actions_to_delete The number of old actions being deleted in this batch
+                     */
+                    do_action( 'action_scheduler_failed_old_action_deletion', $action_id, $e, $lifespan, count( $actions_to_delete ) );
+                }
+            }
+        }
+    }
+
+    /**
+     * Unclaim pending actions that have not been run within a given time limit.
+     *
+     * When called by ActionScheduler_Abstract_QueueRunner::run_cleanup(), the time limit passed
+     * as a parameter is 10x the time limit used for queue processing.
+     *
+     * @param int $time_limit The number of seconds to allow a queue to run before unclaiming its pending actions. Default 300 (5 minutes).
+     */
+    public function reset_timeouts( $time_limit = 300 ) {
+        $timeout = apply_filters( 'action_scheduler_timeout_period', $time_limit );
+        if ( $timeout < 0 ) {
+            return;
+        }
+        $cutoff = as_get_datetime_object($timeout.' seconds ago');
+        $actions_to_reset = $this->store->query_actions( array(
+            'status'           => ActionScheduler_Store::STATUS_PENDING,
+            'modified'         => $cutoff,
+            'modified_compare' => '<=',
+            'claimed'          => true,
+            'per_page'         => $this->get_batch_size(),
+        ) );
+
+        foreach ( $actions_to_reset as $action_id ) {
+            $this->store->unclaim_action( $action_id );
+            do_action( 'action_scheduler_reset_action', $action_id );
+        }
+    }
+
+    /**
+     * Mark actions that have been running for more than a given time limit as failed, based on
+     * the assumption some uncatachable and unloggable fatal error occurred during processing.
+     *
+     * When called by ActionScheduler_Abstract_QueueRunner::run_cleanup(), the time limit passed
+     * as a parameter is 10x the time limit used for queue processing.
+     *
+     * @param int $time_limit The number of seconds to allow an action to run before it is considered to have failed. Default 300 (5 minutes).
+     */
+    public function mark_failures( $time_limit = 300 ) {
+        $timeout = apply_filters( 'action_scheduler_failure_period', $time_limit );
+        if ( $timeout < 0 ) {
+            return;
+        }
+        $cutoff = as_get_datetime_object($timeout.' seconds ago');
+        $actions_to_reset = $this->store->query_actions( array(
+            'status'           => ActionScheduler_Store::STATUS_RUNNING,
+            'modified'         => $cutoff,
+            'modified_compare' => '<=',
+            'per_page'         => $this->get_batch_size(),
+        ) );
+
+        foreach ( $actions_to_reset as $action_id ) {
+            $this->store->mark_failure( $action_id );
+            do_action( 'action_scheduler_failed_action', $action_id, $timeout );
+        }
+    }
+
+    /**
+     * Do all of the cleaning actions.
+     *
+     * @param int $time_limit The number of seconds to use as the timeout and failure period. Default 300 (5 minutes).
+     * @author Jeremy Pry
+     */
+    public function clean( $time_limit = 300 ) {
+        $this->delete_old_actions();
+        $this->reset_timeouts( $time_limit );
+        $this->mark_failures( $time_limit );
+    }
+
+    /**
+     * Get the batch size for cleaning the queue.
+     *
+     * @author Jeremy Pry
+     * @return int
+     */
+    protected function get_batch_size() {
+        /**
+         * Filter the batch size when cleaning the queue.
+         *
+         * @param int $batch_size The number of actions to clean in one batch.
+         */
+        return absint( apply_filters( 'action_scheduler_cleanup_batch_size', $this->batch_size ) );
+    }
 }

Spacing +32 added lines, -32 removed lines

@@ -24,32 +24,32 @@ 
 	 * @param ActionScheduler_Store $store      The store instance.
 	 * @param int                   $batch_size The batch size.
 	 */
-	public function __construct( ActionScheduler_Store $store = null, $batch_size = 20 ) {
+	public function __construct(ActionScheduler_Store $store = null, $batch_size = 20) {
 		$this->store = $store ? $store : ActionScheduler_Store::instance();
 		$this->batch_size = $batch_size;
 	}
 
 	public function delete_old_actions() {
-		$lifespan = apply_filters( 'action_scheduler_retention_period', $this->month_in_seconds );
-		$cutoff = as_get_datetime_object($lifespan.' seconds ago');
+		$lifespan = apply_filters('action_scheduler_retention_period', $this->month_in_seconds);
+		$cutoff = as_get_datetime_object($lifespan . ' seconds ago');
 
 		$statuses_to_purge = array(
 			ActionScheduler_Store::STATUS_COMPLETE,
 			ActionScheduler_Store::STATUS_CANCELED,
 		);
 
-		foreach ( $statuses_to_purge as $status ) {
-			$actions_to_delete = $this->store->query_actions( array(
+		foreach ($statuses_to_purge as $status) {
+			$actions_to_delete = $this->store->query_actions(array(
 				'status'           => $status,
 				'modified'         => $cutoff,
 				'modified_compare' => '<=',
 				'per_page'         => $this->get_batch_size(),
-			) );
+			));
 
-			foreach ( $actions_to_delete as $action_id ) {
+			foreach ($actions_to_delete as $action_id) {
 				try {
-					$this->store->delete_action( $action_id );
-				} catch ( Exception $e ) {
+					$this->store->delete_action($action_id);
+				} catch (Exception $e) {
 
 					/**
 					 * Notify 3rd party code of exceptions when deleting a completed action older than the retention period
@@ -64,7 +64,7 @@ 
 					 * @param int $lifespan The retention period, in seconds, for old actions
 					 * @param int $count_of_actions_to_delete The number of old actions being deleted in this batch
 					 */
-					do_action( 'action_scheduler_failed_old_action_deletion', $action_id, $e, $lifespan, count( $actions_to_delete ) );
+					do_action('action_scheduler_failed_old_action_deletion', $action_id, $e, $lifespan, count($actions_to_delete));
 				}
 			}
 		}
@@ -78,23 +78,23 @@ 
 	 *
 	 * @param int $time_limit The number of seconds to allow a queue to run before unclaiming its pending actions. Default 300 (5 minutes).
 	 */
-	public function reset_timeouts( $time_limit = 300 ) {
-		$timeout = apply_filters( 'action_scheduler_timeout_period', $time_limit );
-		if ( $timeout < 0 ) {
+	public function reset_timeouts($time_limit = 300) {
+		$timeout = apply_filters('action_scheduler_timeout_period', $time_limit);
+		if ($timeout < 0) {
 			return;
 		}
-		$cutoff = as_get_datetime_object($timeout.' seconds ago');
-		$actions_to_reset = $this->store->query_actions( array(
+		$cutoff = as_get_datetime_object($timeout . ' seconds ago');
+		$actions_to_reset = $this->store->query_actions(array(
 			'status'           => ActionScheduler_Store::STATUS_PENDING,
 			'modified'         => $cutoff,
 			'modified_compare' => '<=',
 			'claimed'          => true,
 			'per_page'         => $this->get_batch_size(),
-		) );
+		));
 
-		foreach ( $actions_to_reset as $action_id ) {
-			$this->store->unclaim_action( $action_id );
-			do_action( 'action_scheduler_reset_action', $action_id );
+		foreach ($actions_to_reset as $action_id) {
+			$this->store->unclaim_action($action_id);
+			do_action('action_scheduler_reset_action', $action_id);
 		}
 	}
 
@@ -107,22 +107,22 @@ 
 	 *
 	 * @param int $time_limit The number of seconds to allow an action to run before it is considered to have failed. Default 300 (5 minutes).
 	 */
-	public function mark_failures( $time_limit = 300 ) {
-		$timeout = apply_filters( 'action_scheduler_failure_period', $time_limit );
-		if ( $timeout < 0 ) {
+	public function mark_failures($time_limit = 300) {
+		$timeout = apply_filters('action_scheduler_failure_period', $time_limit);
+		if ($timeout < 0) {
 			return;
 		}
-		$cutoff = as_get_datetime_object($timeout.' seconds ago');
-		$actions_to_reset = $this->store->query_actions( array(
+		$cutoff = as_get_datetime_object($timeout . ' seconds ago');
+		$actions_to_reset = $this->store->query_actions(array(
 			'status'           => ActionScheduler_Store::STATUS_RUNNING,
 			'modified'         => $cutoff,
 			'modified_compare' => '<=',
 			'per_page'         => $this->get_batch_size(),
-		) );
+		));
 
-		foreach ( $actions_to_reset as $action_id ) {
-			$this->store->mark_failure( $action_id );
-			do_action( 'action_scheduler_failed_action', $action_id, $timeout );
+		foreach ($actions_to_reset as $action_id) {
+			$this->store->mark_failure($action_id);
+			do_action('action_scheduler_failed_action', $action_id, $timeout);
 		}
 	}
 
@@ -132,10 +132,10 @@ 
 	 * @param int $time_limit The number of seconds to use as the timeout and failure period. Default 300 (5 minutes).
 	 * @author Jeremy Pry
 	 */
-	public function clean( $time_limit = 300 ) {
+	public function clean($time_limit = 300) {
 		$this->delete_old_actions();
-		$this->reset_timeouts( $time_limit );
-		$this->mark_failures( $time_limit );
+		$this->reset_timeouts($time_limit);
+		$this->mark_failures($time_limit);
 	}
 
 	/**
@@ -150,6 +150,6 @@ 
 		 *
 		 * @param int $batch_size The number of actions to clean in one batch.
 		 */
-		return absint( apply_filters( 'action_scheduler_cleanup_batch_size', $this->batch_size ) );
+		return absint(apply_filters('action_scheduler_cleanup_batch_size', $this->batch_size));
 	}
 }

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

Indentation +35 added lines, -35 removed lines

@@ -9,41 +9,41 @@
  */
 class ActionScheduler_OptionLock extends ActionScheduler_Lock {
 
-	/**
-	 * Set a lock using options for a given amount of time (60 seconds by default).
-	 *
-	 * Using an autoloaded option avoids running database queries or other resource intensive tasks
-	 * on frequently triggered hooks, like 'init' or 'shutdown'.
-	 *
-	 * For example, ActionScheduler_QueueRunner->maybe_dispatch_async_request() uses a lock to avoid
-	 * calling ActionScheduler_QueueRunner->has_maximum_concurrent_batches() every time the 'shutdown',
-	 * hook is triggered, because that method calls ActionScheduler_QueueRunner->store->get_claim_count()
-	 * to find the current number of claims in the database.
-	 *
-	 * @param string $lock_type A string to identify different lock types.
-	 * @bool True if lock value has changed, false if not or if set failed.
-	 */
-	public function set( $lock_type ) {
-		return update_option( $this->get_key( $lock_type ), time() + $this->get_duration( $lock_type ) );
-	}
+    /**
+     * Set a lock using options for a given amount of time (60 seconds by default).
+     *
+     * Using an autoloaded option avoids running database queries or other resource intensive tasks
+     * on frequently triggered hooks, like 'init' or 'shutdown'.
+     *
+     * For example, ActionScheduler_QueueRunner->maybe_dispatch_async_request() uses a lock to avoid
+     * calling ActionScheduler_QueueRunner->has_maximum_concurrent_batches() every time the 'shutdown',
+     * hook is triggered, because that method calls ActionScheduler_QueueRunner->store->get_claim_count()
+     * to find the current number of claims in the database.
+     *
+     * @param string $lock_type A string to identify different lock types.
+     * @bool True if lock value has changed, false if not or if set failed.
+     */
+    public function set( $lock_type ) {
+        return update_option( $this->get_key( $lock_type ), time() + $this->get_duration( $lock_type ) );
+    }
 
-	/**
-	 * If a lock is set, return the timestamp it was set to expiry.
-	 *
-	 * @param string $lock_type A string to identify different lock types.
-	 * @return bool|int False if no lock is set, otherwise the timestamp for when the lock is set to expire.
-	 */
-	public function get_expiration( $lock_type ) {
-		return get_option( $this->get_key( $lock_type ) );
-	}
+    /**
+     * If a lock is set, return the timestamp it was set to expiry.
+     *
+     * @param string $lock_type A string to identify different lock types.
+     * @return bool|int False if no lock is set, otherwise the timestamp for when the lock is set to expire.
+     */
+    public function get_expiration( $lock_type ) {
+        return get_option( $this->get_key( $lock_type ) );
+    }
 
-	/**
-	 * Get the key to use for storing the lock in the transient
-	 *
-	 * @param string $lock_type A string to identify different lock types.
-	 * @return string
-	 */
-	protected function get_key( $lock_type ) {
-		return sprintf( 'action_scheduler_lock_%s', $lock_type );
-	}
+    /**
+     * Get the key to use for storing the lock in the transient
+     *
+     * @param string $lock_type A string to identify different lock types.
+     * @return string
+     */
+    protected function get_key( $lock_type ) {
+        return sprintf( 'action_scheduler_lock_%s', $lock_type );
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -23,8 +23,8 @@ 
 	 * @param string $lock_type A string to identify different lock types.
 	 * @bool True if lock value has changed, false if not or if set failed.
 	 */
-	public function set( $lock_type ) {
-		return update_option( $this->get_key( $lock_type ), time() + $this->get_duration( $lock_type ) );
+	public function set($lock_type) {
+		return update_option($this->get_key($lock_type), time() + $this->get_duration($lock_type));
 	}
 
 	/**
@@ -33,8 +33,8 @@ 
 	 * @param string $lock_type A string to identify different lock types.
 	 * @return bool|int False if no lock is set, otherwise the timestamp for when the lock is set to expire.
 	 */
-	public function get_expiration( $lock_type ) {
-		return get_option( $this->get_key( $lock_type ) );
+	public function get_expiration($lock_type) {
+		return get_option($this->get_key($lock_type));
 	}
 
 	/**
@@ -43,7 +43,7 @@ 
 	 * @param string $lock_type A string to identify different lock types.
 	 * @return string
 	 */
-	protected function get_key( $lock_type ) {
-		return sprintf( 'action_scheduler_lock_%s', $lock_type );
+	protected function get_key($lock_type) {
+		return sprintf('action_scheduler_lock_%s', $lock_type);
 	}
 }

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

Indentation +13 added lines, -13 removed lines

@@ -4,20 +4,20 @@
  * Class ActionScheduler_ActionClaim
  */
 class ActionScheduler_ActionClaim {
-	private $id = '';
-	private $action_ids = array();
+    private $id = '';
+    private $action_ids = array();
 
-	public function __construct( $id, array $action_ids ) {
-		$this->id = $id;
-		$this->action_ids = $action_ids;
-	}
+    public function __construct( $id, array $action_ids ) {
+        $this->id = $id;
+        $this->action_ids = $action_ids;
+    }
 
-	public function get_id() {
-		return $this->id;
-	}
+    public function get_id() {
+        return $this->id;
+    }
 
-	public function get_actions() {
-		return $this->action_ids;
-	}
+    public function get_actions() {
+        return $this->action_ids;
+    }
 }
- 
\ No newline at end of file
+    
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 	private $id = '';
 	private $action_ids = array();
 
-	public function __construct( $id, array $action_ids ) {
+	public function __construct($id, array $action_ids) {
 		$this->id = $id;
 		$this->action_ids = $action_ids;
 	}

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

Indentation +191 added lines, -191 removed lines

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

Spacing +34 added lines, -34 removed lines

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