Merge branch 'trunk' into phpcs/ActionScheduler_wpCommentLogger_Test.php

# Conflicts:
#	phpcs.xml

Author: crstauf

classes/data-stores/ActionScheduler_HybridStore.php

@@ -15,16 +15,32 @@
 class ActionScheduler_HybridStore extends Store {
 	const DEMARKATION_OPTION = 'action_scheduler_hybrid_store_demarkation';
 
-	/** @var ActionScheduler_Store */
+	/**
+	 * Primary store instance.
+	 *
+	 * @var ActionScheduler_Store
+	 */
 	private $primary_store;
-	/** @var ActionScheduler_Store */
+
+	/**
+	 * Secondary store instance.
+	 *
+	 * @var ActionScheduler_Store
+	 */
 	private $secondary_store;
-	/** @var Action_Scheduler\Migration\Runner */
+
+	/**
+	 * Runner instance.
+	 *
+	 * @var Action_Scheduler\Migration\Runner
+	 */
 	private $migration_runner;
 
 	/**
-	 * @var int The dividing line between IDs of actions created
-	 *          by the primary and secondary stores.
+	 * The dividing line between IDs of actions created
+	 * by the primary and secondary stores.
+	 *
+	 * @var int
 	 *
 	 * Methods that accept an action ID will compare the ID against
 	 * this to determine which store will contain that ID. In almost
@@ -56,10 +72,10 @@ public function __construct( Config $config = null ) {
 	 * @codeCoverageIgnore
 	 */
 	public function init() {
-		add_action( 'action_scheduler/created_table', [ $this, 'set_autoincrement' ], 10, 2 );
+		add_action( 'action_scheduler/created_table', array( $this, 'set_autoincrement' ), 10, 2 );
 		$this->primary_store->init();
 		$this->secondary_store->init();
-		remove_action( 'action_scheduler/created_table', [ $this, 'set_autoincrement' ], 10 );
+		remove_action( 'action_scheduler/created_table', array( $this, 'set_autoincrement' ), 10 );
 	}
 
 	/**
@@ -78,8 +94,14 @@ public function set_autoincrement( $table_name, $table_suffix ) {
 			if ( empty( $this->demarkation_id ) ) {
 				$this->demarkation_id = $this->set_demarkation_id();
 			}
-			/** @var \wpdb $wpdb */
+
+			/**
+			 * Global.
+			 *
+			 * @var \wpdb $wpdb
+			 */
 			global $wpdb;
+
 			/**
 			 * A default date of '0000-00-00 00:00:00' is invalid in MySQL 5.7 when configured with
 			 * sql_mode including both STRICT_TRANS_TABLES and NO_ZERO_DATE.
@@ -91,20 +113,20 @@ public function set_autoincrement( $table_name, $table_suffix ) {
 
 			$row_count = $wpdb->insert(
 				$wpdb->{ActionScheduler_StoreSchema::ACTIONS_TABLE},
-				[
+				array(
 					'action_id'            => $this->demarkation_id,
 					'hook'                 => '',
 					'status'               => '',
 					'scheduled_date_gmt'   => $date_gmt,
 					'scheduled_date_local' => $date_local,
 					'last_attempt_gmt'     => $date_gmt,
 					'last_attempt_local'   => $date_local,
-				]
+				)
 			);
 			if ( $row_count > 0 ) {
 				$wpdb->delete(
 					$wpdb->{ActionScheduler_StoreSchema::ACTIONS_TABLE},
-					[ 'action_id' => $this->demarkation_id ]
+					array( 'action_id' => $this->demarkation_id )
 				);
 			}
 		}
@@ -122,10 +144,15 @@ public function set_autoincrement( $table_name, $table_suffix ) {
 	 */
 	private function set_demarkation_id( $id = null ) {
 		if ( empty( $id ) ) {
-			/** @var \wpdb $wpdb */
+			/**
+			 * Global.
+			 *
+			 * @var \wpdb $wpdb
+			 */
 			global $wpdb;
+
 			$id = (int) $wpdb->get_var( "SELECT MAX(ID) FROM $wpdb->posts" );
-			$id ++;
+			$id++;
 		}
 		update_option( self::DEMARKATION_OPTION, $id );
 
@@ -143,10 +170,10 @@ private function set_demarkation_id( $id = null ) {
 	 *
 	 * @return string
 	 */
-	public function find_action( $hook, $params = [] ) {
+	public function find_action( $hook, $params = array() ) {
 		$found_unmigrated_action = $this->secondary_store->find_action( $hook, $params );
 		if ( ! empty( $found_unmigrated_action ) ) {
-			$this->migrate( [ $found_unmigrated_action ] );
+			$this->migrate( array( $found_unmigrated_action ) );
 		}
 
 		return $this->primary_store->find_action( $hook, $params );
@@ -162,7 +189,7 @@ public function find_action( $hook, $params = [] ) {
 	 *
 	 * @return int[]
 	 */
-	public function query_actions( $query = [], $query_type = 'select' ) {
+	public function query_actions( $query = array(), $query_type = 'select' ) {
 		$found_unmigrated_actions = $this->secondary_store->query_actions( $query, 'select' );
 		if ( ! empty( $found_unmigrated_actions ) ) {
 			$this->migrate( $found_unmigrated_actions );
@@ -357,19 +384,19 @@ public function get_status( $action_id ) {
 	 */
 	protected function get_store_from_action_id( $action_id, $primary_first = false ) {
 		if ( $primary_first ) {
-			$stores = [
+			$stores = array(
 				$this->primary_store,
 				$this->secondary_store,
-			];
+			);
 		} elseif ( $action_id < $this->demarkation_id ) {
-			$stores = [
+			$stores = array(
 				$this->secondary_store,
 				$this->primary_store,
-			];
+			);
 		} else {
-			$stores = [
+			$stores = array(
 				$this->primary_store,
-			];
+			);
 		}
 
 		foreach ( $stores as $store ) {

classes/data-stores/ActionScheduler_wpPostStore_PostStatusRegistrar.php

@@ -2,6 +2,7 @@
 
 /**
  * Class ActionScheduler_wpPostStore_PostStatusRegistrar
+ *
  * @codeCoverageIgnore
  */
 class ActionScheduler_wpPostStore_PostStatusRegistrar {

phpcs.xml

@@ -50,6 +50,7 @@
 
 	<rule ref="PEAR.NamingConventions.ValidClassName">
 		<exclude-pattern>tests/phpunit/logging/ActionScheduler_wpCommentLogger_Test.php</exclude-pattern>
+		<exclude-pattern>classes/data-stores/ActionScheduler_wpPostStore_PostStatusRegistrar.php</exclude-pattern>
 		<exclude-pattern>classes/data-stores/ActionScheduler_wpPostStore_TaxonomyRegistrar.php</exclude-pattern>
 		<exclude-pattern>tests/phpunit/jobstore/ActionScheduler_wpPostStore_Test.php</exclude-pattern>
 		<exclude-pattern>classes/data-stores/ActionScheduler_wpCommentLogger.php</exclude-pattern>

tests/phpunit/migration/LogMigrator_Test.php

@@ -7,27 +7,27 @@
  * @group migration
  */
 class LogMigrator_Test extends ActionScheduler_UnitTestCase {
-	function setUp() {
+	public function setUp() {
 		parent::setUp();
-		if ( ! taxonomy_exists( ActionScheduler_wpPostStore::GROUP_TAXONOMY )  ) {
-			// register the post type and taxonomy necessary for the store to work
+		if ( ! taxonomy_exists( ActionScheduler_wpPostStore::GROUP_TAXONOMY ) ) {
+			// register the post type and taxonomy necessary for the store to work.
 			$store = new ActionScheduler_wpPostStore();
 			$store->init();
 		}
 	}
 
 	public function test_migrate_from_wpComment_to_db() {
-		$source = new ActionScheduler_wpCommentLogger();
-		$destination = new ActionScheduler_DBLogger();
-		$migrator = new LogMigrator( $source, $destination );
-		$source_action_id = rand( 10, 10000 );
-		$destination_action_id = rand( 10, 10000 );
+		$source                = new ActionScheduler_wpCommentLogger();
+		$destination           = new ActionScheduler_DBLogger();
+		$migrator              = new LogMigrator( $source, $destination );
+		$source_action_id      = wp_rand( 10, 10000 );
+		$destination_action_id = wp_rand( 10, 10000 );
 
-		$logs = [];
-		for ( $i = 0 ; $i < 3 ; $i++ ) {
-			for ( $j = 0 ; $j < 5 ; $j++ ) {
-				$logs[ $i ][ $j ] = md5(rand());
-				if ( $i == 1 ) {
+		$logs = array();
+		for ( $i = 0; $i < 3; $i++ ) {
+			for ( $j = 0; $j < 5; $j++ ) {
+				$logs[ $i ][ $j ] = md5( wp_rand() );
+				if ( 1 === $i ) {
 					$source->log( $source_action_id, $logs[ $i ][ $j ] );
 				}
 			}
@@ -36,9 +36,17 @@ public function test_migrate_from_wpComment_to_db() {
 		$migrator->migrate( $source_action_id, $destination_action_id );
 
 		$migrated = $destination->get_logs( $destination_action_id );
-		$this->assertEqualSets( $logs[ 1 ], array_map( function( $log ) { return $log->get_message(); }, $migrated ) );
+		$this->assertEqualSets(
+			$logs[1],
+			array_map(
+				function( $log ) {
+					return $log->get_message();
+				},
+				$migrated
+			)
+		);
 
-		// no API for deleting logs, so we leave them for manual cleanup later
+		// no API for deleting logs, so we leave them for manual cleanup later.
 		$this->assertCount( 5, $source->get_logs( $source_action_id ) );
 	}
-}
+}