Merge pull request #2160 from woocommerce/release/2.5.12

Release 2.5.12

README.md

@@ -62,6 +62,10 @@ Now you can build the files using one of these commands:
 -   `npm run start` : Build a development version, watch files for changes
 -   `npm run start:hot` : Build a development version in Fast Refresh mode, watch files for changes.
 
+Notice this repository has `engine-strict=true` directive set. That means you cannot install dependencies with other Node engines rather than the ones defined in the `engines` directive inside [package.json](./package.json). It's recommended to use [NVM](https://github.com/nvm-sh/nvm) and run `nvm use` before installing the dependencies to be sure you're using the recommended Node version.
+
+We added Node `^18` and npm `^9` to allow dependabot to update our dependencies. But these are not supported versions.
+
 ## Working with DEWP
 
 The Dependency Extraction Webpack Plugin makes working with frontend dependencies not so obvious, check [`Working with DEWP.md`](Working with DEWP.md) for more details.

bin/GoogleAdsCleanupServices.php

@@ -160,36 +160,36 @@ protected function remove_enums() {
 
 		foreach ( array_diff( $library_enums, $used_enums ) as $enum ) {
 			$this->remove_enum( $enum );
-		};
+		}
 	}
 
 	/**
 	 * Remove a specific enum.
 	 *
-	 * @param string $enum Enum name.
+	 * @param string $enum_name Enum name.
 	 */
