Merge pull request #7644 from ampproject/update/img-sanitizer

Update `AMP_Img_Sanitizer` to avoid adding `fetchpriority` attr to `amp-img`
ampproject · Oct 25, 2023 · d9727b6 · d9727b6
2 parents a2d8418 + 1df48d7
commit d9727b6
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "ext-json": "*",
     "ext-libxml": "*",
     "ext-spl": "*",
-    "ampproject/amp-toolbox": "0.11.3",
+    "ampproject/amp-toolbox": "dev-main",
     "cweagans/composer-patches": "^1.0",
     "fasterimage/fasterimage": "1.5.0",
     "sabberworm/php-css-parser": "dev-master#cc791ad"

diff --git a/composer.lock b/composer.lock
diff --git a/includes/sanitizers/class-amp-img-sanitizer.php b/includes/sanitizers/class-amp-img-sanitizer.php
@@ -298,6 +298,10 @@ private function filter_attributes( $attributes ) {
 					}
 					break;
 
+				// Avoid adding `fetchpriority` to amp-img element.
+				case Attribute::FETCHPRIORITY:
+					break;
+
 				default:
 					$out[ $name ] = $value;
 					break;

diff --git a/tests/php/test-amp-img-sanitizer.php b/tests/php/test-amp-img-sanitizer.php
@@ -595,6 +595,27 @@ public function get_data() {
 					'native_img_used' => false,
 				],
 			],
+
+			'fetchpriority_attr_not_added_to_amp-img'  => [
+				'<img width="825" height="510" src="https://placehold.it/825x510" fetchpriority="high">',
+				'<amp-img width="825" height="510" src="https://placehold.it/825x510" class="amp-wp-enforced-sizes" layout="intrinsic"></amp-img>',
+				[
+					'add_noscript_fallback' => false,
+				],
+			],
+
+			'fetchpriority_attr_is_preserved_in_noscript_fallback_img' => [
+				'<img width="825" height="510" src="https://placehold.it/825x510" fetchpriority="high">',
+				'<amp-img width="825" height="510" src="https://placehold.it/825x510" class="amp-wp-enforced-sizes" layout="intrinsic"><noscript><img width="825" height="510" src="https://placehold.it/825x510" fetchpriority="high"></noscript></amp-img>',
+			],
+
+			'fetchpriority_attr_is_preserved_in_native_img' => [
+				'<img width="825" height="510" src="https://placehold.it/825x510" fetchpriority="high">',
+				'<img width="825" height="510" src="https://placehold.it/825x510" fetchpriority="high" decoding="async" class="amp-wp-enforced-sizes">',
+				[
+					'native_img_used' => true,
+				],
+			],
 		];
 	}