Cleanup after resolving merge conflicts with develop

shadyvb · Jul 22, 2024 · d1bd648 · d1bd648
1 parent c24ec47
commit d1bd648
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/tests/tests/test-class-connector.php b/tests/tests/test-class-connector.php
@@ -27,7 +27,7 @@ public function setUp(): void {
 			 */
 			public $actions = array(
 				'simulate_fault',
-        'hyphenated-action',
+				'hyphenated-action',
 			);
 
 			/**
@@ -71,16 +71,16 @@ public function callback_simulate_fault() {
 				do_action( 'wp_stream_test_child_callback_simulate_fault' );
 			}
 
-      /**
-       * Log the hyphenated action callback.
-       *
-       * @action hyphenated-action
-       *
-       * @return void
-       */
-      public function callback_hyphenated_action() {
+			/**
+			* Log the hyphenated action callback.
+			*
+			* @action hyphenated-action
+			*
+			* @return void
+			*/
+			public function callback_hyphenated_action() {
 				do_action( 'wp_stream_test_child_callback_hyphenated_action' );
-      }
+			}
 		};
 
 		$this->assertNotEmpty( $this->connector );
@@ -259,7 +259,6 @@ public function test_is_dependency_satisfied() {
 		$this->assertTrue( $this->connector->is_dependency_satisfied() );
 	}
 
-
 	/**
 	 * Test that percentages are escaped.
 	 *