Merge pull request #7972 from ampproject/dependabot/composer/sirbrill…

…ig/phpcs-variable-analysis-2.11.22 Bump sirbrillig/phpcs-variable-analysis from 2.11.21 to 2.11.22
ampproject · Feb 2, 2025 · 6eb7e54 · 6eb7e54
2 parents 30455a9 + 332581b
commit 6eb7e54
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 64 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     "phpdocumentor/reflection": "^3.0",
     "phpstan/phpstan": "^1.0",
     "roave/security-advisories": "dev-latest",
-    "sirbrillig/phpcs-variable-analysis": "2.11.21",
+    "sirbrillig/phpcs-variable-analysis": "2.11.22",
     "wp-cli/export-command": "^2.0",
     "wp-cli/extension-command": "^2.0",
     "wp-cli/wp-cli": "^2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/php/validation/test-class-amp-validation-manager.php b/tests/php/validation/test-class-amp-validation-manager.php
@@ -1849,58 +1849,73 @@ public function test_decorate_shortcode_and_filter_source() {
 				'name'     => 'wp-includes',
 				'function' => 'WP_Embed::autoembed',
 			],
-			[
-				'type'     => 'core',
-				'name'     => 'wp-includes',
-				'function' => 'do_blocks',
-			],
-			[
-				'type'     => 'core',
-				'name'     => 'wp-includes',
-				'function' => 'wptexturize',
-			],
-			[
-				'type'     => 'core',
-				'name'     => 'wp-includes',
-				'function' => 'wpautop',
-			],
-			[
-				'type'     => 'core',
-				'name'     => 'wp-includes',
-				'function' => 'shortcode_unautop',
-			],
-			[
-				'type'     => 'core',
-				'name'     => 'wp-includes',
-				'function' => 'prepend_attachment',
-			],
-			[
-				'type'     => 'core',
-				'name'     => 'wp-includes',
-				'function' => 'wp_replace_insecure_home_url',
-			],
-			[
-				'type'     => 'core',
-				'name'     => 'wp-includes',
-				'function' => 'capital_P_dangit',
-			],
-			[
-				'type'     => 'core',
-				'name'     => 'wp-includes',
-				'function' => 'do_shortcode',
-			],
-			[
-				'type'     => 'core',
-				'name'     => 'wp-includes',
-				'function' => 'wp_filter_content_tags',
-			],
-			[
-				'type'     => 'core',
-				'name'     => 'wp-includes',
-				'function' => 'convert_smilies',
-			],
 		];
 
+		if ( function_exists( 'gutenberg_apply_block_hooks_to_post_content' ) && has_filter( 'the_content', 'gutenberg_apply_block_hooks_to_post_content' ) ) {
+			$sources[] = [
+				'type'     => 'plugin',
+				'name'     => 'gutenberg',
+				'file'     => 'lib/compat/wordpress-6.8/blocks.php',
+				'function' => 'gutenberg_apply_block_hooks_to_post_content',
+			];
+		}
+
+		$sources = array_merge(
+			$sources,
+			[
+				[
+					'type'     => 'core',
+					'name'     => 'wp-includes',
+					'function' => 'do_blocks',
+				],
+				[
+					'type'     => 'core',
+					'name'     => 'wp-includes',
+					'function' => 'wptexturize',
+				],
+				[
+					'type'     => 'core',
+					'name'     => 'wp-includes',
+					'function' => 'wpautop',
+				],
+				[
+					'type'     => 'core',
+					'name'     => 'wp-includes',
+					'function' => 'shortcode_unautop',
+				],
+				[
+					'type'     => 'core',
+					'name'     => 'wp-includes',
+					'function' => 'prepend_attachment',
+				],
+				[
+					'type'     => 'core',
+					'name'     => 'wp-includes',
+					'function' => 'wp_replace_insecure_home_url',
+				],
+				[
+					'type'     => 'core',
+					'name'     => 'wp-includes',
+					'function' => 'capital_P_dangit',
+				],
+				[
+					'type'     => 'core',
+					'name'     => 'wp-includes',
+					'function' => 'do_shortcode',
+				],
+				[
+					'type'     => 'core',
+					'name'     => 'wp-includes',
+					'function' => 'wp_filter_content_tags',
+				],
+				[
+					'type'     => 'core',
+					'name'     => 'wp-includes',
+					'function' => 'convert_smilies',
+				],
+			]
+		);
+
 		if ( function_exists( 'apply_block_hooks_to_content' ) && has_filter( 'the_content', 'apply_block_hooks_to_content' ) ) {
 			array_unshift(
 				$sources,