Improve regex, based on Alain's suggestions

Allow spaces in the closing </script>, like </script > Also, make this case-insensitive and ensure the quotes types are the same.
ampproject · Mar 2, 2020 · 52d49e9 · 52d49e9
1 parent 83d3dd6
commit 52d49e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Dom/Document.php b/src/Dom/Document.php
@@ -682,8 +682,8 @@ private function maybe_restore_noscript_elements( $html ) {
 	 */
 	private function replace_mustache_templates( $html ) {
 		return preg_replace(
-			'#<script(\s[^>]*template=["\']?amp-mustache["\']?[^>]*)>(.*?)</script>#s',
-			'<tmp-script$1>$2</tmp-script>',
+			'#<script(\s[^>]*?template=(["\']?)amp-mustache\2[^>]*)>(.*?)</script\s*?>#i',
+			'<tmp-script$1>$3</tmp-script>',
 			$html
 		);
 	}

diff --git a/tests/php/test-class-amp-dom-document.php b/tests/php/test-class-amp-dom-document.php
@@ -209,11 +209,21 @@ public function data_dom_document() {
 				'<!DOCTYPE html><html>' . $head . '<body><script id="baz" type="text/plain" template="amp-mustache"><table><tr>{{#example}}<td></td>{{/example}}</tr></table></script></body></html>',
 				'<!DOCTYPE html><html>' . $head . '<body><script id="baz" type="text/plain" template="amp-mustache"><table><tr>{{#example}}<td></td>{{/example}}</tr></table></script></body></html>',
 			],
+			'amp_mustache_spaces_in_closing_script'    => [
+				'utf-8',
+				'<!DOCTYPE html><html>' . $head . '<body><script id="baz" type="text/plain" template="amp-mustache"><table><tr>{{#example}}<td></td>{{/example}}</tr></table></script  ></body></html>',
+				'<!DOCTYPE html><html>' . $head . '<body><script id="baz" type="text/plain" template="amp-mustache"><table><tr>{{#example}}<td></td>{{/example}}</tr></table></script></body></html>',
+			],
 			'amp_mustache_template_single_quotes'      => [
 				'utf-8',
 				'<!DOCTYPE html><html>' . $head . '<body><script type=\'text/plain\' template=\'amp-mustache\'><table><tr>{{#example}}<td></td>{{/example}}</tr></table></script></body></html>',
 				'<!DOCTYPE html><html>' . $head . '<body><script type="text/plain" template="amp-mustache"><table><tr>{{#example}}<td></td>{{/example}}</tr></table></script></body></html>',
 			],
+			'amp_mustache_no_quote'                    => [
+				'utf-8',
+				'<!DOCTYPE html><html>' . $head . '<body><script type=\'text/plain\' template=amp-mustache><table><tr>{{#example}}<td></td>{{/example}}</tr></table></script></body></html>',
+				'<!DOCTYPE html><html>' . $head . '<body><script type="text/plain" template="amp-mustache"><table><tr>{{#example}}<td></td>{{/example}}</tr></table></script></body></html>',
+			],
 			'amp_mustache_script_multiple_children'    => [
 				'utf-8',
 				'<!DOCTYPE html><html>' . $head . '<body><script type="text/plain" template="amp-mustache"><h1>{{heading}}</h1><p>{{content}}</p><table><tr>{{#example}}<td></td>{{/example}}</tr></table></script></body></html>',