Merge pull request #323 from woocommerce/update/296-update-wordpresscs

Update WordPressCS to version 3.0

composer.json

@@ -11,7 +11,7 @@
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^v0.7",
-        "wp-coding-standards/wpcs": "^2.3",
+        "wp-coding-standards/wpcs": "^3.0",
         "exussum12/coverage-checker": "^1.0",
         "phpunit/phpunit": "^9.5",
         "yoast/phpunit-polyfills": "^1.0"

includes/class-wc-google-analytics-js.php

@@ -539,5 +539,4 @@ protected static function load_analytics_code_in_header( $code ) {
 		wp_add_inline_script( 'google-analytics', $code );
 		wp_enqueue_script( 'google-analytics' );
 	}
-
 }

includes/class-wc-google-analytics-task.php

@@ -67,7 +67,4 @@ public function get_action_url() {
 	public function is_complete() {
 		return WC_Google_Analytics_Integration::get_integration()->is_setup_complete();
 	}
-
 }
-
-

includes/class-wc-google-analytics.php

@@ -753,7 +753,6 @@ public function add_wc_setup_task() {
 				TaskLists::get_list( 'extended' )
 			)
 		);
-
 	}
 
 	/**

includes/class-wc-google-gtag-js.php

@@ -128,7 +128,7 @@ public static function format_event_data( array $data ): string {
 		// Recursively walk through $data array and escape all values that will be used in JS.
 		array_walk_recursive(
 			$data,
-			function( &$value, $key ) {
+			function ( &$value, $key ) {
 				$value = esc_js( $value );
 			}
 		);
@@ -508,5 +508,4 @@ public function event_tracking_code( $parameters, $selector ) {
 		'
 		);
 	}
-
 }

phpcs.xml.dist

@@ -18,14 +18,14 @@
 		<exclude name="Squiz.Commenting.LongConditionClosingComment"/>
 
 		<!-- No thanks -->
-		<exclude name="WordPress.PHP.DisallowShortTernary"/>
+		<exclude name="Universal.Operators.DisallowShortTernary"/>
 		<exclude name="WordPress.PHP.YodaConditions.NotYoda"/>
 
 		<!-- These overrides are useful for code hinting -->
 		<exclude name="Generic.CodeAnalysis.UselessOverridingMethod.Found"/>
 
 		<!-- We like short array syntax -->
-		<exclude name="Generic.Arrays.DisallowShortArraySyntax"/>
+		<exclude name="Universal.Arrays.DisallowShortArraySyntax"/>
 
 		<!-- Multiple throws tags are fine -->
 		<exclude name="Squiz.Commenting.FunctionCommentThrowTag.WrongNumber"/>
@@ -62,8 +62,8 @@
 	</rule>
 
 	<!-- This rule flags space indents in HTML tags, which are generally OK. -->
-	<rule ref="WordPress.WhiteSpace.PrecisionAlignment">
-		<exclude name="WordPress.WhiteSpace.PrecisionAlignment.Found"/>
+	<rule ref="Universal.WhiteSpace.PrecisionAlignment">
+		<exclude name="Universal.WhiteSpace.PrecisionAlignment.Found"/>
 	</rule>
 
 	<!-- We allow the use of / in hooks -->

tests/EventsDataTest.php

@@ -106,5 +106,4 @@ public function get_event_data() {
 		$args = $this->get_filter()->get_args();
 		return $args[0][0];
 	}
-
 }

tests/class-unittestsbootstrap.php

@@ -149,5 +149,4 @@ public function includes() {
 		require_once $wc_tests_dir . '/framework/helpers/class-wc-helper-shipping.php';
 		require_once $wc_tests_dir . '/framework/helpers/class-wc-helper-customer.php';
 	}
-
 }

tests/unit-tests/AddTransactionEnhanced.php

@@ -50,5 +50,4 @@ public function test_purchase_event() {
 		// Confirm data structure matches what's expected.
 		$this->assertEquals( $expected_data, $this->get_event_data(), 'Event data does not match expected data structure for purchase (add_transaction_enhanced()) event' );
 	}
-
 }

tests/unit-tests/CheckoutProcess.php

@@ -56,5 +56,4 @@ public function test_begin_checkout_event() {
 		// Confirm data structure matches what's expected.
 		$this->assertEquals( $expected_data, $this->get_event_data(), 'Event data does not match expected data structure for begin_checkout (checkout_process()) event' );
 	}
-
 }

tests/unit-tests/ListingClick.php

@@ -41,5 +41,4 @@ public function test_select_content_and_add_to_cart_event() {
 		// Confirm data structure matches what's expected.
 		$this->assertEquals( $expected_data, $this->get_event_data(), 'Event data does not match expected data structure for select_content and add_to_cart (listing_click()) events' );
 	}
-
 }

tests/unit-tests/ListingImpression.php

@@ -41,5 +41,4 @@ public function test_view_item_list_event() {
 		// Confirm data structure matches what's expected.
 		$this->assertEquals( $expected_data, $this->get_event_data(), 'Event data does not match expected data structure for view_item_list (listing_impression()) event' );
 	}
-
 }

tests/unit-tests/WCGoogleGtagJS.php

@@ -115,5 +115,4 @@ public function test_integration_script_is_enqueued_for_variation() {
 		// Assert the handle is enqueued.
 		$this->assertEquals( true, wp_script_is( $gtag->script_handle . '-ga-integration', 'enqueued' ), 'the script is enqueued' );
 	}
-
 }