Merge branch 'trunk' into fix-forum-17945942

# Conflicts:
#	classes/ActionScheduler_WPCommentCleaner.php

Author: crstauf

classes/ActionScheduler_WPCommentCleaner.php

@@ -68,7 +68,13 @@ public static function has_logs() {
 	public static function maybe_schedule_cleanup() {
 		$has_logs = 'no';
 
-		if ( (bool) get_comments( array( 'type' => ActionScheduler_wpCommentLogger::TYPE, 'number' => 1, 'fields' => 'ids' ) ) ) {
+		$args = array(
+			'type'   => ActionScheduler_wpCommentLogger::TYPE,
+			'number' => 1,
+			'fields' => 'ids',
+		);
+
+		if ( (bool) get_comments( $args ) ) {
 			$has_logs = 'yes';
 
 			if ( ! as_next_scheduled_action( self::$cleanup_hook ) ) {
@@ -84,7 +90,15 @@ public static function maybe_schedule_cleanup() {
 	 */
 	public static function delete_all_action_comments() {
 		global $wpdb;
-		$wpdb->delete( $wpdb->comments, array( 'comment_type' => ActionScheduler_wpCommentLogger::TYPE, 'comment_agent' => ActionScheduler_wpCommentLogger::AGENT ) );
+
+		$wpdb->delete(
+			$wpdb->comments,
+			array(
+				'comment_type'  => ActionScheduler_wpCommentLogger::TYPE,
+				'comment_agent' => ActionScheduler_wpCommentLogger::AGENT,
+			)
+		);
+
 		update_option( self::$has_logs_option_key, 'no', true );
 	}
 

classes/WP_CLI/ActionScheduler_WPCLI_Clean_Command.php

@@ -41,7 +41,7 @@ public function clean( $args, $assoc_args ) {
 
 		$batches_completed = 0;
 		$actions_deleted   = 0;
-		$unlimited         = $batches === 0;
+		$unlimited         = 0 === $batches;
 		try {
 			$lifespan = as_get_datetime_object( $before );
 		} catch ( Exception $e ) {
@@ -58,7 +58,7 @@ public function clean( $args, $assoc_args ) {
 					sleep( $sleep );
 				}
 
-				$deleted = count( $cleaner->clean_actions( $status, $lifespan, null,'CLI' ) );
+				$deleted = count( $cleaner->clean_actions( $status, $lifespan, null, 'CLI' ) );
 				if ( $deleted <= 0 ) {
 					break;
 				}
@@ -95,8 +95,6 @@ protected function print_total_batches( int $batches_processed ) {
 	 * Convert an exception into a WP CLI error.
 	 *
 	 * @param Exception $e The error object.
-	 *
-	 * @throws \WP_CLI\ExitException
 	 */
 	protected function print_error( Exception $e ) {
 		WP_CLI::error(

classes/actions/ActionScheduler_Action.php

@@ -4,13 +4,32 @@
  * Class ActionScheduler_Action
  */
 class ActionScheduler_Action {
-	/** @var string */
+	/**
+	 * Action's hook.
+	 *
+	 * @var string
+	 */
 	protected $hook = '';
-	/** @var array<string, mixed> */
+
+	/**
+	 * Action's args.
+	 *
+	 * @var array<string, mixed>
+	 */
 	protected $args = array();
-	/** @var ActionScheduler_Schedule */
-	protected $schedule = NULL;
-	/** @var string */
+
+	/**
+	 * Action's schedule.
+	 *
+	 * @var ActionScheduler_Schedule
+	 */
+	protected $schedule = null;
+
+	/**
+	 * Action's group.
+	 *
+	 * @var string
+	 */
 	protected $group = '';
 
 	/**
@@ -34,12 +53,12 @@ class ActionScheduler_Action {
 	 * @param null|ActionScheduler_Schedule $schedule Action's schedule.
 	 * @param string                        $group Action's group.
 	 */
-	public function __construct( $hook, array $args = array(), ActionScheduler_Schedule $schedule = NULL, $group = '' ) {
+	public function __construct( $hook, array $args = array(), ActionScheduler_Schedule $schedule = null, $group = '' ) {
 		$schedule = empty( $schedule ) ? new ActionScheduler_NullSchedule() : $schedule;
-		$this->set_hook($hook);
-		$this->set_schedule($schedule);
-		$this->set_args($args);
-		$this->set_group($group);
+		$this->set_hook( $hook );
+		$this->set_schedule( $schedule );
+		$this->set_args( $args );
+		$this->set_group( $group );
 	}
 
 	/**
@@ -93,6 +112,8 @@ protected function set_schedule( ActionScheduler_Schedule $schedule ) {
 	}
 
 	/**
+	 * Action's schedule.
+	 *
 	 * @return ActionScheduler_Schedule
 	 */
 	public function get_schedule() {
@@ -125,17 +146,21 @@ protected function set_group( $group ) {
 	}
 
 	/**
+	 * Action's group.
+	 *
 	 * @return string
 	 */
 	public function get_group() {
 		return $this->group;
 	}
 
 	/**
-	 * @return bool If the action has been finished
+	 * Action has not finished.
+	 *
+	 * @return bool
 	 */
 	public function is_finished() {
-		return FALSE;
+		return false;
 	}
 
 	/**

classes/actions/ActionScheduler_FinishedAction.php

@@ -16,6 +16,6 @@ public function execute() {
 	 * Get finished state.
 	 */
 	public function is_finished() {
-		return TRUE;
+		return true;
 	}
 }

classes/actions/ActionScheduler_NullAction.php

@@ -12,7 +12,7 @@ class ActionScheduler_NullAction extends ActionScheduler_Action {
 	 * @param mixed[]                       $args Action arguments.
 	 * @param null|ActionScheduler_Schedule $schedule Action schedule.
 	 */
-	public function __construct( $hook = '', array $args = array(), ActionScheduler_Schedule $schedule = NULL ) {
+	public function __construct( $hook = '', array $args = array(), ActionScheduler_Schedule $schedule = null ) {
 		$this->set_schedule( new ActionScheduler_NullSchedule() );
 	}