Merge branch 'trunk' into fix-forum-17945942

Author: crstauf

classes/data-stores/ActionScheduler_wpPostStore_TaxonomyRegistrar.php

@@ -2,6 +2,7 @@
 
 /**
  * Class ActionScheduler_wpPostStore_TaxonomyRegistrar
+ *
  * @codeCoverageIgnore
  */
 class ActionScheduler_wpPostStore_TaxonomyRegistrar {
@@ -18,12 +19,12 @@ public function register() {
 	 */
 	protected function taxonomy_args() {
 		$args = array(
-			'label' => __( 'Action Group', 'action-scheduler' ),
-			'public' => false,
-			'hierarchical' => false,
+			'label'             => __( 'Action Group', 'action-scheduler' ),
+			'public'            => false,
+			'hierarchical'      => false,
 			'show_admin_column' => true,
-			'query_var' => false,
-			'rewrite' => false,
+			'query_var'         => false,
+			'rewrite'           => false,
 		);
 
 		$args = apply_filters( 'action_scheduler_taxonomy_args', $args );

classes/migration/DryRun_ActionMigrator.php

@@ -21,7 +21,7 @@ class DryRun_ActionMigrator extends ActionMigrator {
 	 * @return int
 	 */
 	public function migrate( $source_action_id ) {
-		do_action( 'action_scheduler/migrate_action_dry_run', $source_action_id );
+		do_action( 'action_scheduler/migrate_action_dry_run', $source_action_id ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
 		return 0;
 	}

phpcs.xml

@@ -49,7 +49,9 @@
 	</rule>
 
 	<rule ref="PEAR.NamingConventions.ValidClassName">
-    <exclude-pattern>classes/data-stores/ActionScheduler_wpCommentLogger.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>
 		<exclude-pattern>classes/data-stores/ActionScheduler_wpPostStore_PostTypeRegistrar.php</exclude-pattern>
 		<exclude-pattern>classes/data-stores/ActionScheduler_wpPostStore.php</exclude-pattern>
 		<exclude-pattern>classes/ActionScheduler_wcSystemStatus.php</exclude-pattern>

tests/phpunit/jobs/ActionScheduler_Action_Test.php

@@ -6,9 +6,9 @@
  */
 class ActionScheduler_Action_Test extends ActionScheduler_UnitTestCase {
 	public function test_set_schedule() {
-		$time = as_get_datetime_object();
-		$schedule = new ActionScheduler_SimpleSchedule($time);
-		$action = new ActionScheduler_Action( ActionScheduler_Callbacks::HOOK_WITH_CALLBACK, array(), $schedule );
+		$time     = as_get_datetime_object();
+		$schedule = new ActionScheduler_SimpleSchedule( $time );
+		$action   = new ActionScheduler_Action( ActionScheduler_Callbacks::HOOK_WITH_CALLBACK, array(), $schedule );
 		$this->assertEquals( $schedule, $action->get_schedule() );
 	}
 
@@ -24,31 +24,31 @@ public function test_set_hook() {
 
 	public function test_args() {
 		$action = new ActionScheduler_Action( ActionScheduler_Callbacks::HOOK_WITH_CALLBACK );
-		$this->assertEmpty($action->get_args());
+		$this->assertEmpty( $action->get_args() );
 
 		$action = new ActionScheduler_Action( ActionScheduler_Callbacks::HOOK_WITH_CALLBACK, array( 5, 10, 15 ) );
-		$this->assertEqualSets(array(5,10,15), $action->get_args());
+		$this->assertEqualSets( array( 5, 10, 15 ), $action->get_args() );
 	}
 
 	public function test_set_group() {
-		$action = new ActionScheduler_Action( ActionScheduler_Callbacks::HOOK_WITH_CALLBACK, array(), NULL, 'my_group' );
-		$this->assertEquals('my_group', $action->get_group());
+		$action = new ActionScheduler_Action( ActionScheduler_Callbacks::HOOK_WITH_CALLBACK, array(), null, 'my_group' );
+		$this->assertEquals( 'my_group', $action->get_group() );
 	}
 
 	public function test_execute() {
 		$mock = new MockAction();
 
-		$random = md5(rand());
+		$random = md5( wp_rand() );
 		add_action( $random, array( $mock, 'action' ) );
 
-		$action = new ActionScheduler_Action( $random, array($random) );
+		$action = new ActionScheduler_Action( $random, array( $random ) );
 		$action->execute();
 
 		remove_action( $random, array( $mock, 'action' ) );
 
 		$this->assertEquals( 1, $mock->get_call_count() );
 		$events = $mock->get_events();
-		$event = reset($events);
-		$this->assertEquals( $random, reset($event['args']) );
+		$event  = reset( $events );
+		$this->assertEquals( $random, reset( $event['args'] ) );
 	}
 }

tests/phpunit/jobs/ActionScheduler_NullAction_Test.php

@@ -8,9 +8,8 @@ class ActionScheduler_NullAction_Test extends ActionScheduler_UnitTestCase {
 	public function test_null_action() {
 		$action = new ActionScheduler_NullAction();
 
-		$this->assertEmpty($action->get_hook());
-		$this->assertEmpty($action->get_args());
+		$this->assertEmpty( $action->get_hook() );
+		$this->assertEmpty( $action->get_args() );
 		$this->assertNull( $action->get_schedule()->get_date() );
 	}
 }
-