-	protected function remove_enum( string $enum ) {
-		$this->output_text( "Removing enum {$enum}" );
+	protected function remove_enum( string $enum_name ) {
+		$this->output_text( "Removing enum {$enum_name}" );
 		$this->src_path = '/src/Google/Ads/GoogleAds';
 
-		$this->remove_file( "/{$this->version}/Enums/{$enum}Enum.php" );
-		$this->remove_file( "/{$this->version}/Enums/{$enum}Enum_{$enum}.php" );
-		$this->remove_file( "/{$this->version}/Enums/{$enum}Enum/{$enum}.php" );
-		$this->remove_directory( "/{$this->version}/Enums/{$enum}Enum" );
+		$this->remove_file( "/{$this->version}/Enums/{$enum_name}Enum.php" );
+		$this->remove_file( "/{$this->version}/Enums/{$enum_name}Enum_{$enum_name}.php" );
+		$this->remove_file( "/{$this->version}/Enums/{$enum_name}Enum/{$enum_name}.php" );
+		$this->remove_directory( "/{$this->version}/Enums/{$enum_name}Enum" );
 
 		// Remove metadata files.
 		$this->src_path = '/metadata/Google/Ads/GoogleAds';
-		$this->remove_file( "/{$this->version}/Enums/{$enum}.php" );
+		$this->remove_file( "/{$this->version}/Enums/{$enum_name}.php" );
 	}
 
 	/**
 	 * Find a list of files in a path, including subdirectories, matching a pattern.
 	 *
-	 * @param string $path Package path
-	 * @param string $match Regex pattern to match
+	 * @param string $path    Package path
+	 * @param string $pattern Regex pattern to match
 	 * @return array Matching files
 	 */
-	protected function get_dir_contents( $path, $match ) {
+	protected function get_dir_contents( $path, $pattern ) {
 		try {
 			$rdi = new RecursiveDirectoryIterator( $path );
 		} catch ( UnexpectedValueException $e ) {
@@ -203,7 +203,7 @@ protected function get_dir_contents( $path, $match ) {
 		}
 
 		$rii   = new RecursiveIteratorIterator( $rdi );
-		$rri   = new RegexIterator( $rii, $match );
+		$rri   = new RegexIterator( $rii, $pattern );
 		$files = [];
 		foreach ( $rri as $file ) {
 			$files[] = $file->getPathname();
@@ -255,7 +255,7 @@ protected function find_library_file_pattern( string $pattern, string $suffix =
 		}
 
 		return array_map(
-			function( $file ) use ( $suffix ) {
+			function ( $file ) use ( $suffix ) {
 				$name = pathinfo( $file, PATHINFO_FILENAME );
 				return $suffix ? $this->remove_suffix( $suffix, $name ) : $name;
 			},
@@ -317,10 +317,10 @@ protected function remove_function( string $file, string $name ) {
 		// Parse until we encounter closing bracket.
 		for ( $end = $offset; $end < $length; $end++ ) {
 			if ( '{' === $contents[ $end ] ) {
-				$bracket++;
+				++$bracket;
 			}
 			if ( '}' === $contents[ $end ] ) {
-				$bracket--;
+				--$bracket;
 				if ( 1 > $bracket ) {
 					break;
 				}
@@ -334,7 +334,7 @@ protected function remove_function( string $file, string $name ) {
 
 		// Include whitespaces before start.
 		while ( 0 < $start && ctype_space( $contents[ $start - 1 ] ) ) {
-			$start--;
+			--$start;
 		}
 
 		$new  = substr( $contents, 0, $start );
@@ -388,7 +388,7 @@ protected function remove_file( string $file ) {
 			return;
 		}
 
-		unlink( $file );
+		unlink( $file ); // phpcs:ignore WordPress.WP.AlternativeFunctions.unlink_unlink
 	}
 
 	/**
@@ -403,7 +403,7 @@ protected function remove_directory( string $directory ) {
 			return;
 		}
 
-		rmdir( $directory );
+		rmdir( $directory ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_rmdir
 	}
 
 	/**

bin/SymfonyPolyfillCleanup.php

@@ -67,7 +67,6 @@ protected function get_list_of_polyfills(): array {
 	public static function remove( Event $event = null ) {
 		$cleanup = new SymfonyPolyfillCleanup( $event );
 		$cleanup->remove_bootstraps80();
-
 	}
 
 	/**
@@ -131,10 +130,10 @@ protected function remove_statement_with_pattern( string $file, string $inner_pa
 		// Parse until we encounter closing bracket.
 		for ( $end = $offset; $end < $length; $end++ ) {
 			if ( '{' === $contents[ $end ] ) {
-				$bracket++;
+				++$bracket;
 			}
 			if ( '}' === $contents[ $end ] ) {
-				$bracket--;
+				--$bracket;
 				if ( 1 > $bracket ) {
 					break;
 				}
@@ -148,7 +147,7 @@ protected function remove_statement_with_pattern( string $file, string $inner_pa
 
 		// Include whitespaces before start.
 		while ( 0 < $start && ctype_space( $contents[ $start - 1 ] ) ) {
-			$start--;
+			--$start;
 		}
 
 		$new  = substr( $contents, 0, $start );
@@ -174,7 +173,7 @@ protected function remove_file( string $file ) {
 			return;
 		}
 
-		unlink( $file );
+		unlink( $file ); // phpcs:ignore WordPress.WP.AlternativeFunctions.unlink_unlink
 	}
 
 	/**

bin/prefix-vendor-namespace.php

@@ -310,11 +310,11 @@ function prefix_string( &$contents, $search ) {
  *
  * @since 2.2.2
  *
- * @param string $path Package path
- * @param string $match Regex pattern to match
+ * @param string $path    Package path
+ * @param string $pattern Regex pattern to match
  * @return array Matching files
  */
-function get_dir_contents( $path, $match ) {
+function get_dir_contents( $path, $pattern ) {
 	try {
 		$rdi = new RecursiveDirectoryIterator( $path );
 	} catch ( UnexpectedValueException  $e ) {
@@ -326,7 +326,7 @@ function get_dir_contents( $path, $match ) {
 	}
 
 	$rii   = new RecursiveIteratorIterator( $rdi );
-	$rri   = new RegexIterator( $rii, $match );
+	$rri   = new RegexIterator( $rii, $pattern );
 	$files = [];
 	foreach ( $rri as $file ) {
 		$files[] = $file->getPathname();

changelog.txt

@@ -1,5 +1,12 @@
 *** WooCommerce Google Listings and Ads Changelog ***
 
+= 2.5.12 - 2023-11-22 =
+* Dev - Fix E2E gtag events tests.
+* Dev - Update WordPress CS to 3.0.
+* Dev - Update phpunit polyfills to 1.1 for WP 6.4.
+* Tweak - Add filter to be able to build custom shipping method rate handers.
+* Tweak - Remove rewrite rules flush.
+
 = 2.5.11 - 2023-11-07 =
 * Add - Record tracking events for moving steps on the campaign creation and editing pages.
 * Tweak - Add tracking for campaign count.

composer.json

@@ -25,8 +25,8 @@
 		"dealerdirect/phpcodesniffer-composer-installer": "^v0.7",
 		"phpunit/phpunit": "^9.5",
 		"wp-cli/i18n-command": "^2.2",
-		"wp-coding-standards/wpcs": "^2.3",
-		"yoast/phpunit-polyfills": "^1.0"
+		"wp-coding-standards/wpcs": "^3.0",
+		"yoast/phpunit-polyfills": "^1.1.0"
 	},
 	"replace" : {
 		"google/grpc-gcp": "*",