Merge pull request ampproject#7020 from ampproject/upgrade/amp-toolbo…

…x-php-0110 Upgrade amp-toolbox-php to 0.11.0
newsuk · Apr 1, 2022 · 8960b9b · 8960b9b
1 parent 01cf0e4
commit 8960b9b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "ext-json": "*",
     "ext-libxml": "*",
     "ext-spl": "*",
-    "ampproject/amp-toolbox": "0.10.0",
+    "ampproject/amp-toolbox": "0.11.0",
     "cweagans/composer-patches": "~1.0",
     "fasterimage/fasterimage": "1.5.0",
     "sabberworm/php-css-parser": "8.4.0"

diff --git a/composer.lock b/composer.lock
diff --git a/tests/php/test-class-amp-core-block-handler.php b/tests/php/test-class-amp-core-block-handler.php
@@ -351,6 +351,9 @@ public function test_ampify_gallery_block( $original_block_content, $expected_bl
 		$expected = preg_replace( '/ data-id="\d+"/', '', $expected );
 		$actual   = preg_replace( '/ data-id="\d+"/', '', $actual );
 
+		// Remove classes added in Gutenberg 12.9.
+		$actual = preg_replace( '/wp-container-\w+ wp-block-gallery-\w+ /', '', $actual );
+
 		$this->assertEqualMarkup( $expected, $actual );
 	}