From 74018406d66edfb70d1f7f27c51ee6fddedf3df8 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Wed, 1 Apr 2020 02:21:59 -0400
Subject: [PATCH 01/45] Sanitize DailyMotion embeds

---
 .../class-amp-dailymotion-embed-handler.php   | 116 +++++++++---------
 .../test-amp-dailymotion-embed-handler.php    |  18 ++-
 2 files changed, 73 insertions(+), 61 deletions(-)

diff --git a/includes/embeds/class-amp-dailymotion-embed-handler.php b/includes/embeds/class-amp-dailymotion-embed-handler.php
index e1c7e262b36..26cd01d96aa 100644
--- a/includes/embeds/class-amp-dailymotion-embed-handler.php
+++ b/includes/embeds/class-amp-dailymotion-embed-handler.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_DailyMotion_Embed_Handler
  *
@@ -12,8 +14,7 @@
  */
 class AMP_DailyMotion_Embed_Handler extends AMP_Base_Embed_Handler {
 
-	const URL_PATTERN = '#https?:\/\/(www\.)?dailymotion\.com\/video\/.*#i';
-	const RATIO       = 0.5625;
+	const RATIO = 0.5625;
 
 	/**
 	 * Default width.
@@ -48,86 +49,89 @@ public function __construct( $args = [] ) {
 	 * Register embed.
 	 */
 	public function register_embed() {
-		wp_embed_register_handler( 'amp-dailymotion', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-dailymotion', -1 );
+		// Not implemented.
 	}
 
 	/**
-	 * Render oEmbed.
+	 * Sanitize all DailyMotion <iframe> tags to <amp-dailymotion>.
 	 *
-	 * @see \WP_Embed::shortcode()
+	 * @param Document $dom DOM.
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://www.dailymotion.com/embed/video/" ) ]' );
+
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
+			}
+			$this->sanitize_raw_embed( $node );
+		}
+	}
+
+	/**
+	 * Determine if the node has already been sanitized.
 	 *
-	 * @param array  $matches URL pattern matches.
-	 * @param array  $attr    Shortcode attributes.
-	 * @param string $url     URL.
-	 * @param string $rawattr Unmodified shortcode attributes.
-	 * @return string Rendered oEmbed.
+	 * @param DOMElement $node The DOMNode.
+	 * @return bool Whether the node is a raw embed.
 	 */
-	public function oembed( $matches, $attr, $url, $rawattr ) {
-		$video_id = $this->get_video_id_from_url( $url );
-		return $this->render(
-			[
-				'video_id' => $video_id,
-			]
-		);
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && 'amp-dailymotion' !== $node->parentNode->nodeName;
 	}
 
 	/**
-	 * Render.
+	 * Make DailyMotion embed AMP compatible.
 	 *
-	 * @param array $args Args.
-	 * @return string Rendered.
+	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
-	public function render( $args ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'video_id' => false,
-			]
-		);
-
-		if ( empty( $args['video_id'] ) ) {
-			return AMP_HTML_Utils::build_tag(
-				'a',
+	private function sanitize_raw_embed( DOMElement $iframe_node ) {
+		$iframe_src = $iframe_node->getAttribute( 'src' );
+
+		if ( preg_match( '#video/(?P<video_id>[a-zA-Z0-9]+)#', $iframe_src, $matches ) ) {
+			$video_id = $matches['video_id'];
+
+			$amp_iframe_node = AMP_DOM_Utils::create_node(
+				Document::fromNode( $iframe_node ),
+				'amp-dailymotion',
 				[
-					'href'  => esc_url_raw( $args['url'] ),
-					'class' => 'amp-wp-embed-fallback',
-				],
-				esc_html( $args['url'] )
+					'data-videoid' => $video_id,
+					'layout'       => 'responsive',
+					'width'        => $this->args['width'],
+					'height'       => $this->args['height'],
+				]
 			);
+
+			$this->maybe_unwrap_p_element( $iframe_node );
+
+			$iframe_node->parentNode->replaceChild( $amp_iframe_node, $iframe_node );
 		}
 
-		$this->did_convert_elements = true;
-
-		return AMP_HTML_Utils::build_tag(
-			'amp-dailymotion',
-			[
-				'data-videoid' => $args['video_id'],
-				'layout'       => 'responsive',
-				'width'        => $this->args['width'],
-				'height'       => $this->args['height'],
-			]
-		);
+		// Nothing to be done if the video ID could not be found.
 	}
 
 	/**
-	 * Determine the video ID from the URL.
+	 * Replace the node's parent with itself if the parent is a <p> tag, has no attributes and has no other children.
+	 * This usually happens while `wpautop()` processes the element.
 	 *
-	 * @param string $url URL.
-	 * @return integer Video ID.
+	 * @param DOMElement $node Node.
 	 */
-	private function get_video_id_from_url( $url ) {
-		$parsed_url = wp_parse_url( $url );
-		parse_str( $parsed_url['path'], $path );
-		$tok = explode( '/', $parsed_url['path'] );
-		$tok = explode( '_', $tok[2] );
+	private function maybe_unwrap_p_element( DOMElement $node ) {
+		$parent_node = $node->parentNode;
+		while ( $parent_node && ! ( $parent_node instanceof DOMElement ) ) {
+			$parent_node = $parent_node->parentNode;
+		}
 
-		return $tok[0];
+		if ( 'p' === $parent_node->nodeName && false === $parent_node->hasAttributes() ) {
+			$children = $parent_node->getElementsByTagName( '*' );
+			if ( 1 === $children->length ) {
+				$parent_node->parentNode->replaceChild( $node, $parent_node );
+			}
+		}
 	}
 }
diff --git a/tests/php/test-amp-dailymotion-embed-handler.php b/tests/php/test-amp-dailymotion-embed-handler.php
index 6dad56d6edf..c316e860d47 100644
--- a/tests/php/test-amp-dailymotion-embed-handler.php
+++ b/tests/php/test-amp-dailymotion-embed-handler.php
@@ -11,12 +11,12 @@ public function get_conversion_data() {
 
 			'url_simple'     => [
 				'https://www.dailymotion.com/video/x5awwth' . PHP_EOL,
-				'<p><amp-dailymotion data-videoid="x5awwth" layout="responsive" width="600" height="338"></amp-dailymotion></p>' . PHP_EOL,
+				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="600" height="338"></amp-dailymotion>' . PHP_EOL,
 			],
 
 			'url_with_title' => [
 				'http://www.dailymotion.com/video/x5awwth_snatched-official-trailer-2-hd_shortfilms' . PHP_EOL,
-				'<p><amp-dailymotion data-videoid="x5awwth" layout="responsive" width="600" height="338"></amp-dailymotion></p>' . PHP_EOL,
+				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="600" height="338"></amp-dailymotion>' . PHP_EOL,
 			],
 		];
 	}
@@ -27,9 +27,14 @@ public function get_conversion_data() {
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_DailyMotion_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	public function get_scripts_data() {
@@ -51,9 +56,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_DailyMotion_Embed_Handler();
 		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 
 		$scripts = array_merge(

From 3c57f354e20b9179d4b94932cc5ebe8fe2ca1ab9 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 27 Apr 2020 14:28:39 -0400
Subject: [PATCH 02/45] Sanitize gfycat embeds

---
 .../embeds/class-amp-base-embed-handler.php   | 20 ++++
 .../class-amp-dailymotion-embed-handler.php   | 24 +----
 .../embeds/class-amp-gfycat-embed-handler.php | 95 +++++++++++--------
 .../test-class-amp-gfycat-embed-handler.php   | 22 +++--
 4 files changed, 95 insertions(+), 66 deletions(-)

diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index 0414da95cab..d9677a1f146 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -107,4 +107,24 @@ function ( $attr_name ) {
 		}
 		return wp_array_slice_assoc( $matches, $attribute_names );
 	}
+
+	/**
+	 * Replace the node's parent with itself if the parent is a <p> tag, has no attributes and has no other children.
+	 * This usually happens while `wpautop()` processes the element.
+	 *
+	 * @param DOMElement $node Node.
+	 */
+	protected function maybe_unwrap_p_element( DOMElement $node ) {
+		$parent_node = $node->parentNode;
+		while ( $parent_node && ! ( $parent_node instanceof DOMElement ) ) {
+			$parent_node = $parent_node->parentNode;
+		}
+
+		if ( 'p' === $parent_node->nodeName && false === $parent_node->hasAttributes() ) {
+			$children = $parent_node->getElementsByTagName( '*' );
+			if ( 1 === $children->length ) {
+				$parent_node->parentNode->replaceChild( $node, $parent_node );
+			}
+		}
+	}
 }
diff --git a/includes/embeds/class-amp-dailymotion-embed-handler.php b/includes/embeds/class-amp-dailymotion-embed-handler.php
index 26cd01d96aa..58ca2644c4a 100644
--- a/includes/embeds/class-amp-dailymotion-embed-handler.php
+++ b/includes/embeds/class-amp-dailymotion-embed-handler.php
@@ -96,7 +96,7 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 		if ( preg_match( '#video/(?P<video_id>[a-zA-Z0-9]+)#', $iframe_src, $matches ) ) {
 			$video_id = $matches['video_id'];
 
-			$amp_iframe_node = AMP_DOM_Utils::create_node(
+			$amp_node = AMP_DOM_Utils::create_node(
 				Document::fromNode( $iframe_node ),
 				'amp-dailymotion',
 				[
@@ -109,29 +109,9 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 
 			$this->maybe_unwrap_p_element( $iframe_node );
 
-			$iframe_node->parentNode->replaceChild( $amp_iframe_node, $iframe_node );
+			$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
 		}
 
 		// Nothing to be done if the video ID could not be found.
 	}
-
-	/**
-	 * Replace the node's parent with itself if the parent is a <p> tag, has no attributes and has no other children.
-	 * This usually happens while `wpautop()` processes the element.
-	 *
-	 * @param DOMElement $node Node.
-	 */
-	private function maybe_unwrap_p_element( DOMElement $node ) {
-		$parent_node = $node->parentNode;
-		while ( $parent_node && ! ( $parent_node instanceof DOMElement ) ) {
-			$parent_node = $parent_node->parentNode;
-		}
-
-		if ( 'p' === $parent_node->nodeName && false === $parent_node->hasAttributes() ) {
-			$children = $parent_node->getElementsByTagName( '*' );
-			if ( 1 === $children->length ) {
-				$parent_node->parentNode->replaceChild( $node, $parent_node );
-			}
-		}
-	}
 }
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index adc4b00991a..45a3f11ad4e 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -6,6 +6,8 @@
  * @since 1.0
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Gfycat_Embed_Handler
  */
@@ -21,61 +23,80 @@ class AMP_Gfycat_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Register embed.
 	 */
 	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+		// Not implemented.
 	}
 
 	/**
-	 * Filter oEmbed HTML for Gfycat to prepare it for AMP.
+	 * Sanitize all gfycat <iframe> tags to <amp-gfycat>.
 	 *
-	 * @param mixed  $return The oEmbed HTML.
-	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   Attributes.
-	 * @return string Embed.
+	 * @param Document $dom DOM.
 	 */
-	public function filter_embed_oembed_html( $return, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'gfycat.com' ) ) {
-			if ( preg_match( '/width=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['width'] = $matches[1];
-			}
-			if ( preg_match( '/height=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['height'] = $matches[1];
-			}
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://gfycat.com/ifr/" ) ]' );
 
-			if ( empty( $attr['height'] ) ) {
-				return $return;
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
 			}
+			$this->sanitize_raw_embed( $node );
+		}
+	}
 
-			$attributes = wp_array_slice_assoc( $attr, [ 'width', 'height' ] );
+	/**
+	 * Determine if the node has already been sanitized.
+	 *
+	 * @param DOMElement $node The DOMNode.
+	 * @return bool Whether the node is a raw embed.
+	 */
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && 'amp-gfycat' !== $node->parentNode->nodeName;
+	}
 
-			if ( empty( $attr['width'] ) ) {
-				$attributes['layout'] = 'fixed-height';
-				$attributes['width']  = 'auto';
-			}
+	/**
+	 * Make DailyMotion embed AMP compatible.
+	 *
+	 * @param DOMElement $iframe_node The node to make AMP compatible.
+	 */
+	private function sanitize_raw_embed( DOMElement $iframe_node ) {
+		$iframe_src = $iframe_node->getAttribute( 'src' );
 
-			$pieces = explode( '/detail/', $parsed_url['path'] );
-			if ( ! isset( $pieces[1] ) ) {
-				if ( ! preg_match( '/\/([A-Za-z0-9]+)/', $parsed_url['path'], $matches ) ) {
-					return $return;
-				}
-				$attributes['data-gfyid'] = $matches[1];
-			} else {
-				$attributes['data-gfyid'] = $pieces[1];
-			}
+		if ( ! preg_match( '#/ifr/([A-Za-z0-9]+)#', $iframe_src, $matches ) ) {
+			// Nothing to do if video ID could not be found.
+			return;
+		}
+
+		$new_attributes = [
+			'data-gfyid' => $matches[1],
+			'layout'     => 'responsive',
+			'height'     => $iframe_node->getAttribute( 'height' ),
+			'width'      => $iframe_node->getAttribute( 'width' ),
+		];
 
-			$return = AMP_HTML_Utils::build_tag(
-				'amp-gfycat',
-				$attributes
-			);
+		if ( empty( $new_attributes['height'] ) ) {
+			return;
 		}
-		return $return;
+
+		if ( empty( $new_attributes['width'] ) ) {
+			$new_attributes['layout'] = 'fixed-height';
+			$new_attributes['width']  = 'auto';
+		}
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $iframe_node ),
+			'amp-gfycat',
+			$new_attributes
+		);
+
+		$this->maybe_unwrap_p_element( $iframe_node );
+
+		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
 	}
 }
 
diff --git a/tests/php/test-class-amp-gfycat-embed-handler.php b/tests/php/test-class-amp-gfycat-embed-handler.php
index 86cb9ff741f..cc58a72642a 100644
--- a/tests/php/test-class-amp-gfycat-embed-handler.php
+++ b/tests/php/test-class-amp-gfycat-embed-handler.php
@@ -32,7 +32,7 @@ static function( $pre, $url ) {
 				if ( false === strpos( $url, 'tautwhoppingcougar' ) ) {
 					return $pre;
 				}
-				return '<iframe src=\'https://gfycat.com/ifr/tautwhoppingcougar\' frameborder=\'0\' scrolling=\'no\' width=\'100\' height=\'100\'  allowfullscreen></iframe>';
+				return '<iframe src=\'https://gfycat.com/ifr/tautwhoppingcougar#?secret=aBCUbiiIh5\' frameborder=\'0\' scrolling=\'no\' width=\'100\' height=\'100\'  allowfullscreen></iframe>';
 			},
 			10,
 			2
@@ -63,17 +63,17 @@ public function get_conversion_data() {
 
 			'url_simple'      => [
 				'https://gfycat.com/tautwhoppingcougar' . PHP_EOL,
-				'<p><amp-gfycat width="100" height="100" data-gfyid="tautwhoppingcougar"></amp-gfycat></p>' . PHP_EOL,
+				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="responsive" height="100" width="100"></amp-gfycat>' . PHP_EOL,
 			],
 
 			'url_with_detail' => [
 				'https://gfycat.com/gifs/detail/tautwhoppingcougar' . PHP_EOL,
-				'<p><amp-gfycat width="100" height="100" data-gfyid="tautwhoppingcougar"></amp-gfycat></p>' . PHP_EOL,
+				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="responsive" height="100" width="100"></amp-gfycat>' . PHP_EOL,
 			],
 
 			'url_with_params' => [
 				'https://gfycat.com/gifs/detail/tautwhoppingcougar?foo=bar' . PHP_EOL,
-				'<p><amp-gfycat width="100" height="100" data-gfyid="tautwhoppingcougar"></amp-gfycat></p>' . PHP_EOL,
+				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="responsive" height="100" width="100"></amp-gfycat>' . PHP_EOL,
 			],
 
 		];
@@ -89,9 +89,14 @@ public function get_conversion_data() {
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Gfycat_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -122,9 +127,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Gfycat_Embed_Handler();
 		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 
 		$scripts = array_merge(

From 7e1ccf00112cf2d92c011192a72b9df16665c9a5 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 27 Apr 2020 15:50:41 -0400
Subject: [PATCH 03/45] Unwrap Instagram embeds

---
 .../class-amp-instagram-embed-handler.php     |  99 +++-----------
 .../php/test-amp-instagram-embed-handler.php  | 121 +++++++-----------
 2 files changed, 64 insertions(+), 156 deletions(-)

diff --git a/includes/embeds/class-amp-instagram-embed-handler.php b/includes/embeds/class-amp-instagram-embed-handler.php
index 313d455d8fb..97cef09aa31 100644
--- a/includes/embeds/class-amp-instagram-embed-handler.php
+++ b/includes/embeds/class-amp-instagram-embed-handler.php
@@ -13,8 +13,8 @@
  * Much of this class is borrowed from Jetpack embeds
  */
 class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
-	const SHORT_URL_HOST = 'instagr.am';
-	const URL_PATTERN    = '#https?:\/\/(www\.)?instagr(\.am|am\.com)\/(p|tv)\/([A-Za-z0-9-_]+)#i';
+
+	const URL_PATTERN = '#https?:\/\/(www\.)?instagr(\.am|am\.com)\/(p|tv)\/([A-Za-z0-9-_]+)#i';
 
 	/**
 	 * Default width.
@@ -40,7 +40,7 @@ class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
 	/**
 	 * Tag.
 	 *
-	 * @var string AMP amp-facebook tag
+	 * @var string AMP amp-instagram tag
 	 */
 	private $amp_tag = 'amp-instagram';
 
@@ -48,87 +48,14 @@ class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Registers embed.
 	 */
 	public function register_embed() {
-		wp_embed_register_handler( $this->amp_tag, self::URL_PATTERN, [ $this, 'oembed' ], -1 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregisters embed.
 	 */
 	public function unregister_embed() {
-		wp_embed_unregister_handler( $this->amp_tag, -1 );
-	}
-
-	/**
-	 * WordPress OEmbed rendering callback.
-	 *
-	 * @param array  $matches URL pattern matches.
-	 * @param array  $attr    Matched attributes.
-	 * @param string $url     Matched URL.
-	 * @return string HTML markup for rendered embed.
-	 */
-	public function oembed( $matches, $attr, $url ) {
-		return $this->render(
-			[
-				'url'          => $url,
-				'instagram_id' => end( $matches ),
-			]
-		);
-	}
-
-	/**
-	 * Gets the rendered embed markup.
-	 *
-	 * @param array $args Embed rendering arguments.
-	 * @return string HTML markup for rendered embed.
-	 */
-	public function render( $args ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'url'          => false,
-				'instagram_id' => false,
-			]
-		);
-
-		if ( empty( $args['instagram_id'] ) ) {
-			return AMP_HTML_Utils::build_tag(
-				'a',
-				[
-					'href'  => esc_url_raw( $args['url'] ),
-					'class' => 'amp-wp-embed-fallback',
-				],
-				esc_html( $args['url'] )
-			);
-		}
-
-		$this->did_convert_elements = true;
-
-		return AMP_HTML_Utils::build_tag(
-			$this->amp_tag,
-			[
-				'data-shortcode' => $args['instagram_id'],
-				'data-captioned' => '',
-				'layout'         => 'responsive',
-				'width'          => $this->args['width'],
-				'height'         => $this->args['height'],
-			]
-		);
-	}
-
-	/**
-	 * Get Instagram ID from URL.
-	 *
-	 * @param string $url URL.
-	 * @return string|false The ID parsed from the URL or false if not found.
-	 */
-	private function get_instagram_id_from_url( $url ) {
-		$found = preg_match( self::URL_PATTERN, $url, $matches );
-
-		if ( ! $found ) {
-			return false;
-		}
-
-		return end( $matches );
+		// Not implemented.
 	}
 
 	/**
@@ -190,6 +117,22 @@ private function create_amp_instagram_and_replace_node( $dom, $node ) {
 		$this->did_convert_elements = true;
 	}
 
+	/**
+	 * Get Instagram ID from URL.
+	 *
+	 * @param string $url URL.
+	 * @return string|false The ID parsed from the URL or false if not found.
+	 */
+	private function get_instagram_id_from_url( $url ) {
+		$found = preg_match( self::URL_PATTERN, $url, $matches );
+
+		if ( ! $found ) {
+			return false;
+		}
+
+		return end( $matches );
+	}
+
 	/**
 	 * Removes Instagram's embed <script> tag.
 	 *
diff --git a/tests/php/test-amp-instagram-embed-handler.php b/tests/php/test-amp-instagram-embed-handler.php
index 88b88e41de1..8d788d811f3 100644
--- a/tests/php/test-amp-instagram-embed-handler.php
+++ b/tests/php/test-amp-instagram-embed-handler.php
@@ -4,25 +4,45 @@ class AMP_Instagram_Embed_Handler_Test extends WP_UnitTestCase {
 
 	public function get_conversion_data() {
 		return [
-			'no_embed'      => [
+			'no_embed'                           => [
+				'<p>Hello world.</p>',
 				'<p>Hello world.</p>',
-				'<p>Hello world.</p>' . PHP_EOL,
 			],
-			'simple_url'    => [
-				'https://instagram.com/p/7-l0z_p4A4/' . PHP_EOL,
-				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
+			'simple_url'                         => [
+				'https://instagram.com/p/7-l0z_p4A4/',
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>',
 			],
-			'simple_tv_url' => [
+			'simple_tv_url'                      => [
 				'https://instagram.com/tv/7-l0z_p4A4/' . PHP_EOL,
-				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>',
 			],
-			'short_url'     => [
+			'short_url'                          => [
 				'https://instagr.am/p/7-l0z_p4A4' . PHP_EOL,
-				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>',
 			],
-			'short_tv_url'  => [
+			'short_tv_url'                       => [
 				'https://instagr.am/tv/7-l0z_p4A4' . PHP_EOL,
-				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>',
+			],
+
+			'embed_blockquote_without_instagram' => [
+				'<blockquote><p>lorem ipsum</p></blockquote>',
+				'<blockquote><p>lorem ipsum</p></blockquote>',
+			],
+
+			'blockquote_embed'                   => [
+				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>',
+			],
+
+			'blockquote_tv_embed'                => [
+				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/tv/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>',
+			],
+
+			'blockquote_embed_with_caption'      => [
+				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/" data-instgrm-captioned><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>',
 			],
 		];
 	}
@@ -37,9 +57,14 @@ public function get_conversion_data() {
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Instagram_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -70,9 +95,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Instagram_Embed_Handler();
 		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 
 		$scripts = array_merge(
@@ -80,69 +108,6 @@ public function test__get_scripts( $source, $expected ) {
 			$whitelist_sanitizer->get_scripts()
 		);
 
-		$this->assertEquals( $expected, $scripts );
-	}
-
-	/**
-	 * Data for test__raw_embed_sanitizer.
-	 *
-	 * @return array
-	 */
-	public function get_raw_embed_dataset() {
-		return [
-			'no_embed'                               => [
-				'<p>Hello world.</p>',
-				'<p>Hello world.</p>',
-			],
-			'embed_blockquote_without_instagram'     => [
-				'<blockquote><p>lorem ipsum</p></blockquote>',
-				'<blockquote><p>lorem ipsum</p></blockquote>',
-			],
-
-			'blockquote_embed'                       => [
-				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . "\n\n",
-			],
-
-			'blockquote_tv_embed'                    => [
-				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/tv/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . "\n\n",
-			],
-
-			'blockquote_embed_notautop'              => [
-				'<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram> ',
-			],
-
-			'blockquote_embed_with_caption'          => [
-				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/" data-instgrm-captioned><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . "\n\n",
-			],
-
-			'blockquote_embed_with_caption_notautop' => [
-				'<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/" data-instgrm-captioned><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram> ',
-			],
-		];
-	}
-
-	/**
-	 * Test raw_embed_sanitizer.
-	 *
-	 * @param string $source  Content.
-	 * @param string $expected Expected content.
-	 * @dataProvider get_raw_embed_dataset
-	 * @covers AMP_Instagram_Embed_Handler::sanitize_raw_embeds()
-	 */
-	public function test__raw_embed_sanitizer( $source, $expected ) {
-		$dom   = AMP_DOM_Utils::get_dom_from_content( $source );
-		$embed = new AMP_Instagram_Embed_Handler();
-
-		$embed->sanitize_raw_embeds( $dom );
-
-		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
-		$content = preg_replace( '/(?<=>)\s+(?=<)/', '', $content );
-
-		$this->assertEquals( $expected, $content );
+		$this->assertEquals( $expected . PHP_EOL . PHP_EOL, $scripts );
 	}
 }

From 3bb9d3e20b9f69d0203c5a77bb964cb4e895fcac Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 4 May 2020 15:54:17 -0400
Subject: [PATCH 04/45] Unwrap Scribd embeds

---
 .../embeds/class-amp-base-embed-handler.php   | 11 +--
 .../embeds/class-amp-scribd-embed-handler.php | 79 ++++++++++---------
 includes/utils/class-amp-dom-utils.php        | 15 ++++
 tests/php/test-amp-scribd-embed-handler.php   | 20 +++--
 4 files changed, 74 insertions(+), 51 deletions(-)

diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index d9677a1f146..ec52ee7c500 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -115,15 +115,12 @@ function ( $attr_name ) {
 	 * @param DOMElement $node Node.
 	 */
 	protected function maybe_unwrap_p_element( DOMElement $node ) {
-		$parent_node = $node->parentNode;
-		while ( $parent_node && ! ( $parent_node instanceof DOMElement ) ) {
-			$parent_node = $parent_node->parentNode;
-		}
+	    $parent_element = AMP_DOM_Utils::get_parent_element( $node );
 
-		if ( 'p' === $parent_node->nodeName && false === $parent_node->hasAttributes() ) {
-			$children = $parent_node->getElementsByTagName( '*' );
+		if ( $parent_element && 'p' === $parent_element->nodeName && false === $parent_element->hasAttributes() ) {
+			$children = $parent_element->getElementsByTagName( '*' );
 			if ( 1 === $children->length ) {
-				$parent_node->parentNode->replaceChild( $node, $parent_node );
+				$parent_element->parentNode->replaceChild( $node, $parent_element );
 			}
 		}
 	}
diff --git a/includes/embeds/class-amp-scribd-embed-handler.php b/includes/embeds/class-amp-scribd-embed-handler.php
index 3cefd301ff0..11b4449f30d 100644
--- a/includes/embeds/class-amp-scribd-embed-handler.php
+++ b/includes/embeds/class-amp-scribd-embed-handler.php
@@ -6,6 +6,8 @@
  * @since 1.4
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Scribd_Embed_Handler
  */
@@ -15,63 +17,66 @@ class AMP_Scribd_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Registers embed.
 	 */
 	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregisters embed.
 	 */
 	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ] );
+		// Not implemented.
 	}
 
 	/**
-	 * Filter oEmbed HTML for Scribd to be AMP compatible.
+	 * Sanitize all gfycat <iframe> tags to <amp-gfycat>.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @return string Embed.
+	 * @param Document $dom DOM.
 	 */
-	public function filter_embed_oembed_html( $cache, $url ) {
-		if ( ! in_array( wp_parse_url( $url, PHP_URL_HOST ), [ 'scribd.com', 'www.scribd.com' ], true ) ) {
-			return $cache;
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://www.scribd.com/embeds/" ) ]' );
+
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
+			}
+			$this->sanitize_raw_embed( $node );
 		}
+	}
 
-		return $this->sanitize_iframe( $cache );
+	/**
+	 * Determine if the node has already been sanitized.
+	 *
+	 * @param DOMElement $node The DOMNode.
+	 * @return bool Whether the node is a raw embed.
+	 */
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && 'amp-iframe' !== $node->parentNode->nodeName;
 	}
 
 	/**
-	 * Retrieves iframe element from HTML string and amends or appends the correct sandbox permissions.
+	 * Make Scribd embed AMP compatible.
 	 *
-	 * @param string $html HTML string.
-	 * @return string iframe with correct sandbox permissions.
+	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
-	private function sanitize_iframe( $html ) {
-		return preg_replace_callback(
-			'#^.*<iframe(?P<iframe_attributes>[^>]+?)></iframe>.*$#s',
-			function ( $matches ) {
-				$attrs = $matches['iframe_attributes'];
+	private function sanitize_raw_embed( DOMElement $iframe_node ) {
+		$required_sandbox_permissions  = 'allow-popups allow-scripts';
+		$iframe_node->setAttribute(
+			'sandbox',
+			sprintf( '%s %s', $iframe_node->getAttribute( 'sandbox' ), $required_sandbox_permissions )
+		);
 
-				// Amend the required keywords to the iframe's sandbox.
-				$sandbox  = 'allow-popups allow-scripts';
-				$replaced = 0;
-				$attrs    = preg_replace(
-					'#(?<=\ssandbox=["\'])#',
-					"{$sandbox} ", // whitespace is necessary to separate prior permissions.
-					$attrs,
-					1,
-					$replaced
-				);
+		// Remove the accompanied script tag so that the iframe can be later unwrapped.
+		if ( 'script' === $iframe_node->nextSibling->nodeName ) {
+			$parent_element = AMP_DOM_Utils::get_parent_element( $iframe_node );
+			if ( $parent_element ) {
+				$parent_element->removeChild( $iframe_node->nextSibling );
+			}
+		}
 
-				// If no sandbox attribute was found, then add the attribute.
-				if ( 0 === $replaced ) {
-					$attrs .= sprintf( ' sandbox="%s"', $sandbox );
-				}
+		$iframe_node->setAttribute( 'layout', 'responsive' );
 
-				// The iframe sanitizer will convert this into an amp-iframe.
-				return "<iframe{$attrs}></iframe>";
-			},
-			$html
-		);
+		$this->maybe_unwrap_p_element( $iframe_node );
+
+		// The iframe sanitizer will further sanitize and convert this into an amp-iframe.
 	}
 }
diff --git a/includes/utils/class-amp-dom-utils.php b/includes/utils/class-amp-dom-utils.php
index ffa2aff6085..4bef288329b 100644
--- a/includes/utils/class-amp-dom-utils.php
+++ b/includes/utils/class-amp-dom-utils.php
@@ -499,4 +499,19 @@ public static function copy_attributes( $attributes, DOMElement $from, DOMElemen
 			}
 		}
 	}
+
+	/**
+	 * Get closest parent element for specified DOM node.
+	 *
+	 * @param DOMNode $node DOMNode.
+	 * @return DOMElement|null
+	 */
+	public static function get_parent_element( DOMNode $node ) {
+		$parent_node = $node->parentNode;
+		while ( $parent_node && ! ( $parent_node instanceof DOMElement ) ) {
+			$parent_node = $parent_node->parentNode;
+		}
+
+		return $parent_node;
+	}
 }
diff --git a/tests/php/test-amp-scribd-embed-handler.php b/tests/php/test-amp-scribd-embed-handler.php
index c9352a1b488..7d08d7a6c3d 100644
--- a/tests/php/test-amp-scribd-embed-handler.php
+++ b/tests/php/test-amp-scribd-embed-handler.php
@@ -91,7 +91,7 @@ public function get_conversion_data() {
 
 			'document_embed' => [
 				$this->scribd_doc_url . PHP_EOL,
-				'<p><iframe title="Synthesis of Knowledge: Effects of Fire and Thinning Treatments on Understory Vegetation in Dry U.S. Forests" class="scribd_iframe_embed" src="https://www.scribd.com/embeds/110799637/content" data-aspect-ratio="1.2941176470588236" scrolling="no" id="110799637" width="500" height="750" frameborder="0" sandbox="allow-popups allow-scripts"></iframe></p>' . PHP_EOL,
+				'<iframe title="Synthesis of Knowledge: Effects of Fire and Thinning Treatments on Understory Vegetation in Dry U.S. Forests" class="scribd_iframe_embed" src="https://www.scribd.com/embeds/110799637/content" data-aspect-ratio="1.2941176470588236" scrolling="no" id="110799637" width="500" height="750" frameborder="0" sandbox=" allow-popups allow-scripts" layout="responsive"></iframe>' . PHP_EOL,
 			],
 		];
 
@@ -99,7 +99,7 @@ public function get_conversion_data() {
 		if ( version_compare( strtok( get_bloginfo( 'version' ), '-' ), '5.2', '<' ) ) {
 			$data['document_embed'] = [
 				$this->scribd_doc_url . PHP_EOL,
-				'<p><iframe class="scribd_iframe_embed" src="https://www.scribd.com/embeds/110799637/content" data-aspect-ratio="1.2941176470588236" scrolling="no" id="110799637" width="500" height="750" frameborder="0" sandbox="allow-popups allow-scripts"></iframe></p>' . PHP_EOL,
+				'<iframe class="scribd_iframe_embed" src="https://www.scribd.com/embeds/110799637/content" data-aspect-ratio="1.2941176470588236" scrolling="no" id="110799637" width="500" height="750" frameborder="0" sandbox=" allow-popups allow-scripts" layout="responsive"></iframe>' . PHP_EOL,
 			];
 		}
 
@@ -109,8 +109,6 @@ public function get_conversion_data() {
 	/**
 	 * Test conversion.
 	 *
-	 * @covers AMP_Scribd_Embed_Handler::filter_embed_oembed_html()
-	 * @covers AMP_Scribd_Embed_Handler::sanitize_iframe()
 	 * @dataProvider get_conversion_data
 	 *
 	 * @param $source
@@ -119,9 +117,14 @@ public function get_conversion_data() {
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Scribd_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -154,9 +157,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Scribd_Embed_Handler();
 		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 
 		$scripts = array_merge(

From be260f89b9f934450e08afa7b5810a113b5df322 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Tue, 5 May 2020 07:31:20 -0400
Subject: [PATCH 05/45] Unwrap SoundCloud embeds

---
 .../class-amp-soundcloud-embed-handler.php    | 161 ++++++------------
 .../php/test-amp-soundcloud-embed-handler.php |  21 ++-
 2 files changed, 63 insertions(+), 119 deletions(-)

diff --git a/includes/embeds/class-amp-soundcloud-embed-handler.php b/includes/embeds/class-amp-soundcloud-embed-handler.php
index c65bd5da358..799704e0dec 100644
--- a/includes/embeds/class-amp-soundcloud-embed-handler.php
+++ b/includes/embeds/class-amp-soundcloud-embed-handler.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_SoundCloud_Embed_Handler
  *
@@ -23,163 +25,100 @@ class AMP_SoundCloud_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Register embed.
 	 */
 	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+		// Not implemented.
 	}
 
 	/**
-	 * Render oEmbed.
-	 *
-	 * @see \WP_Embed::shortcode()
+	 * Sanitize all SoundCloud <iframe> tags to <amp-soundcloud>.
 	 *
-	 * @codeCoverageIgnore
-	 * @deprecated Core's oEmbed handler is now used instead, with embed_oembed_html filter used to convert to AMP.
-	 * @param array  $matches URL pattern matches.
-	 * @param array  $attr    Shortcode attributes.
-	 * @param string $url     URL.
-	 * @return string Rendered oEmbed.
+	 * @param Document $dom DOM.
 	 */
-	public function oembed( $matches, $attr, $url ) {
-		_deprecated_function( __METHOD__, '0.6' );
-		return $this->render( $this->extract_params_from_iframe_src( $url ), $url );
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://w.soundcloud.com/player/" ) ]' );
+
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
+			}
+			$this->sanitize_raw_embed( $node );
+		}
 	}
 
 	/**
-	 * Filter oEmbed HTML for SoundCloud to convert to AMP.
+	 * Determine if the node has already been sanitized.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @return string Embed.
+	 * @param DOMElement $node The DOMNode.
+	 * @return bool Whether the node is a raw embed.
 	 */
-	public function filter_embed_oembed_html( $cache, $url ) {
-		if ( false === strpos( wp_parse_url( $url, PHP_URL_HOST ), 'soundcloud.com' ) ) {
-			return $cache;
-		}
-		return $this->parse_amp_component_from_iframe( $cache, $url );
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && 'amp-soundcloud' !== $node->parentNode->nodeName;
 	}
 
 	/**
-	 * Parse AMP component from iframe.
+	 * Make SoundCloud embed AMP compatible.
 	 *
-	 * @param string      $html HTML.
-	 * @param string|null $url  Embed URL, for fallback purposes.
-	 * @return string AMP component or empty if unable to determine SoundCloud ID.
+	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
-	private function parse_amp_component_from_iframe( $html, $url = null ) {
-		$props = $this->match_element_attributes( $html, 'iframe', [ 'src', 'title', 'width', 'height' ] );
-		if ( ! isset( $props ) || empty( $props['src'] ) ) {
-			return $html;
-		}
-
-		$src   = html_entity_decode( $props['src'], ENT_QUOTES );
+	private function sanitize_raw_embed( DOMElement $iframe_node ) {
+		$src   = html_entity_decode( $iframe_node->getAttribute( 'src' ), ENT_QUOTES );
 		$query = [];
 		parse_str( wp_parse_url( $src, PHP_URL_QUERY ), $query );
 
 		if ( empty( $query['url'] ) ) {
-			return $html;
+			return;
 		}
 
-		$props = array_merge(
-			$props,
-			$this->extract_params_from_iframe_src( $query['url'] )
-		);
-		if ( isset( $query['visual'] ) ) {
-			$props['visual'] = $query['visual'];
-		}
-
-		if ( $url && ! empty( $props['title'] ) ) {
-			$props['fallback'] = sprintf(
-				'<a fallback href="%s">%s</a>',
-				esc_url( $url ),
-				esc_html( $props['title'] )
-			);
-		}
-
-		return $this->render( $props, $url );
-	}
-
-	/**
-	 * Render embed.
-	 *
-	 * @param array  $args Args.
-	 * @param string $url  Embed URL for fallback purposes. Optional.
-	 * @return string Rendered embed.
-	 */
-	public function render( $args, $url ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'track_id'    => false,
-				'playlist_id' => false,
-				'height'      => null,
-				'width'       => null,
-				'visual'      => null,
-				'fallback'    => '',
-			]
-		);
-
-		$this->did_convert_elements = true;
+		$embed_id = $this->parse_embed_id_from_url( $query['url'] );
 
-		$attributes = [];
-		if ( ! empty( $args['track_id'] ) ) {
-			$attributes['data-trackid'] = $args['track_id'];
-		} elseif ( ! empty( $args['playlist_id'] ) ) {
-			$attributes['data-playlistid'] = $args['playlist_id'];
-		} elseif ( $url ) {
-			return $this->render_embed_fallback( $url );
+		if ( isset( $embed_id['track_id'] ) ) {
+			$attributes['data-trackid'] = $embed_id['track_id'];
+		} elseif ( isset( $embed_id['playlist_id'] ) ) {
+			$attributes['data-playlistid'] = $embed_id['playlist_id'];
 		} else {
-			return '';
+			// Return if the track nor playlist ID was found.
+			return;
 		}
 
-		if ( isset( $args['visual'] ) ) {
-			$attributes['data-visual'] = rest_sanitize_boolean( $args['visual'] ) ? 'true' : 'false';
-		}
+		$attributes['height'] = $iframe_node->hasAttribute( 'height' )
+			? $iframe_node->getAttribute( 'height' )
+			: $this->args['height'];
 
-		$attributes['height'] = $args['height'] ?: $this->args['height'];
-		if ( $args['width'] ) {
-			$attributes['width']  = $args['width'];
+		if ( $iframe_node->hasAttribute( 'width' ) ) {
+			$attributes['width']  = $iframe_node->getAttribute( 'width' );
 			$attributes['layout'] = 'responsive';
 		} else {
 			$attributes['layout'] = 'fixed-height';
 		}
 
-		return AMP_HTML_Utils::build_tag(
+		if ( isset( $query['visual'] ) ) {
+			$attributes['data-visual'] = rest_sanitize_boolean( $query['visual'] ) ? 'true' : 'false';
+		}
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $iframe_node ),
 			'amp-soundcloud',
-			$attributes,
-			$args['fallback']
+			$attributes
 		);
-	}
 
-	/**
-	 * Render embed fallback.
-	 *
-	 * @param string $url URL.
-	 * @return string Fallback link.
-	 */
-	private function render_embed_fallback( $url ) {
-		return AMP_HTML_Utils::build_tag(
-			'a',
-			[
-				'href'  => esc_url_raw( $url ),
-				'class' => 'amp-wp-embed-fallback',
-			],
-			esc_html( $url )
-		);
+		$this->maybe_unwrap_p_element( $iframe_node );
+
+		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
 	}
 
 	/**
-	 * Get params from Soundcloud iframe src.
+	 * Get embed ID from Soundcloud iframe src.
 	 *
 	 * @param string $url URL.
-	 * @return array Params extracted from URL.
+	 * @return array|null Array containing ID name and value if found.
 	 */
-	private function extract_params_from_iframe_src( $url ) {
+	private function parse_embed_id_from_url( $url ) {
 		$parsed_url = wp_parse_url( $url );
 		if ( preg_match( '#tracks/(?P<track_id>\d+)#', $parsed_url['path'], $matches ) ) {
 			return [
diff --git a/tests/php/test-amp-soundcloud-embed-handler.php b/tests/php/test-amp-soundcloud-embed-handler.php
index f10d5264ecb..cbcbe64fd51 100644
--- a/tests/php/test-amp-soundcloud-embed-handler.php
+++ b/tests/php/test-amp-soundcloud-embed-handler.php
@@ -88,7 +88,6 @@ public function mock_http_request( $preempt, $r, $url ) {
 		if ( false === strpos( $url, 'soundcloud.com' ) ) {
 			return $preempt;
 		}
-		unset( $r );
 
 		if ( false !== strpos( $url, 'sets' ) ) {
 			$body = $this->playlist_oembed_response;
@@ -122,12 +121,12 @@ public function get_embed_conversion_data() {
 
 			'track_simple'    => [
 				$this->track_url . PHP_EOL,
-				'<p><amp-soundcloud data-trackid="90097394" data-visual="true" height="400" width="500" layout="responsive">' . ( function_exists( 'wp_filter_oembed_iframe_title_attribute' ) ? '<a fallback href="https://soundcloud.com/jack-villano-villano/mozart-requiem-in-d-minor">Mozart &#8211; Requiem in D minor Complete Full by Jack Villano Villano</a>' : '' ) . '</amp-soundcloud></p>' . PHP_EOL,
+				'<amp-soundcloud data-trackid="90097394" height="400" width="500" layout="responsive" data-visual="true"></amp-soundcloud>' . PHP_EOL,
 			],
 
 			'playlist_simple' => [
 				$this->playlist_url . PHP_EOL,
-				'<p><amp-soundcloud data-playlistid="40936190" data-visual="true" height="450" width="500" layout="responsive">' . ( function_exists( 'wp_filter_oembed_iframe_title_attribute' ) ? '<a fallback href="https://soundcloud.com/classical-music-playlist/sets/classical-music-essential-collection">Classical Music &#8211; The Essential Collection by Classical Music</a>' : '' ) . '</amp-soundcloud></p>' . PHP_EOL,
+				'<amp-soundcloud data-playlistid="40936190" height="450" width="500" layout="responsive" data-visual="true"></amp-soundcloud>' . PHP_EOL,
 			],
 		];
 	}
@@ -136,8 +135,6 @@ public function get_embed_conversion_data() {
 	 * Test conversion.
 	 *
 	 * @dataProvider get_embed_conversion_data
-	 * @covers AMP_SoundCloud_Embed_Handler::filter_embed_oembed_html()
-	 * @covers AMP_SoundCloud_Embed_Handler::render()
 	 *
 	 * @param string $source   Source.
 	 * @param string $expected Expected.
@@ -145,9 +142,14 @@ public function get_embed_conversion_data() {
 	public function test_embed_conversion( $source, $expected ) {
 		$embed = new AMP_SoundCloud_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -184,9 +186,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_SoundCloud_Embed_Handler();
 		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 
 		$scripts = array_merge(

From d7f34213890ba8a8ed4b0b0c23eacbece47d9313 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 7 May 2020 23:38:14 -0400
Subject: [PATCH 06/45] Sanitize Twitter timelines and moments

Addresses issue #4663
---
 .../class-amp-twitter-embed-handler.php       | 254 ++++++++++--------
 tests/php/test-amp-twitter-embed-handler.php  | 143 ++++------
 .../test-class-amp-tiktok-embed-handler.php   |   2 +-
 3 files changed, 195 insertions(+), 204 deletions(-)

diff --git a/includes/embeds/class-amp-twitter-embed-handler.php b/includes/embeds/class-amp-twitter-embed-handler.php
index dcd7b1e8839..240a1192504 100644
--- a/includes/embeds/class-amp-twitter-embed-handler.php
+++ b/includes/embeds/class-amp-twitter-embed-handler.php
@@ -28,80 +28,28 @@ class AMP_Twitter_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * @since 1.0
 	 * @var string
 	 */
-	const URL_PATTERN_TIMELINE = '#https?:\/\/twitter\.com(?:\/\#\!\/|\/)(?P<username>[a-zA-Z0-9_]{1,20})(?:$|\/(?P<type>likes|lists)(\/(?P<id>[a-zA-Z0-9_-]+))?)#i';
+	const URL_PATTERN_MOMENT = '#https?:\/\/twitter\.com\/i\/moments\/(?P<id>\d+)#i';
 
 	/**
-	 * Tag.
-	 *
-	 * @var string embed HTML blockquote tag to identify and replace with AMP version.
-	 */
-	protected $sanitize_tag = 'blockquote';
-
-	/**
-	 * Tag.
+	 * URL pattern for a Twitter timeline.
 	 *
-	 * @var string AMP amp-facebook tag
+	 * @since 1.0
+	 * @var string
 	 */
-	private $amp_tag = 'amp-twitter';
+	const URL_PATTERN_TIMELINE = '#https?:\/\/twitter\.com(?:\/\#\!\/|\/)(?P<username>[a-zA-Z0-9_]{1,20})(?:$|\/(?P<type>likes|lists|timelines)(\/(?P<id>[a-zA-Z0-9_-]+))?|.+?)#i';
 
 	/**
 	 * Registers embed.
 	 */
 	public function register_embed() {
-		wp_embed_register_handler( 'amp-twitter-timeline', self::URL_PATTERN_TIMELINE, [ $this, 'oembed_timeline' ], -1 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregisters embed.
 	 */
 	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-twitter-timeline', -1 );
-	}
-
-	/**
-	 * Render oEmbed for a timeline.
-	 *
-	 * @since 1.0
-	 *
-	 * @param array $matches URL pattern matches.
-	 * @return string Rendered oEmbed.
-	 */
-	public function oembed_timeline( $matches ) {
-		if ( ! isset( $matches['username'] ) ) {
-			return '';
-		}
-
-		$attributes = [
-			'data-timeline-source-type' => 'profile',
-			'data-timeline-screen-name' => $matches['username'],
-		];
-
-		if ( isset( $matches['type'] ) ) {
-			switch ( $matches['type'] ) {
-				case 'likes':
-					$attributes['data-timeline-source-type'] = 'likes';
-					break;
-				case 'lists':
-					if ( ! isset( $matches['id'] ) ) {
-						return '';
-					}
-					$attributes['data-timeline-source-type']       = 'list';
-					$attributes['data-timeline-slug']              = $matches['id'];
-					$attributes['data-timeline-owner-screen-name'] = $attributes['data-timeline-screen-name'];
-					unset( $attributes['data-timeline-screen-name'] );
-					break;
-				default:
-					return '';
-			}
-		}
-
-		$attributes['layout'] = 'responsive';
-		$attributes['width']  = $this->args['width'];
-		$attributes['height'] = $this->args['height'];
-
-		$this->did_convert_elements = true;
-
-		return AMP_HTML_Utils::build_tag( $this->amp_tag, $attributes );
+		// Not implemented.
 	}
 
 	/**
@@ -110,88 +58,121 @@ public function oembed_timeline( $matches ) {
 	 * @param Document $dom DOM.
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes     = $dom->getElementsByTagName( $this->sanitize_tag );
-		$num_nodes = $nodes->length;
+		$this->sanitize_tweet_embeds( $dom );
+		$this->sanitize_timeline_embeds( $dom );
+		$this->sanitize_moment_embeds( $dom );
+	}
 
-		if ( 0 === $num_nodes ) {
-			return;
-		}
+	public function sanitize_tweet_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//blockquote[ @class = "twitter-tweet" ]' );
+		$this->sanitize_raw_embed( 'tweet', $nodes );
+	}
 
-		for ( $i = $num_nodes - 1; $i >= 0; $i-- ) {
-			$node = $nodes->item( $i );
-			if ( ! $node instanceof DOMElement ) {
-				continue;
-			}
+	public function sanitize_timeline_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//a[ @class = "twitter-timeline" ]' );
+		$this->sanitize_raw_embed( 'timeline', $nodes );
+	}
 
-			if ( $this->is_tweet_raw_embed( $node ) ) {
-				$this->create_amp_twitter_and_replace_node( $dom, $node );
-			}
-		}
+	public function sanitize_moment_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//a[ @class = "twitter-moment" ]' );
+		$this->sanitize_raw_embed( 'moment', $nodes );
 	}
 
 	/**
-	 * Checks whether it's a twitter blockquote or not.
+	 * Checks whether it's a twitter AMP component.
 	 *
 	 * @param DOMElement $node The DOMNode to adjust and replace.
 	 * @return bool Whether node is for raw embed.
 	 */
-	private function is_tweet_raw_embed( $node ) {
-		// Skip processing blockquotes that have already been passed through while being wrapped with <amp-twitter>.
-		if ( $node->parentNode && 'amp-twitter' === $node->parentNode->nodeName ) {
-			return false;
-		}
-
-		$class_attr = $node->getAttribute( 'class' );
-
-		return null !== $class_attr && false !== strpos( $class_attr, 'twitter-tweet' );
+	private function is_raw_embed( $node ) {
+		return $node->parentNode && 'amp-twitter' !== $node->parentNode->nodeName;
 	}
 
 	/**
 	 * Make final modifications to DOMNode
 	 *
-	 * @param Document   $dom The HTML Document.
-	 * @param DOMElement $node The DOMNode to adjust and replace.
+	 * @param string $embed_type The type of Twitter embed.
+	 * @param DOMNodeList  $nodes List of DOMElement nodes.
 	 */
-	private function create_amp_twitter_and_replace_node( Document $dom, DOMElement $node ) {
-		$tweet_id = $this->get_tweet_id( $node );
-		if ( ! $tweet_id ) {
-			return;
-		}
+	private function sanitize_raw_embed( $embed_type, $nodes ) {
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
+			}
 
-		$attributes = [
-			'width'        => $this->DEFAULT_WIDTH,
-			'height'       => $this->DEFAULT_HEIGHT,
-			'layout'       => 'responsive',
-			'data-tweetid' => $tweet_id,
-		];
+			$attributes = [
+				'width'        => $this->DEFAULT_WIDTH,
+				'height'       => $this->DEFAULT_HEIGHT,
+				'layout'       => 'responsive',
+			];
+
+			switch ( $embed_type ) {
+				case 'tweet':
+					$tweet_id = $this->get_tweet_id( $node );
+					if ( ! $tweet_id ) {
+						return;
+					}
 
-		if ( $node->hasAttributes() ) {
-			foreach ( $node->attributes as $attr ) {
-				$attributes[ $attr->nodeName ] = $attr->nodeValue;
+					$attributes['data-tweetid'] = $tweet_id;
+					break;
+				case 'timeline':
+					$timeline_attrs = $this->get_timeline_attributes( $node->getAttribute( 'href' ) );
+					if ( ! $timeline_attrs ) {
+						return;
+					}
+
+					if (
+						( ! isset( $timeline_attrs['type'] ) && isset( $timeline_attrs['username'] ) ) ||
+						( isset( $timeline_attrs['type'] ) && in_array( $timeline_attrs['type'], [ 'likes', 'lists' ], true ) )
+					) {
+						$attributes['data-timeline-source-type'] = 'url';
+						$attributes['data-timeline-url'] = $node->getAttribute( 'href' );
+					}
+
+					break;
+				case 'moment':
+					$moment_id = $this->get_moment_id( $node->getAttribute( 'href' ) );
+					if ( ! $moment_id ) {
+						return;
+					}
+
+					$attributes['data-momentid'] = $moment_id;
+					break;
+				default:
+					return;
 			}
-		}
 
-		$new_node = AMP_DOM_Utils::create_node(
-			$dom,
-			$this->amp_tag,
-			$attributes
-		);
+			if ( $node->hasAttributes() ) {
+				foreach ( $node->attributes as $attr ) {
+					// Copy only `data-` attributes.
+					if ( false !== strpos( $attr->nodeName, 'data-', 0 ) ) {
+						$attributes[ $attr->nodeName ] = $attr->nodeValue;
+					}
+				}
+			}
 
-		/**
-		 * Placeholder element to append to the new node.
-		 *
-		 * @var DOMElement $placeholder
-		 */
-		$placeholder = $node->cloneNode( true );
-		$placeholder->setAttribute( 'placeholder', '' );
+			$new_node = AMP_DOM_Utils::create_node(
+				Document::fromNode( $node ),
+				'amp-twitter',
+				$attributes
+			);
 
-		$new_node->appendChild( $placeholder );
+			/**
+			 * Placeholder element to append to the new node.
+			 *
+			 * @var DOMElement $placeholder
+			 */
+			$placeholder = $node->cloneNode( true );
+			$placeholder->setAttribute( 'placeholder', '' );
 
-		$this->sanitize_embed_script( $node );
+			$new_node->appendChild( $placeholder );
 
-		$node->parentNode->replaceChild( $new_node, $node );
+			$this->sanitize_embed_script( $node );
+			// We can unwrap the <p> tag once the accompanied <script> is removed.
+			$this->maybe_unwrap_p_element( $node );
 
-		$this->did_convert_elements = true;
+			$node->parentNode->replaceChild( $new_node, $node );
+		}
 	}
 
 	/**
@@ -223,6 +204,36 @@ private function get_tweet_id( $node ) {
 		return null;
 	}
 
+	/**
+	 * Parse Twitter timeline attributes from a URL.
+	 *
+	 * @param string $url URL.
+	 * @return array Timeline attributes.
+	 */
+	private function get_timeline_attributes( $url ) {
+		$found = preg_match( self::URL_PATTERN_TIMELINE, $url, $matches );
+		if ( $found ) {
+			return $matches;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Parse Twitter moment ID from a URL.
+	 *
+	 * @param string $url URL.
+	 * @return array Timeline attributes.
+	 */
+	private function get_moment_id( $url ) {
+		$found = preg_match( self::URL_PATTERN_MOMENT, $url, $matches );
+		if ( $found ) {
+			return $matches['id'];
+		}
+
+		return null;
+	}
+
 	/**
 	 * Removes Twitter's embed <script> tag.
 	 *
@@ -230,6 +241,17 @@ private function get_tweet_id( $node ) {
 	 */
 	private function sanitize_embed_script( $node ) {
 		$next_element_sibling = $node->nextSibling;
+
+		// Remove any <br> siblings.
+		while ( $next_element_sibling && $next_element_sibling instanceof DOMElement && 'br' === $next_element_sibling->nodeName ) {
+			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
+			$next_element_sibling = $node->nextSibling;
+		}
+
+		if ( $next_element_sibling instanceof DOMElement && 'br' === $next_element_sibling->nodeName ) {
+			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
+		}
+
 		while ( $next_element_sibling && ! ( $next_element_sibling instanceof DOMElement ) ) {
 			$next_element_sibling = $next_element_sibling->nextSibling;
 		}
diff --git a/tests/php/test-amp-twitter-embed-handler.php b/tests/php/test-amp-twitter-embed-handler.php
index b4426252e4e..0d80c3ae9a2 100644
--- a/tests/php/test-amp-twitter-embed-handler.php
+++ b/tests/php/test-amp-twitter-embed-handler.php
@@ -12,20 +12,6 @@
  */
 class AMP_Twitter_Embed_Handler_Test extends WP_UnitTestCase {
 
-	/**
-	 * oEmbed response for the tweet ID 987437752164737025.
-	 *
-	 * @var string
-	 */
-	protected $oembed_response_1 = '{"url":"https:\/\/twitter.com\/WordPress\/status\/987437752164737025","author_name":"WordPress","author_url":"https:\/\/twitter.com\/WordPress","html":"\u003Cblockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"\u003E\u003Cp lang=\"en\" dir=\"ltr\"\u003ECelebrate the WordPress 15th Anniversary on May 27 \u003Ca href=\"https:\/\/t.co\/jv62WkI9lr\"\u003Ehttps:\/\/t.co\/jv62WkI9lr\u003C\/a\u003E \u003Ca href=\"https:\/\/t.co\/4ZECodSK78\"\u003Epic.twitter.com\/4ZECodSK78\u003C\/a\u003E\u003C\/p\u003E&mdash; WordPress (@WordPress) \u003Ca href=\"https:\/\/twitter.com\/WordPress\/status\/987437752164737025?ref_src=twsrc%5Etfw\"\u003EApril 20, 2018\u003C\/a\u003E\u003C\/blockquote\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
-
-	/**
-	 * oEmbed response for the tweet ID 705219971425574912.
-	 *
-	 * @var string
-	 */
-	protected $oembed_response_2 = '{"url":"https:\/\/twitter.com\/sengineland\/status\/705219971425574912","author_name":"Search Engine Land","author_url":"https:\/\/twitter.com\/sengineland","html":"\u003Cblockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"\u003E\u003Cp lang=\"en\" dir=\"ltr\"\u003EOn our way to the \u003Ca href=\"https:\/\/twitter.com\/hashtag\/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw\"\u003E#GoogleDance\u003C\/a\u003E! \u003Ca href=\"https:\/\/twitter.com\/hashtag\/SMX?src=hash&amp;ref_src=twsrc%5Etfw\"\u003E#SMX\u003C\/a\u003E \uD83D\uDC83\uD83C\uDFFB \u003Ca href=\"https:\/\/t.co\/N8kZ9M3eN4\"\u003Epic.twitter.com\/N8kZ9M3eN4\u003C\/a\u003E\u003C\/p\u003E&mdash; Search Engine Land (@sengineland) \u003Ca href=\"https:\/\/twitter.com\/sengineland\/status\/705219971425574912?ref_src=twsrc%5Etfw\"\u003EMarch 3, 2016\u003C\/a\u003E\u003C\/blockquote\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
-
 	/**
 	 * Set up each test.
 	 */
@@ -62,12 +48,21 @@ public function mock_http_request( $preempt, $r, $url ) {
 		}
 
 		if ( false !== strpos( $url, '987437752164737025' ) ) {
-			$body = $this->oembed_response_1;
-		} else {
-			$body = $this->oembed_response_2;
+			$body = '{"url":"https:\/\/twitter.com\/WordPress\/status\/987437752164737025","author_name":"WordPress","author_url":"https:\/\/twitter.com\/WordPress","html":"\u003Cblockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"\u003E\u003Cp lang=\"en\" dir=\"ltr\"\u003ECelebrate the WordPress 15th Anniversary on May 27 \u003Ca href=\"https:\/\/t.co\/jv62WkI9lr\"\u003Ehttps:\/\/t.co\/jv62WkI9lr\u003C\/a\u003E \u003Ca href=\"https:\/\/t.co\/4ZECodSK78\"\u003Epic.twitter.com\/4ZECodSK78\u003C\/a\u003E\u003C\/p\u003E&mdash; WordPress (@WordPress) \u003Ca href=\"https:\/\/twitter.com\/WordPress\/status\/987437752164737025?ref_src=twsrc%5Etfw\"\u003EApril 20, 2018\u003C\/a\u003E\u003C\/blockquote\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+		} elseif ( false !== strpos( $url, '705219971425574912' ) ) {
+			$body = '{"url":"https:\/\/twitter.com\/sengineland\/status\/705219971425574912","author_name":"Search Engine Land","author_url":"https:\/\/twitter.com\/sengineland","html":"\u003Cblockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"\u003E\u003Cp lang=\"en\" dir=\"ltr\"\u003EOn our way to the \u003Ca href=\"https:\/\/twitter.com\/hashtag\/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw\"\u003E#GoogleDance\u003C\/a\u003E! \u003Ca href=\"https:\/\/twitter.com\/hashtag\/SMX?src=hash&amp;ref_src=twsrc%5Etfw\"\u003E#SMX\u003C\/a\u003E \uD83D\uDC83\uD83C\uDFFB \u003Ca href=\"https:\/\/t.co\/N8kZ9M3eN4\"\u003Epic.twitter.com\/N8kZ9M3eN4\u003C\/a\u003E\u003C\/p\u003E&mdash; Search Engine Land (@sengineland) \u003Ca href=\"https:\/\/twitter.com\/sengineland\/status\/705219971425574912?ref_src=twsrc%5Etfw\"\u003EMarch 3, 2016\u003C\/a\u003E\u003C\/blockquote\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+		} elseif ( false !== strpos( $url, 'moments%2F625792726546558977' ) ) {
+			$body = '{"url":"https:\/\/twitter.com\/i\/moments\/625792726546558977","title":"Michelle Obama Opens Special Olympics","html":"\u003Ca class=\"twitter-moment\" href=\"https:\/\/twitter.com\/i\/moments\/625792726546558977?ref_src=twsrc%5Etfw\"\u003EMichelle Obama Opens Special Olympics\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":550,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+		} elseif ( false !== strpos( $url, 'lists%2Fweb-gdes' ) ) {
+			$body = '{"url":"https:\/\/twitter.com\/robertnyman\/lists\/web-gdes","title":"Web GDEs","html":"\u003Ca class=\"twitter-timeline\" href=\"https:\/\/twitter.com\/robertnyman\/lists\/web-gdes?ref_src=twsrc%5Etfw\"\u003EA Twitter List by robertnyman\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":null,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+		} elseif ( false !== strpos( $url, 'wordpress%2Flikes' ) ) {
+			$body = '{"url":"https:\/\/twitter.com\/WordPress\/likes","title":"","html":"\u003Ca class=\"twitter-timeline\" href=\"https:\/\/twitter.com\/WordPress\/likes?ref_src=twsrc%5Etfw\"\u003ETweets Liked by @WordPress\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":null,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+		} elseif ( false !== strpos( $url, 'twitter.com%2Fwordpress' ) ) {
+			$body = '{"url":"https:\/\/twitter.com\/WordPress","title":"","html":"\u003Ca class=\"twitter-timeline\" href=\"https:\/\/twitter.com\/WordPress?ref_src=twsrc%5Etfw\"\u003ETweets by WordPress\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":null,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+		}
+		else {
+			$body = '';
 		}
-
-		unset( $r );
 
 		return [
 			'body'          => $body,
@@ -92,29 +87,60 @@ public function get_conversion_data() {
 				'<p>Hello world.</p>',
 				'<p>Hello world.</p>' . PHP_EOL,
 			],
+
+			'embed_blockquote_without_twitter'        => [
+				'<blockquote>lorem ipsum</blockquote>',
+				'<blockquote><p>lorem ipsum</p></blockquote>' . PHP_EOL,
+			],
+
 			'url_simple'                => [
-				'https://twitter.com/wordpress/status/987437752164737025' . PHP_EOL,
-				"<amp-twitter width=\"600\" height=\"480\" layout=\"responsive\" data-tweetid=\"987437752164737025\" class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"><blockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\" placeholder=\"\">\n<p lang=\"en\" dir=\"ltr\">Celebrate the WordPress 15th Anniversary on May 27 <a href=\"https://t.co/jv62WkI9lr\">https://t.co/jv62WkI9lr</a> <a href=\"https://t.co/4ZECodSK78\">pic.twitter.com/4ZECodSK78</a></p>\n<p>— WordPress (@WordPress) <a href=\"https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw\">April 20, 2018</a></p></blockquote></amp-twitter>\n\n",
+				'https://twitter.com/wordpress/status/987437752164737025',
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-width="500" data-dnt="true"><blockquote class="twitter-tweet" data-width="500" data-dnt="true" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
+
 			'url_with_big_tweet_id'     => [
 				'https://twitter.com/wordpress/status/705219971425574912' . PHP_EOL,
-				"<amp-twitter width=\"600\" height=\"480\" layout=\"responsive\" data-tweetid=\"705219971425574912\" class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"><blockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\" placeholder=\"\">\n<p lang=\"en\" dir=\"ltr\">On our way to the <a href=\"https://twitter.com/hashtag/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw\">#GoogleDance</a>! <a href=\"https://twitter.com/hashtag/SMX?src=hash&amp;ref_src=twsrc%5Etfw\">#SMX</a> 💃🏻 <a href=\"https://t.co/N8kZ9M3eN4\">pic.twitter.com/N8kZ9M3eN4</a></p>\n<p>— Search Engine Land (@sengineland) <a href=\"https://twitter.com/sengineland/status/705219971425574912?ref_src=twsrc%5Etfw\">March 3, 2016</a></p></blockquote></amp-twitter>\n\n",
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="705219971425574912" data-width="500" data-dnt="true"><blockquote class="twitter-tweet" data-width="500" data-dnt="true" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">On our way to the <a href="https://twitter.com/hashtag/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw">#GoogleDance</a>! <a href="https://twitter.com/hashtag/SMX?src=hash&amp;ref_src=twsrc%5Etfw">#SMX</a> 💃🏻 <a href="https://t.co/N8kZ9M3eN4">pic.twitter.com/N8kZ9M3eN4</a></p>' . PHP_EOL . '<p>— Search Engine Land (@sengineland) <a href="https://twitter.com/sengineland/status/705219971425574912?ref_src=twsrc%5Etfw">March 3, 2016</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
+
 			'timeline_url_with_profile' => [
 				'https://twitter.com/wordpress' . PHP_EOL,
-				"<p><amp-twitter data-timeline-source-type=\"profile\" data-timeline-screen-name=\"wordpress\" layout=\"responsive\" width=\"600\" height=\"480\"></amp-twitter></p>\n",
+				'<amp-twitter width="600" height="480" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/WordPress?ref_src=twsrc%5Etfw"><a class="twitter-timeline" href="https://twitter.com/WordPress?ref_src=twsrc%5Etfw" placeholder="">Tweets by WordPress</a></amp-twitter>' . PHP_EOL,
 			],
+
 			'timeline_url_with_likes'   => [
 				'https://twitter.com/wordpress/likes' . PHP_EOL,
-				"<p><amp-twitter data-timeline-source-type=\"likes\" data-timeline-screen-name=\"wordpress\" layout=\"responsive\" width=\"600\" height=\"480\"></amp-twitter></p>\n",
-			],
-			'timeline_url_with_list'    => [
-				'https://twitter.com/wordpress/lists/random_list' . PHP_EOL,
-				"<p><amp-twitter data-timeline-source-type=\"list\" data-timeline-slug=\"random_list\" data-timeline-owner-screen-name=\"wordpress\" layout=\"responsive\" width=\"600\" height=\"480\"></amp-twitter></p>\n",
+				'<amp-twitter width="600" height="480" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/WordPress/likes?ref_src=twsrc%5Etfw"><a class="twitter-timeline" href="https://twitter.com/WordPress/likes?ref_src=twsrc%5Etfw" placeholder="">Tweets Liked by @WordPress</a></amp-twitter>' . PHP_EOL,
 			],
-			'timeline_url_with_list2'   => [
+
+			'timeline_url_with_list'   => [
 				'https://twitter.com/robertnyman/lists/web-gdes' . PHP_EOL,
-				"<p><amp-twitter data-timeline-source-type=\"list\" data-timeline-slug=\"web-gdes\" data-timeline-owner-screen-name=\"robertnyman\" layout=\"responsive\" width=\"600\" height=\"480\"></amp-twitter></p>\n",
+				'<amp-twitter width="600" height="480" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/robertnyman/lists/web-gdes?ref_src=twsrc%5Etfw"><a class="twitter-timeline" href="https://twitter.com/robertnyman/lists/web-gdes?ref_src=twsrc%5Etfw" placeholder="">A Twitter List by robertnyman</a></amp-twitter>' . PHP_EOL,
+			],
+
+			'moment_url'   => [
+				'https://twitter.com/i/moments/625792726546558977' . PHP_EOL,
+				'<amp-twitter width="600" height="480" layout="responsive" data-momentid="625792726546558977"><a class="twitter-moment" href="https://twitter.com/i/moments/625792726546558977?ref_src=twsrc%5Etfw" placeholder="">Michelle Obama Opens Special Olympics</a></amp-twitter>' . PHP_EOL,
+			],
+
+			'blockquote_embed'                        => [
+				wpautop( '<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-lang="en"><blockquote class="twitter-tweet" data-lang="en" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+			],
+
+			'blockquote_embed_with_data_conversation' => [
+				wpautop( '<blockquote class="twitter-tweet" data-conversation="none"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>&mdash; WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-conversation="none"><blockquote class="twitter-tweet" data-conversation="none" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+			],
+
+			'blockquote_embed_with_data_theme'        => [
+				wpautop( '<blockquote class="twitter-tweet" data-theme="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>&mdash; WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-theme="en"><blockquote class="twitter-tweet" data-theme="en" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+			],
+
+			'blockquote_embed_not_autop'              => [
+				'<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-lang="en"><blockquote class="twitter-tweet" data-lang="en" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
 		];
 	}
@@ -178,61 +204,4 @@ public function test__get_scripts( $source, $expected ) {
 
 		$this->assertEquals( $expected, $scripts );
 	}
-
-	/**
-	 * Data for test__raw_embed_sanitizer.
-	 *
-	 * @return array Data.
-	 */
-	public function get_raw_embed_dataset() {
-		return [
-			'no_embed'                                => [
-				'<p>Hello world.</p>',
-				'<p>Hello world.</p>',
-			],
-			'embed_blockquote_without_twitter'        => [
-				'<blockquote>lorem ipsum</blockquote>',
-				'<blockquote>lorem ipsum</blockquote>',
-			],
-
-			'blockquote_embed'                        => [
-				wpautop( '<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" class="twitter-tweet" data-lang="en"><blockquote class="twitter-tweet" data-lang="en" placeholder="">' . "\n" . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . "\n" . '<p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . "\n\n",
-			],
-
-			'blockquote_embed_with_data_conversation' => [
-				wpautop( '<blockquote class="twitter-tweet" data-conversation="none"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>&mdash; WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" class="twitter-tweet" data-conversation="none"><blockquote class="twitter-tweet" data-conversation="none" placeholder="">' . "\n" . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . "\n" . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . "\n\n",
-			],
-
-			'blockquote_embed_with_data_theme'        => [
-				wpautop( '<blockquote class="twitter-tweet" data-theme="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>&mdash; WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" class="twitter-tweet" data-theme="en"><blockquote class="twitter-tweet" data-theme="en" placeholder="">' . "\n" . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . "\n" . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . "\n\n",
-			],
-
-			'blockquote_embed_not_autop'              => [
-				'<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" class="twitter-tweet" data-lang="en"><blockquote class="twitter-tweet" data-lang="en" placeholder=""><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote></amp-twitter> ',
-			],
-		];
-	}
-
-	/**
-	 * Test raw_embed_sanitizer.
-	 *
-	 * @param string $source  Content.
-	 * @param string $expected Expected content.
-	 * @dataProvider get_raw_embed_dataset
-	 * @covers AMP_Twitter_Embed_Handler::sanitize_raw_embeds()
-	 */
-	public function test__raw_embed_sanitizer( $source, $expected ) {
-		$dom   = AMP_DOM_Utils::get_dom_from_content( $source );
-		$embed = new AMP_Twitter_Embed_Handler();
-
-		$embed->sanitize_raw_embeds( $dom );
-
-		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
-
-		$this->assertEquals( $expected, $content );
-	}
 }
diff --git a/tests/php/test-class-amp-tiktok-embed-handler.php b/tests/php/test-class-amp-tiktok-embed-handler.php
index 0ab5d8196c8..7509c458cc1 100644
--- a/tests/php/test-class-amp-tiktok-embed-handler.php
+++ b/tests/php/test-class-amp-tiktok-embed-handler.php
@@ -88,7 +88,7 @@ public function get_conversion_data() {
 	 */
 	public function test_conversion( $source, $expected ) {
 		if ( version_compare( '5.4-alpha', get_bloginfo( 'version' ), '>' ) ) {
-			$this->markTestSkipped( 'The TikTok embed is only available in 5.4-alpha (until 5.4 is stable)' );
+			$this->markTestSkipped( 'The TikTok embed is only available in 5.4-alpha and above.' );
 		}
 
 		$embed = new AMP_TikTok_Embed_Handler();

From 9c178782b672656fc94b1acc39cb9f44547ff368 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 8 May 2020 00:33:11 -0400
Subject: [PATCH 07/45] Unwrap Vimeo embeds

---
 .../embeds/class-amp-vimeo-embed-handler.php  | 121 ++++++------------
 tests/php/test-amp-vimeo-embed-handler.php    |  79 ++----------
 2 files changed, 54 insertions(+), 146 deletions(-)

diff --git a/includes/embeds/class-amp-vimeo-embed-handler.php b/includes/embeds/class-amp-vimeo-embed-handler.php
index 1e20cc438cd..aa6fce64e9b 100644
--- a/includes/embeds/class-amp-vimeo-embed-handler.php
+++ b/includes/embeds/class-amp-vimeo-embed-handler.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Vimeo_Embed_Handler
  *
@@ -12,13 +14,6 @@
  */
 class AMP_Vimeo_Embed_Handler extends AMP_Base_Embed_Handler {
 
-	/**
-	 * The embed URL pattern.
-	 *
-	 * @var string
-	 */
-	const URL_PATTERN = '#https?:\/\/(.+\.)?vimeo\.com\/.*#i';
-
 	/**
 	 * The aspect ratio.
 	 *
@@ -59,75 +54,69 @@ public function __construct( $args = [] ) {
 	 * Register embed.
 	 */
 	public function register_embed() {
-		wp_embed_register_handler( 'amp-vimeo', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
-		add_filter( 'wp_video_shortcode_override', [ $this, 'video_override' ], 10, 2 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-vimeo', -1 );
+		// Not implemented.
 	}
 
 	/**
-	 * Render oEmbed.
-	 *
-	 * @see \WP_Embed::shortcode()
+	 * Sanitize all gfycat <iframe> tags to <amp-gfycat>.
 	 *
-	 * @param array  $matches URL pattern matches.
-	 * @param array  $attr    Shortcode attribues.
-	 * @param string $url     URL.
-	 * @param string $rawattr Unmodified shortcode attributes.
-	 * @return string Rendered oEmbed.
+	 * @param Document $dom DOM.
 	 */
-	public function oembed( $matches, $attr, $url, $rawattr ) {
-		$video_id = $this->get_video_id_from_url( $url );
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://player.vimeo.com/video/" ) ]' );
+
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
+			}
+			$this->sanitize_raw_embed( $node );
+		}
+	}
 
-		return $this->render(
-			[
-				'url'      => $url,
-				'video_id' => $video_id,
-			]
-		);
+	/**
+	 * Determine if the node has already been sanitized.
+	 *
+	 * @param DOMElement $node The DOMNode.
+	 * @return bool Whether the node is a raw embed.
+	 */
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && 'amp-vimeo' !== $node->parentNode->nodeName;
 	}
 
 	/**
-	 * Render.
+	 * Make DailyMotion embed AMP compatible.
 	 *
-	 * @param array $args Args.
-	 * @return string Rendered.
+	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
-	public function render( $args ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'video_id' => false,
-			]
-		);
+	private function sanitize_raw_embed( DOMElement $iframe_node ) {
+		$iframe_src = $iframe_node->getAttribute('src');
+		$video_id   = $this->get_video_id_from_url( $iframe_src );
 
-		if ( empty( $args['video_id'] ) ) {
-			return AMP_HTML_Utils::build_tag(
-				'a',
-				[
-					'href'  => esc_url_raw( $args['url'] ),
-					'class' => 'amp-wp-embed-fallback',
-				],
-				esc_html( $args['url'] )
-			);
+		if ( ! $video_id ) {
+			return;
 		}
 
-		$this->did_convert_elements = true;
-
-		return AMP_HTML_Utils::build_tag(
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $iframe_node ),
 			'amp-vimeo',
 			[
-				'data-videoid' => $args['video_id'],
+				'data-videoid' => $video_id,
 				'layout'       => 'responsive',
 				'width'        => $this->args['width'],
 				'height'       => $this->args['height'],
 			]
 		);
+
+		$this->maybe_unwrap_p_element( $iframe_node );
+
+		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
 	}
 
 	/**
@@ -137,42 +126,12 @@ public function render( $args ) {
 	 * @return int Video ID.
 	 */
 	private function get_video_id_from_url( $url ) {
-		$path = wp_parse_url( $url, PHP_URL_PATH );
-
 		// @todo This will not get the private key for unlisted videos (which look like https://vimeo.com/123456789/abcdef0123), but amp-vimeo doesn't support them currently anyway.
-		$video_id = '';
-		if ( $path && preg_match( ':/(\d+):', $path, $matches ) ) {
+		$video_id = null;
+		if ( preg_match( ':/video/(\d+):', $url, $matches ) ) {
 			$video_id = $matches[1];
 		}
 
 		return $video_id;
 	}
-
-	/**
-	 * Override the output of Vimeo videos.
-	 *
-	 * This overrides the value in wp_video_shortcode().
-	 * The pattern matching is copied from WP_Widget_Media_Video::render().
-	 *
-	 * @param string $html Empty variable to be replaced with shortcode markup.
-	 * @param array  $attr The shortcode attributes.
-	 * @return string|null $markup The markup to output.
-	 */
-	public function video_override( $html, $attr ) {
-		if ( ! isset( $attr['src'] ) ) {
-			return $html;
-		}
-		$src           = $attr['src'];
-		$vimeo_pattern = '#^https?://(.+\.)?vimeo\.com/.*#';
-		if ( 1 !== preg_match( $vimeo_pattern, $src ) ) {
-			return $html;
-		}
-
-		$video_id = $this->get_video_id_from_url( $src );
-		if ( empty( $video_id ) ) {
-			return '';
-		}
-
-		return $this->render( compact( 'video_id' ) );
-	}
 }
diff --git a/tests/php/test-amp-vimeo-embed-handler.php b/tests/php/test-amp-vimeo-embed-handler.php
index 4b985c9d89d..55d7b0dd59a 100644
--- a/tests/php/test-amp-vimeo-embed-handler.php
+++ b/tests/php/test-amp-vimeo-embed-handler.php
@@ -26,17 +26,17 @@ public function get_conversion_data() {
 
 			'url_simple'   => [
 				'https://vimeo.com/172355597' . PHP_EOL,
-				'<p><amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo></p>' . PHP_EOL,
+				'<amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo>' . PHP_EOL,
 			],
 
 			'url_unlisted' => [
 				'https://vimeo.com/172355597/abcdef0123' . PHP_EOL,
-				'<p><amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo></p>' . PHP_EOL,
+				'<amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo>' . PHP_EOL,
 			],
 
 			'url_player'   => [
 				'https://player.vimeo.com/video/172355597' . PHP_EOL,
-				'<p><amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo></p>' . PHP_EOL,
+				'<amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo>' . PHP_EOL,
 			],
 		];
 	}
@@ -52,9 +52,14 @@ public function get_conversion_data() {
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Vimeo_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -87,9 +92,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Vimeo_Embed_Handler();
 		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 
 		$scripts = array_merge(
@@ -99,63 +107,4 @@ public function test__get_scripts( $source, $expected ) {
 
 		$this->assertEquals( $expected, $scripts );
 	}
-
-	/**
-	 * Gets the test data for test_video_override().
-	 *
-	 * @return array The test data.
-	 */
-	public function get_video_override_data() {
-		return [
-			'no_src_empty_html'    => [
-				'',
-				[ 'foo' => 'baz' ],
-				null,
-			],
-			'no_src_with_html'     => [
-				'Initial HTML here',
-				[ 'foo' => 'baz' ],
-				null,
-			],
-			'non_vimeo_src'        => [
-				'Initial HTML here',
-				[ 'src' => 'https://youtube.com/1234567' ],
-				null,
-			],
-			'non_numeric_video_id' => [
-				'Initial HTML here',
-				[ 'src' => 'https://vimeo.com/abcdefg' ],
-				'',
-			],
-			'valid_video_id'       => [
-				'Initial HTML here',
-				[ 'src' => 'https://vimeo.com/1234567' ],
-				'<amp-vimeo data-videoid="1234567" layout="responsive" width="600" height="338"></amp-vimeo>',
-			],
-			'http_url'             => [
-				'Initial HTML here',
-				[ 'src' => 'https://vimeo.com/1234567' ],
-				'<amp-vimeo data-videoid="1234567" layout="responsive" width="600" height="338"></amp-vimeo>',
-			],
-		];
-	}
-
-	/**
-	 * Test video_override().
-	 *
-	 * @dataProvider get_video_override_data
-	 * @covers AMP_Vimeo_Embed_Handler::video_override()
-	 *
-	 * @param string $html     The initial HTML.
-	 * @param array  $attr     The attributes of the shortcode.
-	 * @param string $expected The expected return value.
-	 */
-	public function test_video_override( $html, $attr, $expected ) {
-		if ( null === $expected ) {
-			$expected = $html;
-		}
-
-		$embed = new AMP_Vimeo_Embed_Handler();
-		$this->assertEquals( $expected, $embed->video_override( $html, $attr ) );
-	}
 }

From 91cdd3d56a3580da5215816379b3b293888bcdec Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 8 May 2020 06:08:32 -0400
Subject: [PATCH 08/45] Sanitize YouTube embeds

---
 .../embeds/class-amp-vimeo-embed-handler.php  |   4 +-
 .../class-amp-youtube-embed-handler.php       | 190 ++++++++----------
 .../test-class-amp-youtube-embed-handler.php  |  76 ++-----
 3 files changed, 107 insertions(+), 163 deletions(-)

diff --git a/includes/embeds/class-amp-vimeo-embed-handler.php b/includes/embeds/class-amp-vimeo-embed-handler.php
index aa6fce64e9b..0bbb959f984 100644
--- a/includes/embeds/class-amp-vimeo-embed-handler.php
+++ b/includes/embeds/class-amp-vimeo-embed-handler.php
@@ -65,7 +65,7 @@ public function unregister_embed() {
 	}
 
 	/**
-	 * Sanitize all gfycat <iframe> tags to <amp-gfycat>.
+	 * Sanitize all Vimeo <iframe> tags to <amp-vimeo>.
 	 *
 	 * @param Document $dom DOM.
 	 */
@@ -91,7 +91,7 @@ protected function is_raw_embed( DOMElement $node ) {
 	}
 
 	/**
-	 * Make DailyMotion embed AMP compatible.
+	 * Make Vimeo embed AMP compatible.
 	 *
 	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
diff --git a/includes/embeds/class-amp-youtube-embed-handler.php b/includes/embeds/class-amp-youtube-embed-handler.php
index 13db0156b19..d17332ea3af 100644
--- a/includes/embeds/class-amp-youtube-embed-handler.php
+++ b/includes/embeds/class-amp-youtube-embed-handler.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_YouTube_Embed_Handler
  *
@@ -12,16 +14,6 @@
  */
 class AMP_YouTube_Embed_Handler extends AMP_Base_Embed_Handler {
 
-	/**
-	 * URL pattern to match YouTube videos.
-	 *
-	 * Only handling single videos. Playlists are handled elsewhere.
-	 *
-	 * @deprecated No longer used.
-	 * @var string
-	 */
-	const URL_PATTERN = '#https?://(?:www\.)?(?:youtube.com/(?:v/|e/|embed/|watch[/\#?])|youtu\.be/).*#i';
-
 	/**
 	 * Ratio for calculating the default height from the content width.
 	 *
@@ -63,116 +55,124 @@ public function __construct( $args = [] ) {
 	 * Register embed.
 	 */
 	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
-		add_filter( 'wp_video_shortcode_override', [ $this, 'video_override' ], 10, 2 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+		// Not implemented.
 	}
 
 	/**
-	 * Filter oEmbed HTML for YouTube to convert to AMP.
+	 * Sanitize all YouTube <iframe> tags to <amp-youtube>.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @return string Embed.
+	 * @param Document $dom DOM.
 	 */
-	public function filter_embed_oembed_html( $cache, $url ) {
-		$id = $this->get_video_id_from_url( $url );
-		if ( ! $id ) {
-			return $cache;
-		}
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//iframe[ @src ]' );
+
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
+			}
+
+			$iframe_src = $node->getAttribute( 'src' );
+			$video_id = $this->get_video_id_from_url( $iframe_src );
+
+			if ( $video_id ) {
+				$this->sanitize_raw_embed( $node, $video_id );
+			}
 
-		$props = $this->parse_props( $cache, $url, $id );
-		if ( empty( $props ) ) {
-			return $cache;
 		}
+	}
 
-		$props['video_id'] = $id;
-		return $this->render( $props, $url );
+	/**
+	 * Determine if the node has already been sanitized.
+	 *
+	 * @param DOMElement $node The DOMNode.
+	 * @return bool Whether the node is a raw embed.
+	 */
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && 'amp-youtube' !== $node->parentNode->nodeName;
 	}
 
 	/**
-	 * Parse AMP component from iframe.
+	 * Make DailyMotion embed AMP compatible.
 	 *
-	 * @param string $html     HTML.
-	 * @param string $url      Embed URL, for fallback purposes.
-	 * @param string $video_id YouTube video ID.
-	 * @return array|null Props for rendering the component, or null if unable to parse.
+	 * @param string     $video_id Video ID.
+	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
-	private function parse_props( $html, $url, $video_id ) {
-		$props = $this->match_element_attributes( $html, 'iframe', [ 'title', 'height', 'width' ] );
-		if ( ! isset( $props ) ) {
-			return null;
+	private function sanitize_raw_embed( DOMElement $iframe_node, $video_id ) {
+		$attributes = [
+			'data-videoid' => $video_id,
+			'layout'       => 'responsive',
+			'width'        => $this->args['width'],
+			'height'       => $this->args['height'],
+			'title'        => null,
+		];
+
+		if ( ! empty( $iframe_node->getAttribute( 'title' ) ) ) {
+			$attributes['title'] = $iframe_node->getAttribute( 'title' );
 		}
 
-		$img_attributes = [
-			'src'        => esc_url_raw( sprintf( 'https://i.ytimg.com/vi/%s/hqdefault.jpg', $video_id ) ),
-			'layout'     => 'fill',
-			'object-fit' => 'cover',
-		];
-		if ( ! empty( $props['title'] ) ) {
-			$img_attributes['alt'] = $props['title'];
+		if ( ! empty( $iframe_node->getAttribute( 'width' ) ) ) {
+			$attributes['width'] = $iframe_node->getAttribute( 'width' );
 		}
-		$img = AMP_HTML_Utils::build_tag( 'img', $img_attributes );
 
-		$props['placeholder'] = AMP_HTML_Utils::build_tag(
-			'a',
-			[
-				'placeholder' => '',
-				'href'        => esc_url_raw( $url ),
-			],
-			$img
+		if ( ! empty( $iframe_node->getAttribute( 'height' ) ) ) {
+			$attributes['height'] = $iframe_node->getAttribute( 'height' );
+		}
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $iframe_node ),
+			'amp-youtube',
+			$attributes
 		);
 
-		return $props;
+		$this->append_placeholder( $amp_node, $video_id, $attributes['title'] );
+
+		$this->maybe_unwrap_p_element( $iframe_node );
+
+		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
 	}
 
 	/**
-	 * Render embed.
+	 * Append placeholder as a child of the AMP component.
 	 *
-	 * @param array  $args Args.
-	 * @param string $url  URL.
-	 * @return string Rendered.
+	 * @param DOMElement $node AMP component.
+	 * @param string     $video_id Video ID.
+	 * @param string     $video_title Video title.
 	 */
-	public function render( $args, $url ) {
-		$args = wp_parse_args(
-			$args,
+	private function append_placeholder( DOMElement $node, $video_id, $video_title ) {
+		$img_attributes = [
+			'src'        => esc_url_raw( sprintf( 'https://i.ytimg.com/vi/%s/hqdefault.jpg', $video_id ) ),
+			'layout'     => 'fill',
+			'object-fit' => 'cover',
+		];
+		if ( $video_title ) {
+			$img_attributes['alt'] = $video_title;
+		}
+
+		$img_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node->ownerDocument ),
+			'img',
+			$img_attributes
+		);
+
+		$placeholder_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			'a',
 			[
-				'video_id'    => false,
-				'layout'      => 'responsive',
-				'width'       => $this->args['width'],
-				'height'      => $this->args['height'],
 				'placeholder' => '',
+				'href'        => esc_url_raw( sprintf( 'https://www.youtube.com/watch?v=%s', $video_id ) ),
 			]
 		);
 
-		if ( empty( $args['video_id'] ) ) {
-			return AMP_HTML_Utils::build_tag(
-				'a',
-				[
-					'href'  => esc_url_raw( $url ),
-					'class' => 'amp-wp-embed-fallback',
-				],
-				esc_html( $url )
-			);
-		}
+		$placeholder_node->appendChild( $img_node );
 
-		$this->did_convert_elements = true;
-
-		$attributes = array_merge(
-			[ 'data-videoid' => $args['video_id'] ],
-			wp_array_slice_assoc( $args, [ 'layout', 'width', 'height' ] )
-		);
-		if ( ! empty( $args['title'] ) ) {
-			$attributes['title'] = $args['title'];
-		}
-
-		return AMP_HTML_Utils::build_tag( 'amp-youtube', $attributes, $args['placeholder'] );
+		$node->appendChild( $placeholder_node );
 	}
 
 	/**
@@ -232,26 +232,4 @@ private function get_video_id_from_url( $url ) {
 
 		return false;
 	}
-
-	/**
-	 * Override the output of YouTube videos.
-	 *
-	 * This overrides the value in wp_video_shortcode().
-	 * The pattern matching is copied from WP_Widget_Media_Video::render().
-	 *
-	 * @param string $html Empty variable to be replaced with shortcode markup.
-	 * @param array  $attr The shortcode attributes.
-	 * @return string|null $markup The markup to output.
-	 */
-	public function video_override( $html, $attr ) {
-		if ( ! isset( $attr['src'] ) ) {
-			return $html;
-		}
-		$video_id = $this->get_video_id_from_url( $attr['src'] );
-		if ( ! $video_id ) {
-			return $html;
-		}
-
-		return $this->render( compact( 'video_id' ), $attr['src'] );
-	}
 }
diff --git a/tests/php/test-class-amp-youtube-embed-handler.php b/tests/php/test-class-amp-youtube-embed-handler.php
index 130577f90b7..16564470e60 100644
--- a/tests/php/test-class-amp-youtube-embed-handler.php
+++ b/tests/php/test-class-amp-youtube-embed-handler.php
@@ -82,8 +82,6 @@ public function mock_http_request( $preempt, $r, $url ) {
 			return $preempt;
 		}
 
-		unset( $r );
-
 		return [
 			'body'          => $this->youtube_oembed_response,
 			'headers'       => [],
@@ -96,47 +94,7 @@ public function mock_http_request( $preempt, $r, $url ) {
 		];
 	}
 
-	/**
-	 * Test video_override().
-	 *
-	 * @covers AMP_YouTube_Embed_Handler::video_override()
-	 */
-	public function test_video_override() {
-		remove_all_filters( 'wp_video_shortcode_override' );
-		$this->handler->register_embed();
-		$youtube_id   = 'XOY3ZUO6P0k';
-		$youtube_src  = 'https://youtu.be/' . $youtube_id;
-		$attr_youtube = [
-			'src' => $youtube_src,
-		];
-
-		$youtube_shortcode = $this->handler->video_override( '', $attr_youtube );
-		$this->assertStringContains( '<amp-youtube', $youtube_shortcode );
-		$this->assertStringContains( $youtube_id, $youtube_shortcode );
-
-		$vimeo_id        = '64086087';
-		$vimeo_src       = 'https://vimeo.com/' . $vimeo_id;
-		$attr_vimeo      = [
-			'src' => $vimeo_src,
-		];
-		$vimeo_shortcode = $this->handler->video_override( '', $attr_vimeo );
-		$this->assertEquals( '', $vimeo_shortcode );
-
-		$daily_motion_id        = 'x6bacgf';
-		$daily_motion_src       = 'http://www.dailymotion.com/video/' . $daily_motion_id;
-		$attr_daily_motion      = [
-			'src' => $daily_motion_src,
-		];
-		$daily_motion_shortcode = $this->handler->video_override( '', $attr_daily_motion );
-		$this->assertEquals( '', $daily_motion_shortcode );
-		$no_attributes = $this->handler->video_override( '', [] );
-		$this->assertEquals( '', $no_attributes );
-		remove_all_filters( 'wp_video_shortcode_override' );
-	}
-
 	public function get_conversion_data() {
-		$loading_attribute = version_compare( get_bloginfo( 'version' ), '5.5-alpha', '>' ) ? 'loading="lazy" ' : '';
-
 		return [
 			'no_embed'                         => [
 				'<p>Hello world.</p>',
@@ -145,32 +103,32 @@ public function get_conversion_data() {
 
 			'url_simple'                       => [
 				'https://www.youtube.com/watch?v=kfVsfOSbJY0' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></img></a></amp-youtube></p>' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></img></a></amp-youtube></p>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></a></amp-youtube>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></a></amp-youtube>' . PHP_EOL,
 			],
 
 			'url_short'                        => [
 				'https://youtu.be/kfVsfOSbJY0' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder href="https://youtu.be/kfVsfOSbJY0"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></img></a></amp-youtube></p>' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder href="https://youtu.be/kfVsfOSbJY0"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></img></a></amp-youtube></p>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></a></amp-youtube>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></a></amp-youtube>' . PHP_EOL,
 			],
 
 			'url_with_querystring'             => [
 				'http://www.youtube.com/watch?v=kfVsfOSbJY0&hl=en&fs=1&w=425&h=349' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder href="http://www.youtube.com/watch?v=kfVsfOSbJY0&amp;hl=en&amp;fs=1&amp;w=425&amp;h=349"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></img></a></amp-youtube></p>' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder href="http://www.youtube.com/watch?v=kfVsfOSbJY0&amp;hl=en&amp;fs=1&amp;w=425&amp;h=349"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></img></a></amp-youtube></p>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></a></amp-youtube>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></a></amp-youtube>' . PHP_EOL,
 			],
 
 			// Several reports of invalid URLs that have multiple `?` in the URL.
 			'url_with_querystring_and_extra_?' => [
 				'http://www.youtube.com/watch?v=kfVsfOSbJY0?hl=en&fs=1&w=425&h=349' . PHP_EOL,
-				'<p>http://www.youtube.com/watch?v=kfVsfOSbJY0?hl=en&#038;fs=1&#038;w=425&#038;h=349</p>' . PHP_EOL,
+				'<p>http://www.youtube.com/watch?v=kfVsfOSbJY0?hl=en&amp;fs=1&amp;w=425&amp;h=349</p>' . PHP_EOL,
 			],
 
 			'embed_url'                        => [
 				'https://www.youtube.com/embed/kfVsfOSbJY0' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder href="https://youtube.com/watch?v=kfVsfOSbJY0"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></img></a></amp-youtube></p>' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder href="https://youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></img></a></amp-youtube></p>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></a></amp-youtube>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></a></amp-youtube>' . PHP_EOL,
 			],
 		];
 	}
@@ -180,15 +138,20 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected, $fallback_for_expected = null ) {
 		$this->handler->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$this->handler->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
 		if (
 			version_compare( strtok( get_bloginfo( 'version' ), '-' ), '5.2', '<' )
 			&& null !== $fallback_for_expected
 		) {
-			$this->assertEquals( $fallback_for_expected, $filtered_content );
+			$this->assertEquals( $fallback_for_expected, $content );
 		} else {
-			$this->assertEquals( $expected, $filtered_content );
+			$this->assertEquals( $expected, $content );
 		}
 	}
 
@@ -313,9 +276,12 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$this->handler->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$this->handler->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 
 		$scripts = array_merge(

From ce5ef79a56f366f706e12f54e19fcbbec269012a Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 8 May 2020 06:33:51 -0400
Subject: [PATCH 09/45] Sanitize WordPress TV embeds

---
 .../class-amp-wordpress-tv-embed-handler.php  |  48 ++++++++-
 ...t-class-amp-wordpress-tv-embed-handler.php | 100 +++++-------------
 2 files changed, 70 insertions(+), 78 deletions(-)

diff --git a/includes/embeds/class-amp-wordpress-tv-embed-handler.php b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
index 512d38c7ef6..318cc7fe210 100644
--- a/includes/embeds/class-amp-wordpress-tv-embed-handler.php
+++ b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
@@ -6,6 +6,8 @@
  * @since 1.4
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_WordPress_TV_Embed_Handler
  *
@@ -24,14 +26,56 @@ class AMP_WordPress_TV_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Register embed.
 	 */
 	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_oembed_html' ], 10, 2 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_oembed_html' ], 10 );
+		// Not implemented.
+	}
+
+	/**
+	 * Sanitize all WordPress TV <iframe> tags to <amp-iframe>.
+	 *
+	 * @param Document $dom DOM.
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://video.wordpress.com/embed/" ) ]' );
+
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
+			}
+			$this->sanitize_raw_embed( $node );
+		}
+	}
+
+	/**
+	 * Determine if the node has already been sanitized.
+	 *
+	 * @param DOMElement $node The DOMNode.
+	 * @return bool Whether the node is a raw embed.
+	 */
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && 'amp-iframe' !== $node->parentNode->nodeName;
+	}
+
+	/**
+	 * Make WordPress TV embed AMP compatible.
+	 *
+	 * @param DOMElement $iframe_node The node to make AMP compatible.
+	 */
+	private function sanitize_raw_embed( DOMElement $iframe_node ) {
+		$next_sibling = $iframe_node->nextSibling;
+
+		if ( $next_sibling && 'script' === $next_sibling->nodeName ) {
+			$iframe_node->parentNode->removeChild( $next_sibling );
+		}
+
+		$iframe_node->setAttribute( 'layout', 'responsive' );
+		$this->maybe_unwrap_p_element( $iframe_node );
 	}
 
 	/**
diff --git a/tests/php/test-class-amp-wordpress-tv-embed-handler.php b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
index 520875c1358..e9bcdf8c57f 100644
--- a/tests/php/test-class-amp-wordpress-tv-embed-handler.php
+++ b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
@@ -42,7 +42,7 @@ public function mock_http_request( $preempt, $r, $url ) {
 		if ( false === strpos( $url, 'wordpress.tv' ) ) {
 			return $preempt;
 		}
-		unset( $r );
+
 		return [
 			'body'          => '{"type":"video","version":"1.0","title":null,"width":500,"height":281,"html":"<iframe width=\'500\' height=\'281\' src=\'https:\\/\\/video.wordpress.com\\/embed\\/yFCmLMGL?hd=0\' frameborder=\'0\' allowfullscreen><\\/iframe><script src=\'https:\\/\\/v0.wordpress.com\\/js\\/next\\/videopress-iframe.js?m=1435166243\'></script>"}', // phpcs:ignore
 			'headers'       => [],
@@ -56,99 +56,47 @@ public function mock_http_request( $preempt, $r, $url ) {
 	}
 
 	/**
-	 * Test that the script tag that VideoPress adds is removed by the sanitizer.
-	 *
-	 * @covers AMP_WordPress_TV_Embed_Handler::filter_oembed_html()
-	 */
-	public function test_script_removal() {
-		$handler = new AMP_WordPress_TV_Embed_Handler();
-		$handler->unregister_embed(); // Make sure we are on the initial clean state.
-
-		$wordpress_tv_block = '
-			<!-- wp:core-embed/wordpress-tv {"url":"https://wordpress.tv/2019/10/08/the-history-of-wordpress-in-four-minutes/","type":"video","providerNameSlug":"","className":"wp-embed-aspect-16-9 wp-has-aspect-ratio"} -->
-				<figure class="wp-block-embed-wordpress-tv wp-block-embed is-type-video wp-embed-aspect-16-9 wp-has-aspect-ratio">
-					<div class="wp-block-embed__wrapper">
-						https://wordpress.tv/2019/10/08/the-history-of-wordpress-in-four-minutes/
-					</div>
-				</figure>
-			<!-- /wp:core-embed/wordpress-tv -->
-		';
-
-		$handler->register_embed();
-		$rendered = apply_filters( 'the_content', $wordpress_tv_block );
-		$this->assertStringContains( '<iframe', $rendered );
-		$this->assertStringContains( 'video.wordpress.com/embed', $rendered );
-		$this->assertStringNotContains( '<script', $rendered );
-	}
-
-	/**
-	 * Gets the test data for test_filter_oembed_html().
+	 * Gets the test data for test_conversion().
 	 *
 	 * @return array The test data.
 	 */
-	public function get_filter_oembed_data() {
-		$embed_without_script = '<p>Example Embed</p>';
-		$embed_with_script    = $embed_without_script . '<script>doThis();</script>';
-
+	public function get_conversion_data() {
 		return [
-			'wrong_embed_url_domain'                => [
-				$embed_without_script,
-				'https://incorrect.com',
-				null,
+			'no_embed'        => [
+				'<p>Hello world.</p>',
+				'<p>Hello world.</p>' . PHP_EOL,
 			],
+
 			'wrong_embed_url_wordpress_com'         => [
-				$embed_without_script,
 				'https://wordpress.com/123',
-				null,
-			],
-			'wrong_embed_url_no_protocol'           => [
-				$embed_without_script,
-				'//wordpress.tv/',
-				null,
-			],
-			'correct_embed_url_http'                => [
-				$embed_with_script,
-				'https://wordpress.tv/123',
-				$embed_without_script,
-			],
-			'correct_embed_url_https'               => [
-				$embed_with_script,
-				'https://wordpress.tv/123',
-				$embed_without_script,
+				'<p>https://wordpress.com/123</p>' . PHP_EOL,
 			],
-			'correct_embed_url_no_script'           => [
-				$embed_without_script,
-				'https://wordpress.tv/123',
-				null,
-			],
-			'correct_embed_url_text_script_not_tag' => [
-				'This is the script for the play',
-				'https://wordpress.tv/123',
-				null,
+
+			'correct_url'               => [
+				'https://wordpress.tv/2019/10/08/the-history-of-wordpress-in-four-minutes/',
+				'<iframe width="500" height="281" src="https://video.wordpress.com/embed/yFCmLMGL?hd=0" frameborder="0" allowfullscreen layout="responsive"></iframe>' . PHP_EOL,
 			],
 		];
 	}
 
 	/**
-	 * Test filter_oembed_html
+	 * Test conversion.
 	 *
-	 * @dataProvider get_filter_oembed_data
-	 * @covers AMP_WordPress_TV_Embed_Handler::filter_oembed_html()
+	 * @dataProvider get_conversion_data
 	 *
-	 * @param mixed  $cache    The cached markup.
-	 * @param string $url      The URL of the embed.
+	 * @param string $source Source.
 	 * @param string $expected The expected return value.
 	 */
-	public function test_filter_oembed_html( $cache, $url, $expected ) {
-		if ( null === $expected ) {
-			$expected = $cache;
-		}
+	public function test_conversion( $source, $expected ) {
+		$embed = new AMP_WordPress_TV_Embed_Handler();
+		$embed->register_embed();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
 
-		$handler = new AMP_WordPress_TV_Embed_Handler();
-		$this->assertEquals(
-			$expected,
-			$handler->filter_oembed_html( $cache, $url )
-		);
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
+		$this->assertEquals( $expected, $content );
 	}
 }

From 575f173ed9b519bf649415e7c08ca01d053ec494 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 8 May 2020 07:19:09 -0400
Subject: [PATCH 10/45] Sanitize Hulu embeds

---
 .../embeds/class-amp-hulu-embed-handler.php   | 108 ++++++++++++------
 .../php/test-class-amp-hulu-embed-handler.php |  22 ++--
 2 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/includes/embeds/class-amp-hulu-embed-handler.php b/includes/embeds/class-amp-hulu-embed-handler.php
index e9dca1df449..9ccc24a8600 100644
--- a/includes/embeds/class-amp-hulu-embed-handler.php
+++ b/includes/embeds/class-amp-hulu-embed-handler.php
@@ -6,6 +6,8 @@
  * @since 1.0
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Hulu_Embed_Handler
  */
@@ -28,60 +30,92 @@ class AMP_Hulu_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Register embed.
 	 */
 	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+		// Not implemented.
 	}
 
 	/**
-	 * Filter oEmbed HTML for Hulu to prepare it for AMP.
+	 * Sanitize all Hulu <iframe> tags to <amp-hulu>.
 	 *
-	 * @param mixed  $return The oEmbed HTML.
-	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   Attributes.
-	 * @return string Embed.
+	 * @param Document $dom DOM.
 	 */
-	public function filter_embed_oembed_html( $return, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'hulu.com' ) ) {
-			if ( preg_match( '/width=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['width'] = $matches[1];
-			}
-			if ( preg_match( '/height=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['height'] = $matches[1];
-			}
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//iframe[ contains( @src, "www.hulu.com/embed.html" ) ]' );
 
-			if ( empty( $attr['height'] ) ) {
-				return $return;
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
 			}
+			$this->sanitize_raw_embed( $node );
+		}
+	}
 
-			$attributes = wp_array_slice_assoc( $attr, [ 'width', 'height' ] );
+	/**
+	 * Determine if the node has already been sanitized.
+	 *
+	 * @param DOMElement $node The DOMNode.
+	 * @return bool Whether the node is a raw embed.
+	 */
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && 'amp-hulu' !== $node->parentNode->nodeName;
+	}
 
-			if ( empty( $attr['width'] ) ) {
-				$attributes['layout'] = 'fixed-height';
-				$attributes['width']  = 'auto';
-			}
+	/**
+	 * Make Hulu embed AMP compatible.
+	 *
+	 * @param DOMElement $iframe_node The node to make AMP compatible.
+	 */
+	private function sanitize_raw_embed( DOMElement $iframe_node ) {
+		$iframe_src = $iframe_node->getAttribute('src');
+		$video_id   = $this->get_video_id( $iframe_src );
 
-			$pieces = explode( '/watch/', $parsed_url['path'] );
-			if ( ! isset( $pieces[1] ) ) {
-				if ( ! preg_match( '/\/([A-Za-z0-9]+)/', $parsed_url['path'], $matches ) ) {
-					return $return;
-				}
-				$attributes['data-eid'] = $matches[1];
-			} else {
-				$attributes['data-eid'] = $pieces[1];
-			}
+		if ( ! $video_id ) {
+			return;
+		}
+
+		$attributes = [
+			'data-eid' => $video_id,
+			'layout'   => 'responsive',
+			'width'    => $this->DEFAULT_WIDTH,
+			'height'   => $this->DEFAULT_HEIGHT,
+		];
+
+		if ( $iframe_node->hasAttribute( 'width' ) ) {
+			$attributes['width'] = $iframe_node->getAttribute( 'width' );
+ 		}
+
+		if ( $iframe_node->hasAttribute( 'height' ) ) {
+			$attributes['height'] = $iframe_node->getAttribute( 'height' );
+ 		}
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $iframe_node ),
+			'amp-hulu',
+			$attributes
+		);
+
+		$this->maybe_unwrap_p_element( $iframe_node );
 
-			$return = AMP_HTML_Utils::build_tag(
-				'amp-hulu',
-				$attributes
-			);
+		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
+	}
+
+	/**
+	 * Get video from URL.
+	 *
+	 * @param string $url Video URL.
+	 * @return string|null Video ID, or null if it was not found.
+	 */
+	private function get_video_id( $url ) {
+		if ( preg_match( '#hulu\.com/embed\.html\?eid=(?P<id>[A-Za-z0-9_-]+)#', $url, $matches ) ) {
+			return $matches['id'];
 		}
-		return $return;
+
+		return null;
 	}
 }
diff --git a/tests/php/test-class-amp-hulu-embed-handler.php b/tests/php/test-class-amp-hulu-embed-handler.php
index 743f3874843..d540a3d10cd 100644
--- a/tests/php/test-class-amp-hulu-embed-handler.php
+++ b/tests/php/test-class-amp-hulu-embed-handler.php
@@ -73,12 +73,12 @@ public function get_conversion_data() {
 		return [
 			'url_simple'      => [
 				'https://www.hulu.com/watch/771496',
-				'<p><amp-hulu width="500" height="289" data-eid="771496"></amp-hulu></p>' . PHP_EOL,
+				'<amp-hulu data-eid="_hHzwnAcj3RrXMJFDDvkuw" layout="responsive" width="500" height="289"></amp-hulu>' . PHP_EOL,
 			],
 
 			'url_with_params' => [
 				'https://www.hulu.com/watch/771496?foo=bar',
-				'<p><amp-hulu width="500" height="289" data-eid="771496"></amp-hulu></p>' . PHP_EOL,
+				'<amp-hulu data-eid="_hHzwnAcj3RrXMJFDDvkuw" layout="responsive" width="500" height="289"></amp-hulu>' . PHP_EOL,
 			],
 
 		];
@@ -94,13 +94,14 @@ public function get_conversion_data() {
 	public function test__conversion( $url, $expected ) {
 		$embed = new AMP_Hulu_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $url );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
 
-		if ( self::is_external_http_test_suite() && "<p>$url</p>" === trim( $filtered_content ) ) {
-			$this->markTestSkipped( 'Endpoint is down.' );
-		}
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -131,13 +132,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $url, $expected ) {
 		$embed = new AMP_Hulu_Embed_Handler();
 		$embed->register_embed();
-		$filtered_content = apply_filters( 'the_content', $url );
 
-		if ( self::is_external_http_test_suite() && "<p>$url</p>" === trim( $filtered_content ) ) {
-			$this->markTestSkipped( 'Endpoint is down.' );
-		}
+		$filtered_content = apply_filters( 'the_content', $url );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $filtered_content ) );
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 
 		$scripts = array_merge(

From d7895077e6bbd084f0c87e5e07dd00a6f72a128c Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 8 May 2020 12:55:30 -0400
Subject: [PATCH 11/45] Fix lint errors

---
 .../embeds/class-amp-base-embed-handler.php   |  2 +-
 .../embeds/class-amp-hulu-embed-handler.php   |  6 +--
 .../embeds/class-amp-scribd-embed-handler.php |  2 +-
 .../class-amp-soundcloud-embed-handler.php    |  3 +-
 .../class-amp-twitter-embed-handler.php       | 47 ++++++++++++++-----
 .../embeds/class-amp-vimeo-embed-handler.php  |  2 +-
 .../class-amp-youtube-embed-handler.php       |  5 +-
 .../php/test-amp-instagram-embed-handler.php  | 20 ++++----
 tests/php/test-amp-twitter-embed-handler.php  | 19 ++++----
 ...t-class-amp-wordpress-tv-embed-handler.php |  6 +--
 10 files changed, 66 insertions(+), 46 deletions(-)

diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index ec52ee7c500..eff3a67091d 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -115,7 +115,7 @@ function ( $attr_name ) {
 	 * @param DOMElement $node Node.
 	 */
 	protected function maybe_unwrap_p_element( DOMElement $node ) {
-	    $parent_element = AMP_DOM_Utils::get_parent_element( $node );
+		$parent_element = AMP_DOM_Utils::get_parent_element( $node );
 
 		if ( $parent_element && 'p' === $parent_element->nodeName && false === $parent_element->hasAttributes() ) {
 			$children = $parent_element->getElementsByTagName( '*' );
diff --git a/includes/embeds/class-amp-hulu-embed-handler.php b/includes/embeds/class-amp-hulu-embed-handler.php
index 9ccc24a8600..07ae31c232b 100644
--- a/includes/embeds/class-amp-hulu-embed-handler.php
+++ b/includes/embeds/class-amp-hulu-embed-handler.php
@@ -72,7 +72,7 @@ protected function is_raw_embed( DOMElement $node ) {
 	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
 	private function sanitize_raw_embed( DOMElement $iframe_node ) {
-		$iframe_src = $iframe_node->getAttribute('src');
+		$iframe_src = $iframe_node->getAttribute( 'src' );
 		$video_id   = $this->get_video_id( $iframe_src );
 
 		if ( ! $video_id ) {
@@ -88,11 +88,11 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 
 		if ( $iframe_node->hasAttribute( 'width' ) ) {
 			$attributes['width'] = $iframe_node->getAttribute( 'width' );
- 		}
+		}
 
 		if ( $iframe_node->hasAttribute( 'height' ) ) {
 			$attributes['height'] = $iframe_node->getAttribute( 'height' );
- 		}
+		}
 
 		$amp_node = AMP_DOM_Utils::create_node(
 			Document::fromNode( $iframe_node ),
diff --git a/includes/embeds/class-amp-scribd-embed-handler.php b/includes/embeds/class-amp-scribd-embed-handler.php
index 11b4449f30d..9b2cf721b0b 100644
--- a/includes/embeds/class-amp-scribd-embed-handler.php
+++ b/includes/embeds/class-amp-scribd-embed-handler.php
@@ -59,7 +59,7 @@ protected function is_raw_embed( DOMElement $node ) {
 	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
 	private function sanitize_raw_embed( DOMElement $iframe_node ) {
-		$required_sandbox_permissions  = 'allow-popups allow-scripts';
+		$required_sandbox_permissions = 'allow-popups allow-scripts';
 		$iframe_node->setAttribute(
 			'sandbox',
 			sprintf( '%s %s', $iframe_node->getAttribute( 'sandbox' ), $required_sandbox_permissions )
diff --git a/includes/embeds/class-amp-soundcloud-embed-handler.php b/includes/embeds/class-amp-soundcloud-embed-handler.php
index 799704e0dec..3cb73e2c5e4 100644
--- a/includes/embeds/class-amp-soundcloud-embed-handler.php
+++ b/includes/embeds/class-amp-soundcloud-embed-handler.php
@@ -75,7 +75,8 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 			return;
 		}
 
-		$embed_id = $this->parse_embed_id_from_url( $query['url'] );
+		$attributes = [];
+		$embed_id   = $this->parse_embed_id_from_url( $query['url'] );
 
 		if ( isset( $embed_id['track_id'] ) ) {
 			$attributes['data-trackid'] = $embed_id['track_id'];
diff --git a/includes/embeds/class-amp-twitter-embed-handler.php b/includes/embeds/class-amp-twitter-embed-handler.php
index 240a1192504..a12994ba2e3 100644
--- a/includes/embeds/class-amp-twitter-embed-handler.php
+++ b/includes/embeds/class-amp-twitter-embed-handler.php
@@ -63,17 +63,32 @@ public function sanitize_raw_embeds( Document $dom ) {
 		$this->sanitize_moment_embeds( $dom );
 	}
 
-	public function sanitize_tweet_embeds( Document $dom ) {
+	/**
+	 * Sanitize tweets.
+	 *
+	 * @param Document $dom Document.
+	 */
+	private function sanitize_tweet_embeds( Document $dom ) {
 		$nodes = $dom->xpath->query( '//blockquote[ @class = "twitter-tweet" ]' );
 		$this->sanitize_raw_embed( 'tweet', $nodes );
 	}
 
-	public function sanitize_timeline_embeds( Document $dom ) {
+	/**
+	 * Sanitize timelines.
+	 *
+	 * @param Document $dom Document.
+	 */
+	private function sanitize_timeline_embeds( Document $dom ) {
 		$nodes = $dom->xpath->query( '//a[ @class = "twitter-timeline" ]' );
 		$this->sanitize_raw_embed( 'timeline', $nodes );
 	}
 
-	public function sanitize_moment_embeds( Document $dom ) {
+	/**
+	 * Sanitize moments.
+	 *
+	 * @param Document $dom Document.
+	 */
+	private function sanitize_moment_embeds( Document $dom ) {
 		$nodes = $dom->xpath->query( '//a[ @class = "twitter-moment" ]' );
 		$this->sanitize_raw_embed( 'moment', $nodes );
 	}
@@ -84,26 +99,32 @@ public function sanitize_moment_embeds( Document $dom ) {
 	 * @param DOMElement $node The DOMNode to adjust and replace.
 	 * @return bool Whether node is for raw embed.
 	 */
-	private function is_raw_embed( $node ) {
+	private function is_raw_embed( DOMElement $node ) {
 		return $node->parentNode && 'amp-twitter' !== $node->parentNode->nodeName;
 	}
 
 	/**
 	 * Make final modifications to DOMNode
 	 *
-	 * @param string $embed_type The type of Twitter embed.
-	 * @param DOMNodeList  $nodes List of DOMElement nodes.
+	 * @param string      $embed_type The type of Twitter embed.
+	 * @param DOMNodeList $nodes List of DOMElement nodes.
 	 */
-	private function sanitize_raw_embed( $embed_type, $nodes ) {
+	private function sanitize_raw_embed( $embed_type, DOMNodeList $nodes ) {
 		foreach ( $nodes as $node ) {
+			/**
+			 * Node.
+			 *
+			 * @var DOMElement $node
+			 */
+
 			if ( ! $this->is_raw_embed( $node ) ) {
 				continue;
 			}
 
 			$attributes = [
-				'width'        => $this->DEFAULT_WIDTH,
-				'height'       => $this->DEFAULT_HEIGHT,
-				'layout'       => 'responsive',
+				'width'  => $this->DEFAULT_WIDTH,
+				'height' => $this->DEFAULT_HEIGHT,
+				'layout' => 'responsive',
 			];
 
 			switch ( $embed_type ) {
@@ -126,7 +147,7 @@ private function sanitize_raw_embed( $embed_type, $nodes ) {
 						( isset( $timeline_attrs['type'] ) && in_array( $timeline_attrs['type'], [ 'likes', 'lists' ], true ) )
 					) {
 						$attributes['data-timeline-source-type'] = 'url';
-						$attributes['data-timeline-url'] = $node->getAttribute( 'href' );
+						$attributes['data-timeline-url']         = $node->getAttribute( 'href' );
 					}
 
 					break;
@@ -181,7 +202,7 @@ private function sanitize_raw_embed( $embed_type, $nodes ) {
 	 * @param DOMElement $node The DOMNode to adjust and replace.
 	 * @return string Tweet ID.
 	 */
-	private function get_tweet_id( $node ) {
+	private function get_tweet_id( DOMElement $node ) {
 		/**
 		 * DOMNode
 		 *
@@ -239,7 +260,7 @@ private function get_moment_id( $url ) {
 	 *
 	 * @param DOMElement $node The DOMNode to whose sibling is the Twitter script.
 	 */
-	private function sanitize_embed_script( $node ) {
+	private function sanitize_embed_script( DOMElement $node ) {
 		$next_element_sibling = $node->nextSibling;
 
 		// Remove any <br> siblings.
diff --git a/includes/embeds/class-amp-vimeo-embed-handler.php b/includes/embeds/class-amp-vimeo-embed-handler.php
index 0bbb959f984..15a23cbce11 100644
--- a/includes/embeds/class-amp-vimeo-embed-handler.php
+++ b/includes/embeds/class-amp-vimeo-embed-handler.php
@@ -96,7 +96,7 @@ protected function is_raw_embed( DOMElement $node ) {
 	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
 	private function sanitize_raw_embed( DOMElement $iframe_node ) {
-		$iframe_src = $iframe_node->getAttribute('src');
+		$iframe_src = $iframe_node->getAttribute( 'src' );
 		$video_id   = $this->get_video_id_from_url( $iframe_src );
 
 		if ( ! $video_id ) {
diff --git a/includes/embeds/class-amp-youtube-embed-handler.php b/includes/embeds/class-amp-youtube-embed-handler.php
index d17332ea3af..a9a2d1de402 100644
--- a/includes/embeds/class-amp-youtube-embed-handler.php
+++ b/includes/embeds/class-amp-youtube-embed-handler.php
@@ -79,12 +79,11 @@ public function sanitize_raw_embeds( Document $dom ) {
 			}
 
 			$iframe_src = $node->getAttribute( 'src' );
-			$video_id = $this->get_video_id_from_url( $iframe_src );
+			$video_id   = $this->get_video_id_from_url( $iframe_src );
 
 			if ( $video_id ) {
 				$this->sanitize_raw_embed( $node, $video_id );
 			}
-
 		}
 	}
 
@@ -101,8 +100,8 @@ protected function is_raw_embed( DOMElement $node ) {
 	/**
 	 * Make DailyMotion embed AMP compatible.
 	 *
-	 * @param string     $video_id Video ID.
 	 * @param DOMElement $iframe_node The node to make AMP compatible.
+	 * @param string     $video_id Video ID.
 	 */
 	private function sanitize_raw_embed( DOMElement $iframe_node, $video_id ) {
 		$attributes = [
diff --git a/tests/php/test-amp-instagram-embed-handler.php b/tests/php/test-amp-instagram-embed-handler.php
index 8d788d811f3..295e4f2ca97 100644
--- a/tests/php/test-amp-instagram-embed-handler.php
+++ b/tests/php/test-amp-instagram-embed-handler.php
@@ -6,43 +6,43 @@ public function get_conversion_data() {
 		return [
 			'no_embed'                           => [
 				'<p>Hello world.</p>',
-				'<p>Hello world.</p>',
+				'<p>Hello world.</p>' . PHP_EOL,
 			],
 			'simple_url'                         => [
 				'https://instagram.com/p/7-l0z_p4A4/',
-				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>',
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . PHP_EOL . PHP_EOL,
 			],
 			'simple_tv_url'                      => [
 				'https://instagram.com/tv/7-l0z_p4A4/' . PHP_EOL,
-				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>',
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . PHP_EOL . PHP_EOL,
 			],
 			'short_url'                          => [
 				'https://instagr.am/p/7-l0z_p4A4' . PHP_EOL,
-				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>',
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . PHP_EOL . PHP_EOL,
 			],
 			'short_tv_url'                       => [
 				'https://instagr.am/tv/7-l0z_p4A4' . PHP_EOL,
-				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>',
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . PHP_EOL . PHP_EOL,
 			],
 
 			'embed_blockquote_without_instagram' => [
 				'<blockquote><p>lorem ipsum</p></blockquote>',
-				'<blockquote><p>lorem ipsum</p></blockquote>',
+				'<blockquote>' . PHP_EOL . '<p>lorem ipsum</p>' . PHP_EOL . '</blockquote>' . PHP_EOL,
 			],
 
 			'blockquote_embed'                   => [
 				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>',
+				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . PHP_EOL . PHP_EOL,
 			],
 
 			'blockquote_tv_embed'                => [
 				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/tv/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>',
+				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . PHP_EOL . PHP_EOL,
 			],
 
 			'blockquote_embed_with_caption'      => [
 				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/" data-instgrm-captioned><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>',
+				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . PHP_EOL . PHP_EOL,
 			],
 		];
 	}
@@ -108,6 +108,6 @@ public function test__get_scripts( $source, $expected ) {
 			$whitelist_sanitizer->get_scripts()
 		);
 
-		$this->assertEquals( $expected . PHP_EOL . PHP_EOL, $scripts );
+		$this->assertEquals( $expected, $scripts );
 	}
 }
diff --git a/tests/php/test-amp-twitter-embed-handler.php b/tests/php/test-amp-twitter-embed-handler.php
index 0d80c3ae9a2..bef8cc43a19 100644
--- a/tests/php/test-amp-twitter-embed-handler.php
+++ b/tests/php/test-amp-twitter-embed-handler.php
@@ -55,12 +55,11 @@ public function mock_http_request( $preempt, $r, $url ) {
 			$body = '{"url":"https:\/\/twitter.com\/i\/moments\/625792726546558977","title":"Michelle Obama Opens Special Olympics","html":"\u003Ca class=\"twitter-moment\" href=\"https:\/\/twitter.com\/i\/moments\/625792726546558977?ref_src=twsrc%5Etfw\"\u003EMichelle Obama Opens Special Olympics\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":550,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
 		} elseif ( false !== strpos( $url, 'lists%2Fweb-gdes' ) ) {
 			$body = '{"url":"https:\/\/twitter.com\/robertnyman\/lists\/web-gdes","title":"Web GDEs","html":"\u003Ca class=\"twitter-timeline\" href=\"https:\/\/twitter.com\/robertnyman\/lists\/web-gdes?ref_src=twsrc%5Etfw\"\u003EA Twitter List by robertnyman\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":null,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
-		} elseif ( false !== strpos( $url, 'wordpress%2Flikes' ) ) {
+		} elseif ( false !== strpos( $url, 'wordpress%2Flikes' ) ) { // phpcs:ignore WordPress.WP.CapitalPDangit.Misspelled
 			$body = '{"url":"https:\/\/twitter.com\/WordPress\/likes","title":"","html":"\u003Ca class=\"twitter-timeline\" href=\"https:\/\/twitter.com\/WordPress\/likes?ref_src=twsrc%5Etfw\"\u003ETweets Liked by @WordPress\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":null,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
 		} elseif ( false !== strpos( $url, 'twitter.com%2Fwordpress' ) ) {
 			$body = '{"url":"https:\/\/twitter.com\/WordPress","title":"","html":"\u003Ca class=\"twitter-timeline\" href=\"https:\/\/twitter.com\/WordPress?ref_src=twsrc%5Etfw\"\u003ETweets by WordPress\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":null,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
-		}
-		else {
+		} else {
 			$body = '';
 		}
 
@@ -83,7 +82,7 @@ public function mock_http_request( $preempt, $r, $url ) {
 	 */
 	public function get_conversion_data() {
 		return [
-			'no_embed'                  => [
+			'no_embed'                                => [
 				'<p>Hello world.</p>',
 				'<p>Hello world.</p>' . PHP_EOL,
 			],
@@ -93,32 +92,32 @@ public function get_conversion_data() {
 				'<blockquote><p>lorem ipsum</p></blockquote>' . PHP_EOL,
 			],
 
-			'url_simple'                => [
+			'url_simple'                              => [
 				'https://twitter.com/wordpress/status/987437752164737025',
 				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-width="500" data-dnt="true"><blockquote class="twitter-tweet" data-width="500" data-dnt="true" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
 
-			'url_with_big_tweet_id'     => [
+			'url_with_big_tweet_id'                   => [
 				'https://twitter.com/wordpress/status/705219971425574912' . PHP_EOL,
 				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="705219971425574912" data-width="500" data-dnt="true"><blockquote class="twitter-tweet" data-width="500" data-dnt="true" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">On our way to the <a href="https://twitter.com/hashtag/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw">#GoogleDance</a>! <a href="https://twitter.com/hashtag/SMX?src=hash&amp;ref_src=twsrc%5Etfw">#SMX</a> 💃🏻 <a href="https://t.co/N8kZ9M3eN4">pic.twitter.com/N8kZ9M3eN4</a></p>' . PHP_EOL . '<p>— Search Engine Land (@sengineland) <a href="https://twitter.com/sengineland/status/705219971425574912?ref_src=twsrc%5Etfw">March 3, 2016</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
 
-			'timeline_url_with_profile' => [
+			'timeline_url_with_profile'               => [
 				'https://twitter.com/wordpress' . PHP_EOL,
 				'<amp-twitter width="600" height="480" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/WordPress?ref_src=twsrc%5Etfw"><a class="twitter-timeline" href="https://twitter.com/WordPress?ref_src=twsrc%5Etfw" placeholder="">Tweets by WordPress</a></amp-twitter>' . PHP_EOL,
 			],
 
-			'timeline_url_with_likes'   => [
+			'timeline_url_with_likes'                 => [
 				'https://twitter.com/wordpress/likes' . PHP_EOL,
 				'<amp-twitter width="600" height="480" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/WordPress/likes?ref_src=twsrc%5Etfw"><a class="twitter-timeline" href="https://twitter.com/WordPress/likes?ref_src=twsrc%5Etfw" placeholder="">Tweets Liked by @WordPress</a></amp-twitter>' . PHP_EOL,
 			],
 
-			'timeline_url_with_list'   => [
+			'timeline_url_with_list'                  => [
 				'https://twitter.com/robertnyman/lists/web-gdes' . PHP_EOL,
 				'<amp-twitter width="600" height="480" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/robertnyman/lists/web-gdes?ref_src=twsrc%5Etfw"><a class="twitter-timeline" href="https://twitter.com/robertnyman/lists/web-gdes?ref_src=twsrc%5Etfw" placeholder="">A Twitter List by robertnyman</a></amp-twitter>' . PHP_EOL,
 			],
 
-			'moment_url'   => [
+			'moment_url'                              => [
 				'https://twitter.com/i/moments/625792726546558977' . PHP_EOL,
 				'<amp-twitter width="600" height="480" layout="responsive" data-momentid="625792726546558977"><a class="twitter-moment" href="https://twitter.com/i/moments/625792726546558977?ref_src=twsrc%5Etfw" placeholder="">Michelle Obama Opens Special Olympics</a></amp-twitter>' . PHP_EOL,
 			],
diff --git a/tests/php/test-class-amp-wordpress-tv-embed-handler.php b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
index e9bcdf8c57f..03944e7b204 100644
--- a/tests/php/test-class-amp-wordpress-tv-embed-handler.php
+++ b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
@@ -62,17 +62,17 @@ public function mock_http_request( $preempt, $r, $url ) {
 	 */
 	public function get_conversion_data() {
 		return [
-			'no_embed'        => [
+			'no_embed'                      => [
 				'<p>Hello world.</p>',
 				'<p>Hello world.</p>' . PHP_EOL,
 			],
 
-			'wrong_embed_url_wordpress_com'         => [
+			'wrong_embed_url_wordpress_com' => [
 				'https://wordpress.com/123',
 				'<p>https://wordpress.com/123</p>' . PHP_EOL,
 			],
 
-			'correct_url'               => [
+			'correct_url'                   => [
 				'https://wordpress.tv/2019/10/08/the-history-of-wordpress-in-four-minutes/',
 				'<iframe width="500" height="281" src="https://video.wordpress.com/embed/yFCmLMGL?hd=0" frameborder="0" allowfullscreen layout="responsive"></iframe>' . PHP_EOL,
 			],

From bd606bf81d22fc2e6082066343c0c7a1121306f8 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 18 May 2020 11:42:43 -0400
Subject: [PATCH 12/45] Make child element count more robust

---
 includes/embeds/class-amp-base-embed-handler.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index eff3a67091d..4f2660caab3 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -118,8 +118,15 @@ protected function maybe_unwrap_p_element( DOMElement $node ) {
 		$parent_element = AMP_DOM_Utils::get_parent_element( $node );
 
 		if ( $parent_element && 'p' === $parent_element->nodeName && false === $parent_element->hasAttributes() ) {
-			$children = $parent_element->getElementsByTagName( '*' );
-			if ( 1 === $children->length ) {
+			$child_element_count = array_sum(
+				array_map(
+					static function ( DOMNode $child ) {
+						return $child instanceof DOMElement ? 1 : 0;
+					},
+					iterator_to_array( $node->childNodes )
+				)
+			);
+			if ( 1 === $child_element_count ) {
 				$parent_element->parentNode->replaceChild( $node, $parent_element );
 			}
 		}

From 8e492b25a1d0b48ef3f626eef670aaea8c70bdb3 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 18 May 2020 11:43:37 -0400
Subject: [PATCH 13/45] Extract base embed URLs as class constants

---
 .../embeds/class-amp-dailymotion-embed-handler.php | 14 ++++++++++----
 includes/embeds/class-amp-gfycat-embed-handler.php |  7 ++++---
 includes/embeds/class-amp-hulu-embed-handler.php   |  7 ++++---
 includes/embeds/class-amp-scribd-embed-handler.php |  9 ++++++++-
 .../embeds/class-amp-soundcloud-embed-handler.php  |  9 ++++++++-
 includes/embeds/class-amp-vimeo-embed-handler.php  |  9 ++++++++-
 .../class-amp-wordpress-tv-embed-handler.php       |  9 ++++++++-
 7 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/includes/embeds/class-amp-dailymotion-embed-handler.php b/includes/embeds/class-amp-dailymotion-embed-handler.php
index 58ca2644c4a..26791477a9c 100644
--- a/includes/embeds/class-amp-dailymotion-embed-handler.php
+++ b/includes/embeds/class-amp-dailymotion-embed-handler.php
@@ -16,6 +16,13 @@ class AMP_DailyMotion_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	const RATIO = 0.5625;
 
+	/**
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
+	 */
+	const BASE_EMBED_URL = 'https://www.dailymotion.com/embed/video/';
+
 	/**
 	 * Default width.
 	 *
@@ -65,7 +72,7 @@ public function unregister_embed() {
 	 * @param Document $dom DOM.
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://www.dailymotion.com/embed/video/" ) ]' );
+		$nodes = $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
 
 		foreach ( $nodes as $node ) {
 			if ( ! $this->is_raw_embed( $node ) ) {
@@ -93,9 +100,8 @@ protected function is_raw_embed( DOMElement $node ) {
 	private function sanitize_raw_embed( DOMElement $iframe_node ) {
 		$iframe_src = $iframe_node->getAttribute( 'src' );
 
-		if ( preg_match( '#video/(?P<video_id>[a-zA-Z0-9]+)#', $iframe_src, $matches ) ) {
-			$video_id = $matches['video_id'];
-
+		$video_id = strtok( substr( $iframe_src, strlen( self::BASE_EMBED_URL ) ), '/?#' );
+		if ( ! empty( $video_id ) ) {
 			$amp_node = AMP_DOM_Utils::create_node(
 				Document::fromNode( $iframe_node ),
 				'amp-dailymotion',
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index 45a3f11ad4e..0d81e5afee8 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -12,12 +12,13 @@
  * Class AMP_Gfycat_Embed_Handler
  */
 class AMP_Gfycat_Embed_Handler extends AMP_Base_Embed_Handler {
+
 	/**
-	 * Regex matched to produce output amp-gfycat.
+	 * Base URL used for identifying embeds.
 	 *
 	 * @var string
 	 */
-	const URL_PATTERN = '#https?://(www\.)?gfycat\.com/.*#i';
+	const BASE_EMBED_URL = 'www.hulu.com/embed.html';
 
 	/**
 	 * Register embed.
@@ -39,7 +40,7 @@ public function unregister_embed() {
 	 * @param Document $dom DOM.
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://gfycat.com/ifr/" ) ]' );
+		$nodes = $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
 
 		foreach ( $nodes as $node ) {
 			if ( ! $this->is_raw_embed( $node ) ) {
diff --git a/includes/embeds/class-amp-hulu-embed-handler.php b/includes/embeds/class-amp-hulu-embed-handler.php
index 07ae31c232b..d201413e60d 100644
--- a/includes/embeds/class-amp-hulu-embed-handler.php
+++ b/includes/embeds/class-amp-hulu-embed-handler.php
@@ -12,12 +12,13 @@
  * Class AMP_Hulu_Embed_Handler
  */
 class AMP_Hulu_Embed_Handler extends AMP_Base_Embed_Handler {
+
 	/**
-	 * Regex matched to produce output amp-hulu.
+	 * Base URL used for identifying embeds.
 	 *
 	 * @var string
 	 */
-	const URL_PATTERN = '#https?://(www\.)?hulu\.com/.*#i';
+	const BASE_EMBED_URL = 'www.hulu.com/embed.html';
 
 	/**
 	 * Default height.
@@ -46,7 +47,7 @@ public function unregister_embed() {
 	 * @param Document $dom DOM.
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( '//iframe[ contains( @src, "www.hulu.com/embed.html" ) ]' );
+		$nodes = $dom->xpath->query( sprintf( '//iframe[ contains( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
 
 		foreach ( $nodes as $node ) {
 			if ( ! $this->is_raw_embed( $node ) ) {
diff --git a/includes/embeds/class-amp-scribd-embed-handler.php b/includes/embeds/class-amp-scribd-embed-handler.php
index 9b2cf721b0b..0c2937d1b45 100644
--- a/includes/embeds/class-amp-scribd-embed-handler.php
+++ b/includes/embeds/class-amp-scribd-embed-handler.php
@@ -13,6 +13,13 @@
  */
 class AMP_Scribd_Embed_Handler extends AMP_Base_Embed_Handler {
 
+	/**
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
+	 */
+	const BASE_EMBED_URL = 'https://www.scribd.com/embeds/';
+
 	/**
 	 * Registers embed.
 	 */
@@ -33,7 +40,7 @@ public function unregister_embed() {
 	 * @param Document $dom DOM.
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://www.scribd.com/embeds/" ) ]' );
+		$nodes = $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
 
 		foreach ( $nodes as $node ) {
 			if ( ! $this->is_raw_embed( $node ) ) {
diff --git a/includes/embeds/class-amp-soundcloud-embed-handler.php b/includes/embeds/class-amp-soundcloud-embed-handler.php
index 3cb73e2c5e4..aa46eef442d 100644
--- a/includes/embeds/class-amp-soundcloud-embed-handler.php
+++ b/includes/embeds/class-amp-soundcloud-embed-handler.php
@@ -14,6 +14,13 @@
  */
 class AMP_SoundCloud_Embed_Handler extends AMP_Base_Embed_Handler {
 
+	/**
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
+	 */
+	const BASE_EMBED_URL = 'https://w.soundcloud.com/player/';
+
 	/**
 	 * Default height.
 	 *
@@ -41,7 +48,7 @@ public function unregister_embed() {
 	 * @param Document $dom DOM.
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://w.soundcloud.com/player/" ) ]' );
+		$nodes = $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
 
 		foreach ( $nodes as $node ) {
 			if ( ! $this->is_raw_embed( $node ) ) {
diff --git a/includes/embeds/class-amp-vimeo-embed-handler.php b/includes/embeds/class-amp-vimeo-embed-handler.php
index 15a23cbce11..9a5f18f20ba 100644
--- a/includes/embeds/class-amp-vimeo-embed-handler.php
+++ b/includes/embeds/class-amp-vimeo-embed-handler.php
@@ -14,6 +14,13 @@
  */
 class AMP_Vimeo_Embed_Handler extends AMP_Base_Embed_Handler {
 
+	/**
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
+	 */
+	const BASE_EMBED_URL = 'https://player.vimeo.com/video/';
+
 	/**
 	 * The aspect ratio.
 	 *
@@ -70,7 +77,7 @@ public function unregister_embed() {
 	 * @param Document $dom DOM.
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://player.vimeo.com/video/" ) ]' );
+		$nodes = $dom->xpath->query( sprintf( '//iframe[ contains( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
 
 		foreach ( $nodes as $node ) {
 			if ( ! $this->is_raw_embed( $node ) ) {
diff --git a/includes/embeds/class-amp-wordpress-tv-embed-handler.php b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
index 318cc7fe210..078878814a2 100644
--- a/includes/embeds/class-amp-wordpress-tv-embed-handler.php
+++ b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
@@ -15,6 +15,13 @@
  */
 class AMP_WordPress_TV_Embed_Handler extends AMP_Base_Embed_Handler {
 
+	/**
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
+	 */
+	const BASE_EMBED_URL = 'https://video.wordpress.com/embed/';
+
 	/**
 	 * The URL pattern to determine if an embed URL is for this type, copied from WP_oEmbed.
 	 *
@@ -42,7 +49,7 @@ public function unregister_embed() {
 	 * @param Document $dom DOM.
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://video.wordpress.com/embed/" ) ]' );
+		$nodes = $dom->xpath->query( sprintf( '//iframe[ contains( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
 
 		foreach ( $nodes as $node ) {
 			if ( ! $this->is_raw_embed( $node ) ) {

From 3f4f9ae6824318feffcb0ea9f9a977dbbd56901f Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 18 May 2020 11:52:50 -0400
Subject: [PATCH 14/45] Get dimensions from iframe if available

---
 .../class-amp-dailymotion-embed-handler.php    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/includes/embeds/class-amp-dailymotion-embed-handler.php b/includes/embeds/class-amp-dailymotion-embed-handler.php
index 26791477a9c..41c6469e9a9 100644
--- a/includes/embeds/class-amp-dailymotion-embed-handler.php
+++ b/includes/embeds/class-amp-dailymotion-embed-handler.php
@@ -102,16 +102,22 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 
 		$video_id = strtok( substr( $iframe_src, strlen( self::BASE_EMBED_URL ) ), '/?#' );
 		if ( ! empty( $video_id ) ) {
-			$amp_node = AMP_DOM_Utils::create_node(
-				Document::fromNode( $iframe_node ),
-				'amp-dailymotion',
-				[
+			$args = [
 					'data-videoid' => $video_id,
 					'layout'       => 'responsive',
 					'width'        => $this->args['width'],
 					'height'       => $this->args['height'],
-				]
-			);
+				];
+
+			if ( $iframe_node->hasAttribute( 'width' ) ) {
+				$args['width'] = $iframe_node->getAttribute( 'width' );
+			}
+
+			if ( $iframe_node->hasAttribute( 'height' ) ) {
+				$args['height'] = $iframe_node->getAttribute( 'height' );
+			}
+
+			$amp_node = AMP_DOM_Utils::create_node( Document::fromNode( $iframe_node ), 'amp-dailymotion', $args );
 
 			$this->maybe_unwrap_p_element( $iframe_node );
 

From 085d1cc3ede2a3a0dd83ab87f7f9d6b2882a1f9b Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 18 May 2020 18:50:05 -0400
Subject: [PATCH 15/45] Refactor logic for removing script sibling

---
 .../embeds/class-amp-base-embed-handler.php   | 47 +++++++++++++++++++
 .../class-amp-instagram-embed-handler.php     | 37 +--------------
 .../embeds/class-amp-tiktok-embed-handler.php | 37 +--------------
 .../class-amp-twitter-embed-handler.php       | 43 +++--------------
 4 files changed, 55 insertions(+), 109 deletions(-)

diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index 4f2660caab3..faccc37e931 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -112,6 +112,8 @@ function ( $attr_name ) {
 	 * Replace the node's parent with itself if the parent is a <p> tag, has no attributes and has no other children.
 	 * This usually happens while `wpautop()` processes the element.
 	 *
+	 * @since 1.6
+	 *
 	 * @param DOMElement $node Node.
 	 */
 	protected function maybe_unwrap_p_element( DOMElement $node ) {
@@ -131,4 +133,49 @@ static function ( DOMNode $child ) {
 			}
 		}
 	}
+
+	/**
+	 * Removes the node's nearest <script> sibling with a `src` attribute containing the base `src` URL provided.
+	 *
+	 * @since 1.6
+	 *
+	 * @param DOMElement $node The DOMNode to whose sibling is the script to be removed.
+	 * @param string     $base_src_url Script URL to match against.
+	 */
+	protected function maybe_remove_script_sibling( DOMElement $node, $base_src_url ) {
+		$next_element_sibling = $node->nextSibling;
+
+		while ( $next_element_sibling && ! ( $next_element_sibling instanceof DOMElement ) ) {
+			$next_element_sibling = $next_element_sibling->nextSibling;
+		}
+
+		// Handle case where script is wrapped in paragraph by wpautop.
+		if ( $next_element_sibling instanceof DOMElement && 'p' === $next_element_sibling->nodeName ) {
+			$children = array_map(
+				static function ( DOMNode $child ) {
+					return $child instanceof DOMElement ? 1 : 0;
+				},
+				iterator_to_array( $node->childNodes )
+			);
+
+			if (
+				1 === count( $children) &&
+				'script' === $children[0]->nodeName &&
+				false !== strpos( $children->item( 0 )->getAttribute( 'src' ), $base_src_url )
+			) {
+				$next_element_sibling->parentNode->removeChild( $next_element_sibling );
+				return;
+			}
+		}
+
+		// Handle case where script is immediately following.
+		$is_embed_script = (
+			$next_element_sibling instanceof DOMElement &&
+			'script' === strtolower( $next_element_sibling->nodeName ) &&
+			false !== strpos( $next_element_sibling->getAttribute( 'src' ), $base_src_url )
+		);
+		if ( $is_embed_script ) {
+			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
+		}
+	}
 }
diff --git a/includes/embeds/class-amp-instagram-embed-handler.php b/includes/embeds/class-amp-instagram-embed-handler.php
index 97cef09aa31..0836ccbf294 100644
--- a/includes/embeds/class-amp-instagram-embed-handler.php
+++ b/includes/embeds/class-amp-instagram-embed-handler.php
@@ -110,7 +110,7 @@ private function create_amp_instagram_and_replace_node( $dom, $node ) {
 
 		$new_node = AMP_DOM_Utils::create_node( $dom, $this->amp_tag, $node_args );
 
-		$this->sanitize_embed_script( $node );
+		$this->maybe_remove_script_sibling( $node, 'instagram.com/embed.js' );
 
 		$node->parentNode->replaceChild( $new_node, $node );
 
@@ -132,39 +132,4 @@ private function get_instagram_id_from_url( $url ) {
 
 		return end( $matches );
 	}
-
-	/**
-	 * Removes Instagram's embed <script> tag.
-	 *
-	 * @param DOMElement $node The DOMNode to whose sibling is the instagram script.
-	 */
-	private function sanitize_embed_script( $node ) {
-		$next_element_sibling = $node->nextSibling;
-		while ( $next_element_sibling && ! ( $next_element_sibling instanceof DOMElement ) ) {
-			$next_element_sibling = $next_element_sibling->nextSibling;
-		}
-
-		$script_src = 'instagram.com/embed.js';
-
-		// Handle case where script is wrapped in paragraph by wpautop.
-		if ( $next_element_sibling instanceof DOMElement && 'p' === $next_element_sibling->nodeName ) {
-			$children = $next_element_sibling->getElementsByTagName( '*' );
-			if ( 1 === $children->length && 'script' === $children->item( 0 )->nodeName && false !== strpos( $children->item( 0 )->getAttribute( 'src' ), $script_src ) ) {
-				$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-				return;
-			}
-		}
-
-		// Handle case where script is immediately following.
-		$is_embed_script = (
-			$next_element_sibling instanceof DOMElement
-			&&
-			'script' === strtolower( $next_element_sibling->nodeName )
-			&&
-			false !== strpos( $next_element_sibling->getAttribute( 'src' ), $script_src )
-		);
-		if ( $is_embed_script ) {
-			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-		}
-	}
 }
diff --git a/includes/embeds/class-amp-tiktok-embed-handler.php b/includes/embeds/class-amp-tiktok-embed-handler.php
index 7158f7da8a3..c0d226d6a3a 100644
--- a/includes/embeds/class-amp-tiktok-embed-handler.php
+++ b/includes/embeds/class-amp-tiktok-embed-handler.php
@@ -67,7 +67,7 @@ protected function make_embed_amp_compatible( DOMElement $blockquote_node ) {
 			return;
 		}
 
-		$this->remove_embed_script( $blockquote_node );
+		$this->maybe_remove_script_sibling( $blockquote_node, 'tiktok.com/embed.js' );
 
 		$amp_node = AMP_DOM_Utils::create_node(
 			Document::fromNode( $dom ),
@@ -103,39 +103,4 @@ protected function make_embed_amp_compatible( DOMElement $blockquote_node ) {
 
 		$blockquote_node->parentNode->replaceChild( $amp_node, $blockquote_node );
 	}
-
-	/**
-	 * Remove the TikTok embed script if it exists.
-	 *
-	 * @param DOMElement $node The DOMNode to make AMP compatible.
-	 */
-	protected function remove_embed_script( DOMElement $node ) {
-		$next_element_sibling = $node->nextSibling;
-		while ( $next_element_sibling && ! ( $next_element_sibling instanceof DOMElement ) ) {
-			$next_element_sibling = $next_element_sibling->nextSibling;
-		}
-
-		$script_src = 'tiktok.com/embed.js';
-
-		// Handle case where script is wrapped in paragraph by wpautop.
-		if ( $next_element_sibling instanceof DOMElement && 'p' === $next_element_sibling->nodeName ) {
-			$children = $next_element_sibling->getElementsByTagName( '*' );
-			if ( 1 === $children->length && 'script' === $children->item( 0 )->nodeName && false !== strpos( $children->item( 0 )->getAttribute( 'src' ), $script_src ) ) {
-				$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-				return;
-			}
-		}
-
-		// Handle case where script is immediately following.
-		$is_embed_script = (
-			$next_element_sibling instanceof DOMElement
-			&&
-			'script' === strtolower( $next_element_sibling->nodeName )
-			&&
-			false !== strpos( $next_element_sibling->getAttribute( 'src' ), $script_src )
-		);
-		if ( $is_embed_script ) {
-			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-		}
-	}
 }
diff --git a/includes/embeds/class-amp-twitter-embed-handler.php b/includes/embeds/class-amp-twitter-embed-handler.php
index a12994ba2e3..d86245cf507 100644
--- a/includes/embeds/class-amp-twitter-embed-handler.php
+++ b/includes/embeds/class-amp-twitter-embed-handler.php
@@ -188,7 +188,8 @@ private function sanitize_raw_embed( $embed_type, DOMNodeList $nodes ) {
 
 			$new_node->appendChild( $placeholder );
 
-			$this->sanitize_embed_script( $node );
+			$this->remove_br_sibling_elements( $node );
+			$this->maybe_remove_script_sibling( $node, 'platform.twitter.com/widgets.js' );
 			// We can unwrap the <p> tag once the accompanied <script> is removed.
 			$this->maybe_unwrap_p_element( $node );
 
@@ -256,48 +257,16 @@ private function get_moment_id( $url ) {
 	}
 
 	/**
-	 * Removes Twitter's embed <script> tag.
+	 * Remove all <br> sibling elements for specified node.
 	 *
-	 * @param DOMElement $node The DOMNode to whose sibling is the Twitter script.
+	 * @param DOMElement $node The node to remove <br> siblings from.
 	 */
-	private function sanitize_embed_script( DOMElement $node ) {
+	private function remove_br_sibling_elements( DOMElement $node ) {
 		$next_element_sibling = $node->nextSibling;
 
-		// Remove any <br> siblings.
-		while ( $next_element_sibling && $next_element_sibling instanceof DOMElement && 'br' === $next_element_sibling->nodeName ) {
+		while ( $next_element_sibling && $next_element_sibling instanceof DOMElement &&'br' === $next_element_sibling->nodeName ) {
 			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
 			$next_element_sibling = $node->nextSibling;
 		}
-
-		if ( $next_element_sibling instanceof DOMElement && 'br' === $next_element_sibling->nodeName ) {
-			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-		}
-
-		while ( $next_element_sibling && ! ( $next_element_sibling instanceof DOMElement ) ) {
-			$next_element_sibling = $next_element_sibling->nextSibling;
-		}
-
-		$script_src = 'platform.twitter.com/widgets.js';
-
-		// Handle case where script is wrapped in paragraph by wpautop.
-		if ( $next_element_sibling instanceof DOMElement && 'p' === $next_element_sibling->nodeName ) {
-			$children = $next_element_sibling->getElementsByTagName( '*' );
-			if ( 1 === $children->length && 'script' === $children->item( 0 )->nodeName && false !== strpos( $children->item( 0 )->getAttribute( 'src' ), $script_src ) ) {
-				$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-				return;
-			}
-		}
-
-		// Handle case where script is immediately following.
-		$is_embed_script = (
-			$next_element_sibling instanceof DOMElement
-			&&
-			'script' === strtolower( $next_element_sibling->nodeName )
-			&&
-			false !== strpos( $next_element_sibling->getAttribute( 'src' ), $script_src )
-		);
-		if ( $is_embed_script ) {
-			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-		}
 	}
 }

From 050b9e75489ad6f1ba1a3cf4344f0064957eb5dd Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 18 May 2020 18:53:52 -0400
Subject: [PATCH 16/45] Simplify logic for retrieving embed IDs

---
 .../class-amp-dailymotion-embed-handler.php   | 47 ++++++++++++-------
 .../embeds/class-amp-gfycat-embed-handler.php | 24 +++++-----
 .../embeds/class-amp-hulu-embed-handler.php   | 20 ++------
 .../embeds/class-amp-scribd-embed-handler.php |  2 +-
 .../class-amp-soundcloud-embed-handler.php    | 36 +++++++-------
 .../embeds/class-amp-vimeo-embed-handler.php  | 20 +-------
 .../class-amp-wordpress-tv-embed-handler.php  | 29 ++----------
 7 files changed, 69 insertions(+), 109 deletions(-)

diff --git a/includes/embeds/class-amp-dailymotion-embed-handler.php b/includes/embeds/class-amp-dailymotion-embed-handler.php
index 41c6469e9a9..d358d791731 100644
--- a/includes/embeds/class-amp-dailymotion-embed-handler.php
+++ b/includes/embeds/class-amp-dailymotion-embed-handler.php
@@ -14,6 +14,11 @@
  */
 class AMP_DailyMotion_Embed_Handler extends AMP_Base_Embed_Handler {
 
+	/**
+	 * The 16:9 aspect ratio in decimal form.
+	 *
+	 * @var float
+	 */
 	const RATIO = 0.5625;
 
 	/**
@@ -101,29 +106,35 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 		$iframe_src = $iframe_node->getAttribute( 'src' );
 
 		$video_id = strtok( substr( $iframe_src, strlen( self::BASE_EMBED_URL ) ), '/?#' );
-		if ( ! empty( $video_id ) ) {
-			$args = [
-					'data-videoid' => $video_id,
-					'layout'       => 'responsive',
-					'width'        => $this->args['width'],
-					'height'       => $this->args['height'],
-				];
-
-			if ( $iframe_node->hasAttribute( 'width' ) ) {
-				$args['width'] = $iframe_node->getAttribute( 'width' );
-			}
-
-			if ( $iframe_node->hasAttribute( 'height' ) ) {
-				$args['height'] = $iframe_node->getAttribute( 'height' );
-			}
+		if ( empty( $video_id ) ) {
+			return;
+		}
 
-			$amp_node = AMP_DOM_Utils::create_node( Document::fromNode( $iframe_node ), 'amp-dailymotion', $args );
+		$attributes = [
+			'data-videoid' => $video_id,
+			'layout'       => 'responsive',
+			'width'        => $this->args['width'],
+			'height'       => $this->args['height'],
+		];
 
-			$this->maybe_unwrap_p_element( $iframe_node );
+		if ( $iframe_node->hasAttribute( 'width' ) ) {
+			$attributes['width'] = $iframe_node->getAttribute( 'width' );
+		}
 
-			$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
+		if ( $iframe_node->hasAttribute( 'height' ) ) {
+			$attributes['height'] = $iframe_node->getAttribute( 'height' );
 		}
 
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $iframe_node ),
+			'amp-dailymotion',
+			$attributes
+		);
+
+		$this->maybe_unwrap_p_element( $iframe_node );
+
+		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
+
 		// Nothing to be done if the video ID could not be found.
 	}
 }
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index 0d81e5afee8..2e5b1be8164 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -68,31 +68,31 @@ protected function is_raw_embed( DOMElement $node ) {
 	private function sanitize_raw_embed( DOMElement $iframe_node ) {
 		$iframe_src = $iframe_node->getAttribute( 'src' );
 
-		if ( ! preg_match( '#/ifr/([A-Za-z0-9]+)#', $iframe_src, $matches ) ) {
-			// Nothing to do if video ID could not be found.
+		$gfycat_id = strtok( substr( $iframe_src, strlen( self::BASE_EMBED_URL ) ), '/?#' );
+		if ( empty( $gfycat_id ) ) {
+			// Nothing to do if the ID could not be found.
 			return;
 		}
 
-		$new_attributes = [
-			'data-gfyid' => $matches[1],
+		$attributes = [
+			'data-gfyid' => $gfycat_id,
 			'layout'     => 'responsive',
-			'height'     => $iframe_node->getAttribute( 'height' ),
-			'width'      => $iframe_node->getAttribute( 'width' ),
+			'width'        => $this->args['width'],
+			'height'       => $this->args['height'],
 		];
 
-		if ( empty( $new_attributes['height'] ) ) {
-			return;
+		if ( $iframe_node->hasAttribute( 'width' ) ) {
+			$attributes['width'] = $iframe_node->getAttribute( 'width' );
 		}
 
-		if ( empty( $new_attributes['width'] ) ) {
-			$new_attributes['layout'] = 'fixed-height';
-			$new_attributes['width']  = 'auto';
+		if ( $iframe_node->hasAttribute( 'height' ) ) {
+			$attributes['height'] = $iframe_node->getAttribute( 'height' );
 		}
 
 		$amp_node = AMP_DOM_Utils::create_node(
 			Document::fromNode( $iframe_node ),
 			'amp-gfycat',
-			$new_attributes
+			$attributes
 		);
 
 		$this->maybe_unwrap_p_element( $iframe_node );
diff --git a/includes/embeds/class-amp-hulu-embed-handler.php b/includes/embeds/class-amp-hulu-embed-handler.php
index d201413e60d..eed1e56f2be 100644
--- a/includes/embeds/class-amp-hulu-embed-handler.php
+++ b/includes/embeds/class-amp-hulu-embed-handler.php
@@ -74,14 +74,14 @@ protected function is_raw_embed( DOMElement $node ) {
 	 */
 	private function sanitize_raw_embed( DOMElement $iframe_node ) {
 		$iframe_src = $iframe_node->getAttribute( 'src' );
-		$video_id   = $this->get_video_id( $iframe_src );
 
-		if ( ! $video_id ) {
+		parse_str( wp_parse_url( $iframe_src, PHP_URL_QUERY ), $query );
+		if ( empty( $query['eid'] ) ) {
 			return;
 		}
 
 		$attributes = [
-			'data-eid' => $video_id,
+			'data-eid' => $query['eid'],
 			'layout'   => 'responsive',
 			'width'    => $this->DEFAULT_WIDTH,
 			'height'   => $this->DEFAULT_HEIGHT,
@@ -105,18 +105,4 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 
 		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
 	}
-
-	/**
-	 * Get video from URL.
-	 *
-	 * @param string $url Video URL.
-	 * @return string|null Video ID, or null if it was not found.
-	 */
-	private function get_video_id( $url ) {
-		if ( preg_match( '#hulu\.com/embed\.html\?eid=(?P<id>[A-Za-z0-9_-]+)#', $url, $matches ) ) {
-			return $matches['id'];
-		}
-
-		return null;
-	}
 }
diff --git a/includes/embeds/class-amp-scribd-embed-handler.php b/includes/embeds/class-amp-scribd-embed-handler.php
index 0c2937d1b45..c07d1d2b1b9 100644
--- a/includes/embeds/class-amp-scribd-embed-handler.php
+++ b/includes/embeds/class-amp-scribd-embed-handler.php
@@ -69,7 +69,7 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 		$required_sandbox_permissions = 'allow-popups allow-scripts';
 		$iframe_node->setAttribute(
 			'sandbox',
-			sprintf( '%s %s', $iframe_node->getAttribute( 'sandbox' ), $required_sandbox_permissions )
+			$iframe_node->getAttribute( 'sandbox' ) . ' ' . $required_sandbox_permissions
 		);
 
 		// Remove the accompanied script tag so that the iframe can be later unwrapped.
diff --git a/includes/embeds/class-amp-soundcloud-embed-handler.php b/includes/embeds/class-amp-soundcloud-embed-handler.php
index aa46eef442d..18590daa789 100644
--- a/includes/embeds/class-amp-soundcloud-embed-handler.php
+++ b/includes/embeds/class-amp-soundcloud-embed-handler.php
@@ -74,24 +74,24 @@ protected function is_raw_embed( DOMElement $node ) {
 	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
 	private function sanitize_raw_embed( DOMElement $iframe_node ) {
-		$src   = html_entity_decode( $iframe_node->getAttribute( 'src' ), ENT_QUOTES );
-		$query = [];
-		parse_str( wp_parse_url( $src, PHP_URL_QUERY ), $query );
+		$src = $iframe_node->getAttribute( 'src' );
 
+		parse_str( wp_parse_url( $src, PHP_URL_QUERY ), $query );
 		if ( empty( $query['url'] ) ) {
 			return;
 		}
 
-		$attributes = [];
 		$embed_id   = $this->parse_embed_id_from_url( $query['url'] );
+		if ( null === $embed_id ) {
+			return;
+		}
+
+		$attributes = [];
 
 		if ( isset( $embed_id['track_id'] ) ) {
 			$attributes['data-trackid'] = $embed_id['track_id'];
 		} elseif ( isset( $embed_id['playlist_id'] ) ) {
 			$attributes['data-playlistid'] = $embed_id['playlist_id'];
-		} else {
-			// Return if the track nor playlist ID was found.
-			return;
 		}
 
 		$attributes['height'] = $iframe_node->hasAttribute( 'height' )
@@ -124,20 +124,18 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 	 * Get embed ID from Soundcloud iframe src.
 	 *
 	 * @param string $url URL.
-	 * @return array|null Array containing ID name and value if found.
+	 * @return array|null Array with key being the embed type and value being the embed ID, or null if embed type and ID could not be found.
 	 */
 	private function parse_embed_id_from_url( $url ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( preg_match( '#tracks/(?P<track_id>\d+)#', $parsed_url['path'], $matches ) ) {
-			return [
-				'track_id' => $matches['track_id'],
-			];
-		}
-		if ( preg_match( '#playlists/(?P<playlist_id>\d+)#', $parsed_url['path'], $matches ) ) {
-			return [
-				'playlist_id' => $matches['playlist_id'],
-			];
+		if ( preg_match( '#/player/(?P<type>tracks|playlists)/(?P<id>\d+)#', $url, $matches ) ) {
+			if ( 'tracks' === $matches['type'] ) {
+				return [ 'track_id' => $matches['id'] ];
+			}
+			if ( 'playlists' === $matches['type'] ) {
+				return [ 'playlist_id' => $matches['id'] ];
+			}
 		}
-		return [];
+
+		return null;
 	}
 }
diff --git a/includes/embeds/class-amp-vimeo-embed-handler.php b/includes/embeds/class-amp-vimeo-embed-handler.php
index 9a5f18f20ba..4be572fb167 100644
--- a/includes/embeds/class-amp-vimeo-embed-handler.php
+++ b/includes/embeds/class-amp-vimeo-embed-handler.php
@@ -104,9 +104,9 @@ protected function is_raw_embed( DOMElement $node ) {
 	 */
 	private function sanitize_raw_embed( DOMElement $iframe_node ) {
 		$iframe_src = $iframe_node->getAttribute( 'src' );
-		$video_id   = $this->get_video_id_from_url( $iframe_src );
 
-		if ( ! $video_id ) {
+		$video_id = strtok( substr( $iframe_src, strlen( self::BASE_EMBED_URL ) ), '/?#' );
+		if ( empty( $video_id ) ) {
 			return;
 		}
 
@@ -125,20 +125,4 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 
 		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
 	}
-
-	/**
-	 * Determine the video ID from the URL.
-	 *
-	 * @param string $url URL.
-	 * @return int Video ID.
-	 */
-	private function get_video_id_from_url( $url ) {
-		// @todo This will not get the private key for unlisted videos (which look like https://vimeo.com/123456789/abcdef0123), but amp-vimeo doesn't support them currently anyway.
-		$video_id = null;
-		if ( preg_match( ':/video/(\d+):', $url, $matches ) ) {
-			$video_id = $matches[1];
-		}
-
-		return $video_id;
-	}
 }
diff --git a/includes/embeds/class-amp-wordpress-tv-embed-handler.php b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
index 078878814a2..65f4071c545 100644
--- a/includes/embeds/class-amp-wordpress-tv-embed-handler.php
+++ b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
@@ -22,13 +22,6 @@ class AMP_WordPress_TV_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	const BASE_EMBED_URL = 'https://video.wordpress.com/embed/';
 
-	/**
-	 * The URL pattern to determine if an embed URL is for this type, copied from WP_oEmbed.
-	 *
-	 * @see https://github.com/WordPress/wordpress-develop/blob/e13480/src/wp-includes/class-wp-oembed.php#L64
-	 */
-	const URL_PATTERN = '#https?://wordpress\.tv/.*#i';
-
 	/**
 	 * Register embed.
 	 */
@@ -77,27 +70,15 @@ protected function is_raw_embed( DOMElement $node ) {
 	private function sanitize_raw_embed( DOMElement $iframe_node ) {
 		$next_sibling = $iframe_node->nextSibling;
 
-		if ( $next_sibling && 'script' === $next_sibling->nodeName ) {
+		if (
+			$next_sibling &&
+			'script' === $next_sibling->nodeName &&
+			false !== strpos( $next_sibling->getAttribute( 'src' ), 'v0.wordpress.com/js/next/videopress-iframe.js' )
+		) {
 			$iframe_node->parentNode->removeChild( $next_sibling );
 		}
 
 		$iframe_node->setAttribute( 'layout', 'responsive' );
 		$this->maybe_unwrap_p_element( $iframe_node );
 	}
-
-	/**
-	 * Filters the oembed HTML to make it valid AMP.
-	 *
-	 * @param mixed  $cache The cached rendered markup.
-	 * @param string $url   The embed URL.
-	 * @return string The filtered embed markup.
-	 */
-	public function filter_oembed_html( $cache, $url ) {
-		if ( ! preg_match( self::URL_PATTERN, $url ) ) {
-			return $cache;
-		}
-
-		$modified_block_content = preg_replace( '#<script(?:\s.*?)?>.*?</script>#s', '', $cache );
-		return null !== $modified_block_content ? $modified_block_content : $cache;
-	}
 }

From 6893a47898b28aab23978330f269e447d65ea916 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Mon, 18 May 2020 20:05:25 -0400
Subject: [PATCH 17/45] Fix tests

---
 .../embeds/class-amp-base-embed-handler.php   | 20 ++++++++++---------
 .../embeds/class-amp-gfycat-embed-handler.php |  6 +++---
 .../class-amp-soundcloud-embed-handler.php    |  8 ++++----
 .../class-amp-twitter-embed-handler.php       |  2 +-
 .../test-amp-dailymotion-embed-handler.php    |  4 ++--
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index faccc37e931..39ae75e9048 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -125,7 +125,7 @@ protected function maybe_unwrap_p_element( DOMElement $node ) {
 					static function ( DOMNode $child ) {
 						return $child instanceof DOMElement ? 1 : 0;
 					},
-					iterator_to_array( $node->childNodes )
+					iterator_to_array( $parent_element->childNodes )
 				)
 			);
 			if ( 1 === $child_element_count ) {
@@ -151,17 +151,19 @@ protected function maybe_remove_script_sibling( DOMElement $node, $base_src_url
 
 		// Handle case where script is wrapped in paragraph by wpautop.
 		if ( $next_element_sibling instanceof DOMElement && 'p' === $next_element_sibling->nodeName ) {
-			$children = array_map(
-				static function ( DOMNode $child ) {
-					return $child instanceof DOMElement ? 1 : 0;
-				},
-				iterator_to_array( $node->childNodes )
+			$children_elements = array_values(
+				array_filter(
+					iterator_to_array( $next_element_sibling->childNodes ),
+					static function ( DOMNode $child ) {
+						return $child instanceof DOMElement;
+					}
+				)
 			);
 
 			if (
-				1 === count( $children) &&
-				'script' === $children[0]->nodeName &&
-				false !== strpos( $children->item( 0 )->getAttribute( 'src' ), $base_src_url )
+				1 === count( $children_elements ) &&
+				'script' === $children_elements[0]->nodeName &&
+				false !== strpos( $children_elements[0]->getAttribute( 'src' ), $base_src_url )
 			) {
 				$next_element_sibling->parentNode->removeChild( $next_element_sibling );
 				return;
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index 2e5b1be8164..73b9d679e40 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -18,7 +18,7 @@ class AMP_Gfycat_Embed_Handler extends AMP_Base_Embed_Handler {
 	 *
 	 * @var string
 	 */
-	const BASE_EMBED_URL = 'www.hulu.com/embed.html';
+	const BASE_EMBED_URL = 'https://gfycat.com/ifr/';
 
 	/**
 	 * Register embed.
@@ -77,8 +77,8 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 		$attributes = [
 			'data-gfyid' => $gfycat_id,
 			'layout'     => 'responsive',
-			'width'        => $this->args['width'],
-			'height'       => $this->args['height'],
+			'height'     => $this->args['height'],
+			'width'      => $this->args['width'],
 		];
 
 		if ( $iframe_node->hasAttribute( 'width' ) ) {
diff --git a/includes/embeds/class-amp-soundcloud-embed-handler.php b/includes/embeds/class-amp-soundcloud-embed-handler.php
index 18590daa789..c5460580f9c 100644
--- a/includes/embeds/class-amp-soundcloud-embed-handler.php
+++ b/includes/embeds/class-amp-soundcloud-embed-handler.php
@@ -74,14 +74,14 @@ protected function is_raw_embed( DOMElement $node ) {
 	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
 	private function sanitize_raw_embed( DOMElement $iframe_node ) {
-		$src = $iframe_node->getAttribute( 'src' );
+		$iframe_src = $iframe_node->getAttribute( 'src' );
 
-		parse_str( wp_parse_url( $src, PHP_URL_QUERY ), $query );
+		parse_str( wp_parse_url( $iframe_src, PHP_URL_QUERY ), $query );
 		if ( empty( $query['url'] ) ) {
 			return;
 		}
 
-		$embed_id   = $this->parse_embed_id_from_url( $query['url'] );
+		$embed_id = $this->parse_embed_id_from_url( $query['url'] );
 		if ( null === $embed_id ) {
 			return;
 		}
@@ -127,7 +127,7 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 	 * @return array|null Array with key being the embed type and value being the embed ID, or null if embed type and ID could not be found.
 	 */
 	private function parse_embed_id_from_url( $url ) {
-		if ( preg_match( '#/player/(?P<type>tracks|playlists)/(?P<id>\d+)#', $url, $matches ) ) {
+		if ( preg_match( '#/(?P<type>tracks|playlists)/(?P<id>\d+)#', $url, $matches ) ) {
 			if ( 'tracks' === $matches['type'] ) {
 				return [ 'track_id' => $matches['id'] ];
 			}
diff --git a/includes/embeds/class-amp-twitter-embed-handler.php b/includes/embeds/class-amp-twitter-embed-handler.php
index d86245cf507..43d304ae29d 100644
--- a/includes/embeds/class-amp-twitter-embed-handler.php
+++ b/includes/embeds/class-amp-twitter-embed-handler.php
@@ -264,7 +264,7 @@ private function get_moment_id( $url ) {
 	private function remove_br_sibling_elements( DOMElement $node ) {
 		$next_element_sibling = $node->nextSibling;
 
-		while ( $next_element_sibling && $next_element_sibling instanceof DOMElement &&'br' === $next_element_sibling->nodeName ) {
+		while ( $next_element_sibling && $next_element_sibling instanceof DOMElement && 'br' === $next_element_sibling->nodeName ) {
 			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
 			$next_element_sibling = $node->nextSibling;
 		}
diff --git a/tests/php/test-amp-dailymotion-embed-handler.php b/tests/php/test-amp-dailymotion-embed-handler.php
index c316e860d47..d4058752b56 100644
--- a/tests/php/test-amp-dailymotion-embed-handler.php
+++ b/tests/php/test-amp-dailymotion-embed-handler.php
@@ -11,12 +11,12 @@ public function get_conversion_data() {
 
 			'url_simple'     => [
 				'https://www.dailymotion.com/video/x5awwth' . PHP_EOL,
-				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="600" height="338"></amp-dailymotion>' . PHP_EOL,
+				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="500" height="212"></amp-dailymotion>' . PHP_EOL,
 			],
 
 			'url_with_title' => [
 				'http://www.dailymotion.com/video/x5awwth_snatched-official-trailer-2-hd_shortfilms' . PHP_EOL,
-				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="600" height="338"></amp-dailymotion>' . PHP_EOL,
+				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="500" height="212"></amp-dailymotion>' . PHP_EOL,
 			],
 		];
 	}

From 34ca29c16c4fb8226cc3ca2fe76859ce7a19eba6 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 21 May 2020 10:35:37 -0400
Subject: [PATCH 18/45] Implement the Template Method design pattern

---
 .../embeds/class-amp-base-embed-handler.php   |  72 ++++++-
 .../class-amp-dailymotion-embed-handler.php   |  89 +++-----
 .../class-amp-facebook-embed-handler.php      | 195 ++++++++----------
 .../embeds/class-amp-gfycat-embed-handler.php |  67 ++----
 .../embeds/class-amp-hulu-embed-handler.php   |  71 +++----
 .../class-amp-instagram-embed-handler.php     |  66 ++----
 .../embeds/class-amp-scribd-embed-handler.php |  68 +-----
 .../class-amp-soundcloud-embed-handler.php    |  69 ++-----
 .../embeds/class-amp-tiktok-embed-handler.php |  60 ++----
 .../class-amp-twitter-embed-handler.php       |  41 ++--
 .../embeds/class-amp-vimeo-embed-handler.php  |  79 +++----
 .../class-amp-wordpress-tv-embed-handler.php  |  64 +-----
 .../class-amp-youtube-embed-handler.php       |  84 +++-----
 .../sanitizers/class-amp-embed-sanitizer.php  |   6 +-
 .../test-amp-dailymotion-embed-handler.php    |   2 -
 tests/php/test-amp-facebook-embed-handler.php |   2 -
 .../php/test-amp-instagram-embed-handler.php  |   2 -
 tests/php/test-amp-scribd-embed-handler.php   |   2 -
 .../php/test-amp-soundcloud-embed-handler.php |   2 -
 tests/php/test-amp-twitter-embed-handler.php  |   2 -
 tests/php/test-amp-vimeo-embed-handler.php    |   2 -
 .../test-class-amp-gfycat-embed-handler.php   |   2 -
 .../php/test-class-amp-hulu-embed-handler.php |   2 -
 .../test-class-amp-tiktok-embed-handler.php   |   1 -
 ...t-class-amp-wordpress-tv-embed-handler.php |   1 -
 .../test-class-amp-youtube-embed-handler.php  |   4 -
 26 files changed, 353 insertions(+), 702 deletions(-)

diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index 39ae75e9048..6d16065d5c1 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -7,6 +7,8 @@
  * @package  AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Base_Embed_Handler
  */
@@ -40,14 +42,18 @@ abstract class AMP_Base_Embed_Handler {
 	protected $did_convert_elements = false;
 
 	/**
-	 * Registers embed.
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
 	 */
-	abstract public function register_embed();
+	protected $amp_tag = 'amp-iframe';
 
 	/**
-	 * Unregisters embed.
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
 	 */
-	abstract public function unregister_embed();
+	protected $base_embed_url = '';
 
 	/**
 	 * Constructor.
@@ -64,6 +70,49 @@ public function __construct( $args = [] ) {
 		);
 	}
 
+	/**
+	 * Sanitize all embeds on the page to be AMP compatible.
+	 *
+	 * @param Document $dom DOM.
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $this->get_raw_embed_nodes( $dom );
+
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
+			}
+			$this->sanitize_raw_embed( $node );
+		}
+	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
+	}
+
+	/**
+	 * Determine if the node is indeed a raw embed.
+	 *
+	 * @param DOMElement $node DOM element.
+	 * @return bool True if it is a raw embed, false otherwise.
+	 */
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && $this->amp_tag !== $node->parentNode->nodeName;
+	}
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	abstract protected function sanitize_raw_embed( DOMElement $node );
+
 	/**
 	 * Get mapping of AMP component names to AMP script URLs.
 	 *
@@ -139,10 +188,11 @@ static function ( DOMNode $child ) {
 	 *
 	 * @since 1.6
 	 *
-	 * @param DOMElement $node The DOMNode to whose sibling is the script to be removed.
+	 * @param DOMElement $node         The DOMNode to whose sibling is the script to be removed.
 	 * @param string     $base_src_url Script URL to match against.
+	 * @param string     $content      Text content of node to match against.
 	 */
-	protected function maybe_remove_script_sibling( DOMElement $node, $base_src_url ) {
+	protected function maybe_remove_script_sibling( DOMElement $node, $base_src_url, $content = '' ) {
 		$next_element_sibling = $node->nextSibling;
 
 		while ( $next_element_sibling && ! ( $next_element_sibling instanceof DOMElement ) ) {
@@ -163,7 +213,10 @@ static function ( DOMNode $child ) {
 			if (
 				1 === count( $children_elements ) &&
 				'script' === $children_elements[0]->nodeName &&
-				false !== strpos( $children_elements[0]->getAttribute( 'src' ), $base_src_url )
+				(
+					( $base_src_url && false !== strpos( $children_elements[0]->getAttribute( 'src' ), $base_src_url ) ) ||
+					( $content && false !== strpos( $children_elements[0]->textContent, $content ) )
+				)
 			) {
 				$next_element_sibling->parentNode->removeChild( $next_element_sibling );
 				return;
@@ -174,7 +227,10 @@ static function ( DOMNode $child ) {
 		$is_embed_script = (
 			$next_element_sibling instanceof DOMElement &&
 			'script' === strtolower( $next_element_sibling->nodeName ) &&
-			false !== strpos( $next_element_sibling->getAttribute( 'src' ), $base_src_url )
+			(
+				( $base_src_url && false !== strpos( $next_element_sibling->getAttribute( 'src' ), $base_src_url ) ) ||
+				( $content && false !== strpos( $next_element_sibling->textContent, $content ) )
+			)
 		);
 		if ( $is_embed_script ) {
 			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
diff --git a/includes/embeds/class-amp-dailymotion-embed-handler.php b/includes/embeds/class-amp-dailymotion-embed-handler.php
index d358d791731..58cf7ac6742 100644
--- a/includes/embeds/class-amp-dailymotion-embed-handler.php
+++ b/includes/embeds/class-amp-dailymotion-embed-handler.php
@@ -21,13 +21,6 @@ class AMP_DailyMotion_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	const RATIO = 0.5625;
 
-	/**
-	 * Base URL used for identifying embeds.
-	 *
-	 * @var string
-	 */
-	const BASE_EMBED_URL = 'https://www.dailymotion.com/embed/video/';
-
 	/**
 	 * Default width.
 	 *
@@ -42,6 +35,20 @@ class AMP_DailyMotion_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $DEFAULT_HEIGHT = 338;
 
+	/**
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
+	 */
+	protected $amp_tag = 'amp-dailymotion';
+
+	/**
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
+	 */
+	protected $base_embed_url = 'https://www.dailymotion.com/embed/video/';
+
 	/**
 	 * AMP_DailyMotion_Embed_Handler constructor.
 	 *
@@ -58,54 +65,14 @@ public function __construct( $args = [] ) {
 	}
 
 	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Unregister embed.
-	 */
-	public function unregister_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Sanitize all DailyMotion <iframe> tags to <amp-dailymotion>.
-	 *
-	 * @param Document $dom DOM.
-	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
-
-		foreach ( $nodes as $node ) {
-			if ( ! $this->is_raw_embed( $node ) ) {
-				continue;
-			}
-			$this->sanitize_raw_embed( $node );
-		}
-	}
-
-	/**
-	 * Determine if the node has already been sanitized.
+	 * Make embed AMP compatible.
 	 *
-	 * @param DOMElement $node The DOMNode.
-	 * @return bool Whether the node is a raw embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	protected function is_raw_embed( DOMElement $node ) {
-		return $node->parentNode && 'amp-dailymotion' !== $node->parentNode->nodeName;
-	}
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
 
-	/**
-	 * Make DailyMotion embed AMP compatible.
-	 *
-	 * @param DOMElement $iframe_node The node to make AMP compatible.
-	 */
-	private function sanitize_raw_embed( DOMElement $iframe_node ) {
-		$iframe_src = $iframe_node->getAttribute( 'src' );
-
-		$video_id = strtok( substr( $iframe_src, strlen( self::BASE_EMBED_URL ) ), '/?#' );
+		$video_id = strtok( substr( $iframe_src, strlen( $this->base_embed_url ) ), '/?#' );
 		if ( empty( $video_id ) ) {
 			return;
 		}
@@ -117,24 +84,22 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 			'height'       => $this->args['height'],
 		];
 
-		if ( $iframe_node->hasAttribute( 'width' ) ) {
-			$attributes['width'] = $iframe_node->getAttribute( 'width' );
+		if ( $node->hasAttribute( 'width' ) ) {
+			$attributes['width'] = $node->getAttribute( 'width' );
 		}
 
-		if ( $iframe_node->hasAttribute( 'height' ) ) {
-			$attributes['height'] = $iframe_node->getAttribute( 'height' );
+		if ( $node->hasAttribute( 'height' ) ) {
+			$attributes['height'] = $node->getAttribute( 'height' );
 		}
 
 		$amp_node = AMP_DOM_Utils::create_node(
-			Document::fromNode( $iframe_node ),
-			'amp-dailymotion',
+			Document::fromNode( $node ),
+			$this->amp_tag,
 			$attributes
 		);
 
-		$this->maybe_unwrap_p_element( $iframe_node );
-
-		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
+		$this->maybe_unwrap_p_element( $node );
 
-		// Nothing to be done if the video ID could not be found.
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
diff --git a/includes/embeds/class-amp-facebook-embed-handler.php b/includes/embeds/class-amp-facebook-embed-handler.php
index 8811cf9fd81..6de59892360 100644
--- a/includes/embeds/class-amp-facebook-embed-handler.php
+++ b/includes/embeds/class-amp-facebook-embed-handler.php
@@ -19,72 +19,121 @@ class AMP_Facebook_Embed_Handler extends AMP_Base_Embed_Handler {
 	protected $DEFAULT_HEIGHT = 400;
 
 	/**
-	 * Tag.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
-	 * @var string embed HTML blockquote tag to identify and replace with AMP version.
+	 * @var string
 	 */
-	protected $sanitize_tag = 'div';
+	protected $amp_tag = 'amp-facebook';
 
 	/**
-	 * Tag.
+	 * Sanitize all embeds on the page to be AMP compatible.
 	 *
-	 * @var string AMP amp-facebook tag
+	 * @param Document $dom DOM.
 	 */
-	private $amp_tag = 'amp-facebook';
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $this->get_raw_embed_nodes( $dom );
 
-	/**
-	 * Registers embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
+		if ( 0 < $nodes->length ) {
+			foreach ( $nodes as $node ) {
+				if ( ! $this->is_raw_embed( $node ) ) {
+					continue;
+				}
+				$this->sanitize_raw_embed( $node );
+			}
+
+			$this->remove_fb_root_nodes( $dom );
+		}
 	}
 
 	/**
-	 * Unregisters embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function unregister_embed() {
-		// Not implemented.
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->getElementsByTagName( 'div' );
 	}
 
 	/**
-	 * Sanitized <div class="fb-video" data-href=> tags to <amp-facebook>.
+	 * Make embed AMP compatible.
 	 *
-	 * @param Document $dom DOM.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes     = $dom->getElementsByTagName( $this->sanitize_tag );
-		$num_nodes = $nodes->length;
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$embed_type = $this->get_embed_type( $node );
 
-		if ( 0 === $num_nodes ) {
+		if ( null === $embed_type ) {
 			return;
 		}
 
-		for ( $i = $num_nodes - 1; $i >= 0; $i-- ) {
-			$node = $nodes->item( $i );
-			if ( ! $node instanceof DOMElement ) {
-				continue;
+		$attributes = [
+			'data-amp-layout' => 'responsive',
+			'width'           => $node->hasAttribute( 'data-width' ) ? $node->getAttribute( 'data-width' ) : $this->DEFAULT_WIDTH,
+			'height'          => $node->hasAttribute( 'data-height' ) ? $node->getAttribute( 'data-height' ) : $this->DEFAULT_HEIGHT,
+		];
+
+		$node->removeAttribute( 'data-width' );
+		$node->removeAttribute( 'data-height' );
+
+		foreach ( $node->attributes as $attribute ) {
+			if ( 'data-' === substr( $attribute->nodeName, 0, 5 ) ) {
+				$attributes[ $attribute->nodeName ] = $attribute->nodeValue;
 			}
+		}
+
+		if ( 'page' === $embed_type ) {
+			$amp_tag = 'amp-facebook-page';
+		} elseif ( 'like' === $embed_type ) {
+			$amp_tag = 'amp-facebook-like';
+		} elseif ( 'comments' === $embed_type ) {
+			$amp_tag = 'amp-facebook-comments';
+		} else {
+			$amp_tag                     = $this->amp_tag;
+			$attributes['data-embed-as'] = $embed_type;
+		}
 
-			$embed_type = $this->get_embed_type( $node );
+		$amp_facebook_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$amp_tag,
+			$attributes
+		);
 
-			if ( null !== $embed_type ) {
-				$this->create_amp_facebook_and_replace_node( $dom, $node, $embed_type );
+		$fallback = null;
+		foreach ( $node->childNodes as $child_node ) {
+			if ( $child_node instanceof DOMElement && false !== strpos( $child_node->getAttribute( 'class' ), 'fb-xfbml-parse-ignore' ) ) {
+				$fallback = $child_node;
+				$child_node->parentNode->removeChild( $child_node );
+				$fallback->setAttribute( 'fallback', '' );
+				break;
 			}
 		}
 
-		/*
-		 * Remove the fb-root div and the Facebook Connect JS script since irrelevant.
-		 * <div id="fb-root"></div>
-		 * <script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v3.2"></script>
-		 */
-		$fb_root = $dom->getElementById( 'fb-root' );
-		if ( $fb_root ) {
-			/**
-			 * Script.
-			 *
-			 * @var DOMElement $script_query
-			 */
+		$node->parentNode->replaceChild( $amp_facebook_node, $node );
+		if ( $fallback ) {
+			$amp_facebook_node->appendChild( $fallback );
+		}
+
+		$this->did_convert_elements = true;
+	}
+
+	/**
+	 * Remove instances of the `fb-root` div element and its accompanied Facebook Connect JS script since they would be irrelevant.
+	 *
+	 * @param Document $dom DOM.
+	 */
+	private function remove_fb_root_nodes( Document $dom ) {
+		$fb_root_query = $dom->xpath->query( '//div[ @id = "fb-root" ]' );
+
+		if ( 0 < $fb_root_query->length ) {
+			// Remove instances of <div id="fb-root">.
+			foreach ( $fb_root_query as $fb_root ) {
+				$fb_root->parentNode->removeChild( $fb_root );
+			}
+
+			// Remove instances of the accompanied script.
 			$script_query = $dom->xpath->query( '//script[ starts-with( @src, "https://connect.facebook.net" ) and contains( @src, "sdk.js" ) ]' );
+
 			foreach ( $script_query as $script ) {
 				$parent_node = $script->parentNode;
 				$parent_node->removeChild( $script );
@@ -94,12 +143,6 @@ public function sanitize_raw_embeds( Document $dom ) {
 					$parent_node->parentNode->removeChild( $parent_node );
 				}
 			}
-
-			// Remove other instances of <div id="fb-root">.
-			$fb_root_query = $dom->xpath->query( '//div[ @id = "fb-root" ]' );
-			foreach ( $fb_root_query as $fb_root ) {
-				$fb_root->parentNode->removeChild( $fb_root );
-			}
 		}
 	}
 
@@ -141,66 +184,4 @@ private function get_embed_type( DOMElement $node ) {
 
 		return null;
 	}
-
-	/**
-	 * Create amp-facebook and replace node.
-	 *
-	 * @param Document   $dom        The HTML Document.
-	 * @param DOMElement $node       The DOMNode to adjust and replace.
-	 * @param string     $embed_type Embed type.
-	 */
-	private function create_amp_facebook_and_replace_node( Document $dom, DOMElement $node, $embed_type ) {
-
-		$attributes = [
-			// The layout sanitizer will convert this to `layout` when being sanitized.
-			// The data attribute needs to be used so that the layout sanitizer will process it.
-			'data-amp-layout' => 'responsive',
-			'width'           => $node->hasAttribute( 'data-width' ) ? $node->getAttribute( 'data-width' ) : $this->DEFAULT_WIDTH,
-			'height'          => $node->hasAttribute( 'data-height' ) ? $node->getAttribute( 'data-height' ) : $this->DEFAULT_HEIGHT,
-		];
-
-		$node->removeAttribute( 'data-width' );
-		$node->removeAttribute( 'data-height' );
-
-		foreach ( $node->attributes as $attribute ) {
-			if ( 'data-' === substr( $attribute->nodeName, 0, 5 ) ) {
-				$attributes[ $attribute->nodeName ] = $attribute->nodeValue;
-			}
-		}
-
-		if ( 'page' === $embed_type ) {
-			$amp_tag = 'amp-facebook-page';
-		} elseif ( 'like' === $embed_type ) {
-			$amp_tag = 'amp-facebook-like';
-		} elseif ( 'comments' === $embed_type ) {
-			$amp_tag = 'amp-facebook-comments';
-		} else {
-			$amp_tag = $this->amp_tag;
-
-			$attributes['data-embed-as'] = $embed_type;
-		}
-
-		$amp_facebook_node = AMP_DOM_Utils::create_node(
-			$dom,
-			$amp_tag,
-			$attributes
-		);
-
-		$fallback = null;
-		foreach ( $node->childNodes as $child_node ) {
-			if ( $child_node instanceof DOMElement && false !== strpos( $child_node->getAttribute( 'class' ), 'fb-xfbml-parse-ignore' ) ) {
-				$fallback = $child_node;
-				$child_node->parentNode->removeChild( $child_node );
-				$fallback->setAttribute( 'fallback', '' );
-				break;
-			}
-		}
-
-		$node->parentNode->replaceChild( $amp_facebook_node, $node );
-		if ( $fallback ) {
-			$amp_facebook_node->appendChild( $fallback );
-		}
-
-		$this->did_convert_elements = true;
-	}
 }
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index 73b9d679e40..06579a1b561 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -14,61 +14,28 @@
 class AMP_Gfycat_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	/**
-	 * Base URL used for identifying embeds.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
 	 * @var string
 	 */
-	const BASE_EMBED_URL = 'https://gfycat.com/ifr/';
-
-	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Unregister embed.
-	 */
-	public function unregister_embed() {
-		// Not implemented.
-	}
+	protected $amp_tag = 'amp-gfycat';
 
 	/**
-	 * Sanitize all gfycat <iframe> tags to <amp-gfycat>.
-	 *
-	 * @param Document $dom DOM.
-	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
-
-		foreach ( $nodes as $node ) {
-			if ( ! $this->is_raw_embed( $node ) ) {
-				continue;
-			}
-			$this->sanitize_raw_embed( $node );
-		}
-	}
-
-	/**
-	 * Determine if the node has already been sanitized.
+	 * Base URL used for identifying embeds.
 	 *
-	 * @param DOMElement $node The DOMNode.
-	 * @return bool Whether the node is a raw embed.
+	 * @var string
 	 */
-	protected function is_raw_embed( DOMElement $node ) {
-		return $node->parentNode && 'amp-gfycat' !== $node->parentNode->nodeName;
-	}
+	protected $base_embed_url = 'https://gfycat.com/ifr/';
 
 	/**
-	 * Make DailyMotion embed AMP compatible.
+	 * Make embed AMP compatible.
 	 *
-	 * @param DOMElement $iframe_node The node to make AMP compatible.
+	 * @param DOMElement $node DOM element.
 	 */
-	private function sanitize_raw_embed( DOMElement $iframe_node ) {
-		$iframe_src = $iframe_node->getAttribute( 'src' );
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
 
-		$gfycat_id = strtok( substr( $iframe_src, strlen( self::BASE_EMBED_URL ) ), '/?#' );
+		$gfycat_id = strtok( substr( $iframe_src, strlen( $this->base_embed_url ) ), '/?#' );
 		if ( empty( $gfycat_id ) ) {
 			// Nothing to do if the ID could not be found.
 			return;
@@ -81,23 +48,23 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 			'width'      => $this->args['width'],
 		];
 
-		if ( $iframe_node->hasAttribute( 'width' ) ) {
-			$attributes['width'] = $iframe_node->getAttribute( 'width' );
+		if ( $node->hasAttribute( 'width' ) ) {
+			$attributes['width'] = $node->getAttribute( 'width' );
 		}
 
-		if ( $iframe_node->hasAttribute( 'height' ) ) {
-			$attributes['height'] = $iframe_node->getAttribute( 'height' );
+		if ( $node->hasAttribute( 'height' ) ) {
+			$attributes['height'] = $node->getAttribute( 'height' );
 		}
 
 		$amp_node = AMP_DOM_Utils::create_node(
-			Document::fromNode( $iframe_node ),
+			Document::fromNode( $node ),
 			'amp-gfycat',
 			$attributes
 		);
 
-		$this->maybe_unwrap_p_element( $iframe_node );
+		$this->maybe_unwrap_p_element( $node );
 
-		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
 
diff --git a/includes/embeds/class-amp-hulu-embed-handler.php b/includes/embeds/class-amp-hulu-embed-handler.php
index eed1e56f2be..64830fc8073 100644
--- a/includes/embeds/class-amp-hulu-embed-handler.php
+++ b/includes/embeds/class-amp-hulu-embed-handler.php
@@ -13,13 +13,6 @@
  */
 class AMP_Hulu_Embed_Handler extends AMP_Base_Embed_Handler {
 
-	/**
-	 * Base URL used for identifying embeds.
-	 *
-	 * @var string
-	 */
-	const BASE_EMBED_URL = 'www.hulu.com/embed.html';
-
 	/**
 	 * Default height.
 	 *
@@ -28,52 +21,36 @@ class AMP_Hulu_Embed_Handler extends AMP_Base_Embed_Handler {
 	protected $DEFAULT_HEIGHT = 600;
 
 	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Unregister embed.
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
 	 */
-	public function unregister_embed() {
-		// Not implemented.
-	}
+	protected $amp_tag = 'amp-hulu';
 
 	/**
-	 * Sanitize all Hulu <iframe> tags to <amp-hulu>.
+	 * Base URL used for identifying embeds.
 	 *
-	 * @param Document $dom DOM.
+	 * @var string
 	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( sprintf( '//iframe[ contains( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
-
-		foreach ( $nodes as $node ) {
-			if ( ! $this->is_raw_embed( $node ) ) {
-				continue;
-			}
-			$this->sanitize_raw_embed( $node );
-		}
-	}
+	protected $base_embed_url = 'www.hulu.com/embed.html';
 
 	/**
-	 * Determine if the node has already been sanitized.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param DOMElement $node The DOMNode.
-	 * @return bool Whether the node is a raw embed.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	protected function is_raw_embed( DOMElement $node ) {
-		return $node->parentNode && 'amp-hulu' !== $node->parentNode->nodeName;
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ contains( @src, "%s" ) ]', $this->base_embed_url ) );
 	}
 
 	/**
-	 * Make Hulu embed AMP compatible.
+	 * Make embed AMP compatible.
 	 *
-	 * @param DOMElement $iframe_node The node to make AMP compatible.
+	 * @param DOMElement $node DOM element.
 	 */
-	private function sanitize_raw_embed( DOMElement $iframe_node ) {
-		$iframe_src = $iframe_node->getAttribute( 'src' );
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
 
 		parse_str( wp_parse_url( $iframe_src, PHP_URL_QUERY ), $query );
 		if ( empty( $query['eid'] ) ) {
@@ -87,22 +64,22 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 			'height'   => $this->DEFAULT_HEIGHT,
 		];
 
-		if ( $iframe_node->hasAttribute( 'width' ) ) {
-			$attributes['width'] = $iframe_node->getAttribute( 'width' );
+		if ( $node->hasAttribute( 'width' ) ) {
+			$attributes['width'] = $node->getAttribute( 'width' );
 		}
 
-		if ( $iframe_node->hasAttribute( 'height' ) ) {
-			$attributes['height'] = $iframe_node->getAttribute( 'height' );
+		if ( $node->hasAttribute( 'height' ) ) {
+			$attributes['height'] = $node->getAttribute( 'height' );
 		}
 
 		$amp_node = AMP_DOM_Utils::create_node(
-			Document::fromNode( $iframe_node ),
-			'amp-hulu',
+			Document::fromNode( $node ),
+			$this->amp_tag,
 			$attributes
 		);
 
-		$this->maybe_unwrap_p_element( $iframe_node );
+		$this->maybe_unwrap_p_element( $node );
 
-		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
diff --git a/includes/embeds/class-amp-instagram-embed-handler.php b/includes/embeds/class-amp-instagram-embed-handler.php
index 0836ccbf294..40ec7aba50a 100644
--- a/includes/embeds/class-amp-instagram-embed-handler.php
+++ b/includes/embeds/class-amp-instagram-embed-handler.php
@@ -31,70 +31,32 @@ class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
 	protected $DEFAULT_HEIGHT = 600;
 
 	/**
-	 * Tag.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
-	 * @var string embed HTML blockquote tag to identify and replace with AMP version.
+	 * @var string
 	 */
-	protected $sanitize_tag = 'blockquote';
+	protected $amp_tag = 'amp-instagram';
 
 	/**
-	 * Tag.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @var string AMP amp-instagram tag
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	private $amp_tag = 'amp-instagram';
-
-	/**
-	 * Registers embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Unregisters embed.
-	 */
-	public function unregister_embed() {
-		// Not implemented.
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->getElementsByTagName( 'blockquote' );
 	}
 
 	/**
-	 * Sanitized <blockquote class="instagram-media"> tags to <amp-instagram>
+	 * Make embed AMP compatible.
 	 *
-	 * @param Document $dom DOM.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		/**
-		 * Node list.
-		 *
-		 * @var DOMNodeList $nodes
-		 */
-		$nodes     = $dom->getElementsByTagName( $this->sanitize_tag );
-		$num_nodes = $nodes->length;
-
-		if ( 0 === $num_nodes ) {
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		if ( ! $node->hasAttribute( 'data-instgrm-permalink' ) ) {
 			return;
 		}
 
-		for ( $i = $num_nodes - 1; $i >= 0; $i-- ) {
-			$node = $nodes->item( $i );
-			if ( ! $node instanceof DOMElement ) {
-				continue;
-			}
-
-			if ( $node->hasAttribute( 'data-instgrm-permalink' ) ) {
-				$this->create_amp_instagram_and_replace_node( $dom, $node );
-			}
-		}
-	}
-
-	/**
-	 * Make final modifications to DOMNode
-	 *
-	 * @param Document   $dom The HTML Document.
-	 * @param DOMElement $node The DOMNode to adjust and replace.
-	 */
-	private function create_amp_instagram_and_replace_node( $dom, $node ) {
 		$instagram_id = $this->get_instagram_id_from_url( $node->getAttribute( 'data-instgrm-permalink' ) );
 
 		$node_args = [
@@ -108,13 +70,11 @@ private function create_amp_instagram_and_replace_node( $dom, $node ) {
 			$node_args['data-captioned'] = '';
 		}
 
-		$new_node = AMP_DOM_Utils::create_node( $dom, $this->amp_tag, $node_args );
+		$new_node = AMP_DOM_Utils::create_node( Document::fromNode( $node ), $this->amp_tag, $node_args );
 
 		$this->maybe_remove_script_sibling( $node, 'instagram.com/embed.js' );
 
 		$node->parentNode->replaceChild( $new_node, $node );
-
-		$this->did_convert_elements = true;
 	}
 
 	/**
diff --git a/includes/embeds/class-amp-scribd-embed-handler.php b/includes/embeds/class-amp-scribd-embed-handler.php
index c07d1d2b1b9..87d031bab93 100644
--- a/includes/embeds/class-amp-scribd-embed-handler.php
+++ b/includes/embeds/class-amp-scribd-embed-handler.php
@@ -6,8 +6,6 @@
  * @since 1.4
  */
 
-use AmpProject\Dom\Document;
-
 /**
  * Class AMP_Scribd_Embed_Handler
  */
@@ -18,71 +16,23 @@ class AMP_Scribd_Embed_Handler extends AMP_Base_Embed_Handler {
 	 *
 	 * @var string
 	 */
-	const BASE_EMBED_URL = 'https://www.scribd.com/embeds/';
-
-	/**
-	 * Registers embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Unregisters embed.
-	 */
-	public function unregister_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Sanitize all gfycat <iframe> tags to <amp-gfycat>.
-	 *
-	 * @param Document $dom DOM.
-	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
-
-		foreach ( $nodes as $node ) {
-			if ( ! $this->is_raw_embed( $node ) ) {
-				continue;
-			}
-			$this->sanitize_raw_embed( $node );
-		}
-	}
+	protected $base_embed_url = 'https://www.scribd.com/embeds/';
 
 	/**
-	 * Determine if the node has already been sanitized.
+	 * Make embed AMP compatible.
 	 *
-	 * @param DOMElement $node The DOMNode.
-	 * @return bool Whether the node is a raw embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	protected function is_raw_embed( DOMElement $node ) {
-		return $node->parentNode && 'amp-iframe' !== $node->parentNode->nodeName;
-	}
-
-	/**
-	 * Make Scribd embed AMP compatible.
-	 *
-	 * @param DOMElement $iframe_node The node to make AMP compatible.
-	 */
-	private function sanitize_raw_embed( DOMElement $iframe_node ) {
+	protected function sanitize_raw_embed( DOMElement $node ) {
 		$required_sandbox_permissions = 'allow-popups allow-scripts';
-		$iframe_node->setAttribute(
+		$node->setAttribute(
 			'sandbox',
-			$iframe_node->getAttribute( 'sandbox' ) . ' ' . $required_sandbox_permissions
+			$node->getAttribute( 'sandbox' ) . ' ' . $required_sandbox_permissions
 		);
+		$node->setAttribute( 'layout', 'responsive' );
 
-		// Remove the accompanied script tag so that the iframe can be later unwrapped.
-		if ( 'script' === $iframe_node->nextSibling->nodeName ) {
-			$parent_element = AMP_DOM_Utils::get_parent_element( $iframe_node );
-			if ( $parent_element ) {
-				$parent_element->removeChild( $iframe_node->nextSibling );
-			}
-		}
-
-		$iframe_node->setAttribute( 'layout', 'responsive' );
-
-		$this->maybe_unwrap_p_element( $iframe_node );
+		$this->maybe_remove_script_sibling( $node, null, 'scribd.com/javascripts/embed_code/inject.j' );
+		$this->maybe_unwrap_p_element( $node );
 
 		// The iframe sanitizer will further sanitize and convert this into an amp-iframe.
 	}
diff --git a/includes/embeds/class-amp-soundcloud-embed-handler.php b/includes/embeds/class-amp-soundcloud-embed-handler.php
index c5460580f9c..519ea62a698 100644
--- a/includes/embeds/class-amp-soundcloud-embed-handler.php
+++ b/includes/embeds/class-amp-soundcloud-embed-handler.php
@@ -14,13 +14,6 @@
  */
 class AMP_SoundCloud_Embed_Handler extends AMP_Base_Embed_Handler {
 
-	/**
-	 * Base URL used for identifying embeds.
-	 *
-	 * @var string
-	 */
-	const BASE_EMBED_URL = 'https://w.soundcloud.com/player/';
-
 	/**
 	 * Default height.
 	 *
@@ -29,52 +22,26 @@ class AMP_SoundCloud_Embed_Handler extends AMP_Base_Embed_Handler {
 	protected $DEFAULT_HEIGHT = 200;
 
 	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Unregister embed.
-	 */
-	public function unregister_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Sanitize all SoundCloud <iframe> tags to <amp-soundcloud>.
+	 * Base URL used for identifying embeds.
 	 *
-	 * @param Document $dom DOM.
+	 * @var string
 	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
-
-		foreach ( $nodes as $node ) {
-			if ( ! $this->is_raw_embed( $node ) ) {
-				continue;
-			}
-			$this->sanitize_raw_embed( $node );
-		}
-	}
+	protected $base_embed_url = 'https://w.soundcloud.com/player/';
 
 	/**
-	 * Determine if the node has already been sanitized.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
-	 * @param DOMElement $node The DOMNode.
-	 * @return bool Whether the node is a raw embed.
+	 * @var string
 	 */
-	protected function is_raw_embed( DOMElement $node ) {
-		return $node->parentNode && 'amp-soundcloud' !== $node->parentNode->nodeName;
-	}
+	protected $amp_tag = 'amp-soundcloud';
 
 	/**
-	 * Make SoundCloud embed AMP compatible.
+	 * Make embed AMP compatible.
 	 *
-	 * @param DOMElement $iframe_node The node to make AMP compatible.
+	 * @param DOMElement $node DOM element.
 	 */
-	private function sanitize_raw_embed( DOMElement $iframe_node ) {
-		$iframe_src = $iframe_node->getAttribute( 'src' );
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
 
 		parse_str( wp_parse_url( $iframe_src, PHP_URL_QUERY ), $query );
 		if ( empty( $query['url'] ) ) {
@@ -94,12 +61,12 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 			$attributes['data-playlistid'] = $embed_id['playlist_id'];
 		}
 
-		$attributes['height'] = $iframe_node->hasAttribute( 'height' )
-			? $iframe_node->getAttribute( 'height' )
+		$attributes['height'] = $node->hasAttribute( 'height' )
+			? $node->getAttribute( 'height' )
 			: $this->args['height'];
 
-		if ( $iframe_node->hasAttribute( 'width' ) ) {
-			$attributes['width']  = $iframe_node->getAttribute( 'width' );
+		if ( $node->hasAttribute( 'width' ) ) {
+			$attributes['width']  = $node->getAttribute( 'width' );
 			$attributes['layout'] = 'responsive';
 		} else {
 			$attributes['layout'] = 'fixed-height';
@@ -110,14 +77,14 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 		}
 
 		$amp_node = AMP_DOM_Utils::create_node(
-			Document::fromNode( $iframe_node ),
-			'amp-soundcloud',
+			Document::fromNode( $node ),
+			$this->amp_tag,
 			$attributes
 		);
 
-		$this->maybe_unwrap_p_element( $iframe_node );
+		$this->maybe_unwrap_p_element( $node );
 
-		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 
 	/**
diff --git a/includes/embeds/class-amp-tiktok-embed-handler.php b/includes/embeds/class-amp-tiktok-embed-handler.php
index c0d226d6a3a..97edcdb02bf 100644
--- a/includes/embeds/class-amp-tiktok-embed-handler.php
+++ b/includes/embeds/class-amp-tiktok-embed-handler.php
@@ -13,65 +13,41 @@
 class AMP_TikTok_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	/**
-	 * Registers embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Unregisters embed.
-	 */
-	public function unregister_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Sanitize TikTok embeds to be AMP compatible.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
-	 * @param Document $dom DOM.
+	 * @var string
 	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( '//blockquote[ contains( @class, "tiktok-embed" ) ]' );
-
-		foreach ( $nodes as $node ) {
-			if ( ! $this->is_raw_embed( $node ) ) {
-				continue;
-			}
-
-			$this->make_embed_amp_compatible( $node );
-		}
-	}
+	protected $amp_tag = 'amp-embedly-card';
 
 	/**
-	 * Determine if the node has already been sanitized.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param DOMElement $node The DOMNode.
-	 * @return bool Whether the node is a raw embed.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	protected function is_raw_embed( DOMElement $node ) {
-		return ! $node->firstChild || ( $node->firstChild && 'amp-embedly-card' !== $node->firstChild->nodeName );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( '//blockquote[ contains( @class, "tiktok-embed" ) ]' );
 	}
 
 	/**
-	 * Make TikTok embed AMP compatible.
+	 * Make embed AMP compatible.
 	 *
-	 * @param DOMElement $blockquote_node The <blockquote> node to make AMP compatible.
+	 * @param DOMElement $node DOM element.
 	 */
-	protected function make_embed_amp_compatible( DOMElement $blockquote_node ) {
-		$dom       = $blockquote_node->ownerDocument;
-		$video_url = $blockquote_node->getAttribute( 'cite' );
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$dom       = $node->ownerDocument;
+		$video_url = $node->getAttribute( 'cite' );
 
 		// If there is no video ID, stop here as its needed for the `data-url` parameter.
 		if ( empty( $video_url ) ) {
 			return;
 		}
 
-		$this->maybe_remove_script_sibling( $blockquote_node, 'tiktok.com/embed.js' );
+		$this->maybe_remove_script_sibling( $node, 'tiktok.com/embed.js' );
 
 		$amp_node = AMP_DOM_Utils::create_node(
 			Document::fromNode( $dom ),
-			'amp-embedly-card',
+			$this->amp_tag,
 			[
 				'layout'             => 'responsive',
 				'height'             => 700,
@@ -82,7 +58,7 @@ protected function make_embed_amp_compatible( DOMElement $blockquote_node ) {
 		);
 
 		// Find existing <section> node to use as the placeholder.
-		foreach ( iterator_to_array( $blockquote_node->childNodes ) as $child ) {
+		foreach ( iterator_to_array( $node->childNodes ) as $child ) {
 			if ( ! ( $child instanceof DOMElement ) ) {
 				continue;
 			}
@@ -94,13 +70,13 @@ protected function make_embed_amp_compatible( DOMElement $blockquote_node ) {
 				 *
 				 * @var DOMElement $placeholder_node
 				 */
-				$placeholder_node = $blockquote_node->removeChild( $child );
+				$placeholder_node = $node->removeChild( $child );
 				$placeholder_node->setAttribute( 'placeholder', '' );
 				$amp_node->appendChild( $placeholder_node );
 				break;
 			}
 		}
 
-		$blockquote_node->parentNode->replaceChild( $amp_node, $blockquote_node );
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
diff --git a/includes/embeds/class-amp-twitter-embed-handler.php b/includes/embeds/class-amp-twitter-embed-handler.php
index 43d304ae29d..b88f16d957c 100644
--- a/includes/embeds/class-amp-twitter-embed-handler.php
+++ b/includes/embeds/class-amp-twitter-embed-handler.php
@@ -39,21 +39,14 @@ class AMP_Twitter_Embed_Handler extends AMP_Base_Embed_Handler {
 	const URL_PATTERN_TIMELINE = '#https?:\/\/twitter\.com(?:\/\#\!\/|\/)(?P<username>[a-zA-Z0-9_]{1,20})(?:$|\/(?P<type>likes|lists|timelines)(\/(?P<id>[a-zA-Z0-9_-]+))?|.+?)#i';
 
 	/**
-	 * Registers embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Unregisters embed.
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
 	 */
-	public function unregister_embed() {
-		// Not implemented.
-	}
+	protected $amp_tag = 'amp-twitter';
 
 	/**
-	 * Sanitized <blockquote class="twitter-tweet"> tags to <amp-twitter>.
+	 * Sanitize all embeds on the page to be AMP compatible.
 	 *
 	 * @param Document $dom DOM.
 	 */
@@ -70,7 +63,7 @@ public function sanitize_raw_embeds( Document $dom ) {
 	 */
 	private function sanitize_tweet_embeds( Document $dom ) {
 		$nodes = $dom->xpath->query( '//blockquote[ @class = "twitter-tweet" ]' );
-		$this->sanitize_raw_embed( 'tweet', $nodes );
+		$this->sanitize_raw_embeds_with_type( 'tweet', $nodes );
 	}
 
 	/**
@@ -80,7 +73,7 @@ private function sanitize_tweet_embeds( Document $dom ) {
 	 */
 	private function sanitize_timeline_embeds( Document $dom ) {
 		$nodes = $dom->xpath->query( '//a[ @class = "twitter-timeline" ]' );
-		$this->sanitize_raw_embed( 'timeline', $nodes );
+		$this->sanitize_raw_embeds_with_type( 'timeline', $nodes );
 	}
 
 	/**
@@ -90,26 +83,25 @@ private function sanitize_timeline_embeds( Document $dom ) {
 	 */
 	private function sanitize_moment_embeds( Document $dom ) {
 		$nodes = $dom->xpath->query( '//a[ @class = "twitter-moment" ]' );
-		$this->sanitize_raw_embed( 'moment', $nodes );
+		$this->sanitize_raw_embeds_with_type( 'moment', $nodes );
 	}
 
 	/**
-	 * Checks whether it's a twitter AMP component.
+	 * Make embed AMP compatible.
 	 *
-	 * @param DOMElement $node The DOMNode to adjust and replace.
-	 * @return bool Whether node is for raw embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	private function is_raw_embed( DOMElement $node ) {
-		return $node->parentNode && 'amp-twitter' !== $node->parentNode->nodeName;
+	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		// Not implemented.
 	}
 
 	/**
-	 * Make final modifications to DOMNode
+	 * Sanitize list of raw embeds based on the embed type.
 	 *
 	 * @param string      $embed_type The type of Twitter embed.
 	 * @param DOMNodeList $nodes List of DOMElement nodes.
 	 */
-	private function sanitize_raw_embed( $embed_type, DOMNodeList $nodes ) {
+	protected function sanitize_raw_embeds_with_type( $embed_type, DOMNodeList $nodes ) {
 		foreach ( $nodes as $node ) {
 			/**
 			 * Node.
@@ -204,11 +196,6 @@ private function sanitize_raw_embed( $embed_type, DOMNodeList $nodes ) {
 	 * @return string Tweet ID.
 	 */
 	private function get_tweet_id( DOMElement $node ) {
-		/**
-		 * DOMNode
-		 *
-		 * @var DOMNodeList $anchors
-		 */
 		$anchors = $node->getElementsByTagName( 'a' );
 
 		/**
diff --git a/includes/embeds/class-amp-vimeo-embed-handler.php b/includes/embeds/class-amp-vimeo-embed-handler.php
index 4be572fb167..bc31b4fe8b0 100644
--- a/includes/embeds/class-amp-vimeo-embed-handler.php
+++ b/includes/embeds/class-amp-vimeo-embed-handler.php
@@ -14,13 +14,6 @@
  */
 class AMP_Vimeo_Embed_Handler extends AMP_Base_Embed_Handler {
 
-	/**
-	 * Base URL used for identifying embeds.
-	 *
-	 * @var string
-	 */
-	const BASE_EMBED_URL = 'https://player.vimeo.com/video/';
-
 	/**
 	 * The aspect ratio.
 	 *
@@ -42,6 +35,20 @@ class AMP_Vimeo_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $DEFAULT_HEIGHT = 338;
 
+	/**
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
+	 */
+	protected $base_embed_url = 'https://player.vimeo.com/video/';
+
+	/**
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
+	 */
+	protected $amp_tag = 'amp-vimeo';
+
 	/**
 	 * AMP_Vimeo_Embed_Handler constructor.
 	 *
@@ -58,61 +65,21 @@ public function __construct( $args = [] ) {
 	}
 
 	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Unregister embed.
-	 */
-	public function unregister_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Sanitize all Vimeo <iframe> tags to <amp-vimeo>.
-	 *
-	 * @param Document $dom DOM.
-	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( sprintf( '//iframe[ contains( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
-
-		foreach ( $nodes as $node ) {
-			if ( ! $this->is_raw_embed( $node ) ) {
-				continue;
-			}
-			$this->sanitize_raw_embed( $node );
-		}
-	}
-
-	/**
-	 * Determine if the node has already been sanitized.
-	 *
-	 * @param DOMElement $node The DOMNode.
-	 * @return bool Whether the node is a raw embed.
-	 */
-	protected function is_raw_embed( DOMElement $node ) {
-		return $node->parentNode && 'amp-vimeo' !== $node->parentNode->nodeName;
-	}
-
-	/**
-	 * Make Vimeo embed AMP compatible.
+	 * Make embed AMP compatible.
 	 *
-	 * @param DOMElement $iframe_node The node to make AMP compatible.
+	 * @param DOMElement $node DOM element.
 	 */
-	private function sanitize_raw_embed( DOMElement $iframe_node ) {
-		$iframe_src = $iframe_node->getAttribute( 'src' );
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
 
-		$video_id = strtok( substr( $iframe_src, strlen( self::BASE_EMBED_URL ) ), '/?#' );
+		$video_id = strtok( substr( $iframe_src, strlen( $this->base_embed_url ) ), '/?#' );
 		if ( empty( $video_id ) ) {
 			return;
 		}
 
 		$amp_node = AMP_DOM_Utils::create_node(
-			Document::fromNode( $iframe_node ),
-			'amp-vimeo',
+			Document::fromNode( $node ),
+			$this->amp_tag,
 			[
 				'data-videoid' => $video_id,
 				'layout'       => 'responsive',
@@ -121,8 +88,8 @@ private function sanitize_raw_embed( DOMElement $iframe_node ) {
 			]
 		);
 
-		$this->maybe_unwrap_p_element( $iframe_node );
+		$this->maybe_unwrap_p_element( $node );
 
-		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
diff --git a/includes/embeds/class-amp-wordpress-tv-embed-handler.php b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
index 65f4071c545..763463857ca 100644
--- a/includes/embeds/class-amp-wordpress-tv-embed-handler.php
+++ b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
@@ -6,8 +6,6 @@
  * @since 1.4
  */
 
-use AmpProject\Dom\Document;
-
 /**
  * Class AMP_WordPress_TV_Embed_Handler
  *
@@ -20,65 +18,17 @@ class AMP_WordPress_TV_Embed_Handler extends AMP_Base_Embed_Handler {
 	 *
 	 * @var string
 	 */
-	const BASE_EMBED_URL = 'https://video.wordpress.com/embed/';
-
-	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
+	protected $base_embed_url = 'https://video.wordpress.com/embed/';
 
 	/**
-	 * Unregister embed.
-	 */
-	public function unregister_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Sanitize all WordPress TV <iframe> tags to <amp-iframe>.
+	 * Make embed AMP compatible.
 	 *
-	 * @param Document $dom DOM.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( sprintf( '//iframe[ contains( @src, "%s" ) ]', self::BASE_EMBED_URL ) );
-
-		foreach ( $nodes as $node ) {
-			if ( ! $this->is_raw_embed( $node ) ) {
-				continue;
-			}
-			$this->sanitize_raw_embed( $node );
-		}
-	}
-
-	/**
-	 * Determine if the node has already been sanitized.
-	 *
-	 * @param DOMElement $node The DOMNode.
-	 * @return bool Whether the node is a raw embed.
-	 */
-	protected function is_raw_embed( DOMElement $node ) {
-		return $node->parentNode && 'amp-iframe' !== $node->parentNode->nodeName;
-	}
-
-	/**
-	 * Make WordPress TV embed AMP compatible.
-	 *
-	 * @param DOMElement $iframe_node The node to make AMP compatible.
-	 */
-	private function sanitize_raw_embed( DOMElement $iframe_node ) {
-		$next_sibling = $iframe_node->nextSibling;
-
-		if (
-			$next_sibling &&
-			'script' === $next_sibling->nodeName &&
-			false !== strpos( $next_sibling->getAttribute( 'src' ), 'v0.wordpress.com/js/next/videopress-iframe.js' )
-		) {
-			$iframe_node->parentNode->removeChild( $next_sibling );
-		}
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$node->setAttribute( 'layout', 'responsive' );
 
-		$iframe_node->setAttribute( 'layout', 'responsive' );
-		$this->maybe_unwrap_p_element( $iframe_node );
+		$this->maybe_remove_script_sibling( $node, 'v0.wordpress.com/js/next/videopress-iframe.js' );
+		$this->maybe_unwrap_p_element( $node );
 	}
 }
diff --git a/includes/embeds/class-amp-youtube-embed-handler.php b/includes/embeds/class-amp-youtube-embed-handler.php
index a9a2d1de402..b5a9fb916fa 100644
--- a/includes/embeds/class-amp-youtube-embed-handler.php
+++ b/includes/embeds/class-amp-youtube-embed-handler.php
@@ -35,6 +35,13 @@ class AMP_YouTube_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $DEFAULT_HEIGHT = 338;
 
+	/**
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
+	 */
+	protected $amp_tag = 'amp-youtube';
+
 	/**
 	 * AMP_YouTube_Embed_Handler constructor.
 	 *
@@ -52,58 +59,24 @@ public function __construct( $args = [] ) {
 	}
 
 	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Unregister embed.
-	 */
-	public function unregister_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Sanitize all YouTube <iframe> tags to <amp-youtube>.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param Document $dom DOM.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( '//iframe[ @src ]' );
-
-		foreach ( $nodes as $node ) {
-			if ( ! $this->is_raw_embed( $node ) ) {
-				continue;
-			}
-
-			$iframe_src = $node->getAttribute( 'src' );
-			$video_id   = $this->get_video_id_from_url( $iframe_src );
-
-			if ( $video_id ) {
-				$this->sanitize_raw_embed( $node, $video_id );
-			}
-		}
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( '//iframe[ @src ]' );
 	}
 
 	/**
-	 * Determine if the node has already been sanitized.
+	 * Make embed AMP compatible.
 	 *
-	 * @param DOMElement $node The DOMNode.
-	 * @return bool Whether the node is a raw embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	protected function is_raw_embed( DOMElement $node ) {
-		return $node->parentNode && 'amp-youtube' !== $node->parentNode->nodeName;
-	}
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
+		$video_id   = $this->get_video_id_from_url( $iframe_src );
 
-	/**
-	 * Make DailyMotion embed AMP compatible.
-	 *
-	 * @param DOMElement $iframe_node The node to make AMP compatible.
-	 * @param string     $video_id Video ID.
-	 */
-	private function sanitize_raw_embed( DOMElement $iframe_node, $video_id ) {
 		$attributes = [
 			'data-videoid' => $video_id,
 			'layout'       => 'responsive',
@@ -112,29 +85,29 @@ private function sanitize_raw_embed( DOMElement $iframe_node, $video_id ) {
 			'title'        => null,
 		];
 
-		if ( ! empty( $iframe_node->getAttribute( 'title' ) ) ) {
-			$attributes['title'] = $iframe_node->getAttribute( 'title' );
+		if ( ! empty( $node->getAttribute( 'title' ) ) ) {
+			$attributes['title'] = $node->getAttribute( 'title' );
 		}
 
-		if ( ! empty( $iframe_node->getAttribute( 'width' ) ) ) {
-			$attributes['width'] = $iframe_node->getAttribute( 'width' );
+		if ( ! empty( $node->getAttribute( 'width' ) ) ) {
+			$attributes['width'] = $node->getAttribute( 'width' );
 		}
 
-		if ( ! empty( $iframe_node->getAttribute( 'height' ) ) ) {
-			$attributes['height'] = $iframe_node->getAttribute( 'height' );
+		if ( ! empty( $node->getAttribute( 'height' ) ) ) {
+			$attributes['height'] = $node->getAttribute( 'height' );
 		}
 
 		$amp_node = AMP_DOM_Utils::create_node(
-			Document::fromNode( $iframe_node ),
-			'amp-youtube',
+			Document::fromNode( $node ),
+			$this->amp_tag,
 			$attributes
 		);
 
 		$this->append_placeholder( $amp_node, $video_id, $attributes['title'] );
 
-		$this->maybe_unwrap_p_element( $iframe_node );
+		$this->maybe_unwrap_p_element( $node );
 
-		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 
 	/**
@@ -206,7 +179,8 @@ private function get_video_id_from_url( $url ) {
 			// Support is also included for other query params which don't appear to be supported by YouTube anymore.
 			if ( isset( $query_vars['v'] ) ) {
 				return $query_vars['v'];
-			} elseif ( isset( $query_vars['vi'] ) ) {
+			}
+			if ( isset( $query_vars['vi'] ) ) {
 				return $query_vars['vi'];
 			}
 		}
diff --git a/includes/sanitizers/class-amp-embed-sanitizer.php b/includes/sanitizers/class-amp-embed-sanitizer.php
index b0da8f73865..26fdc738157 100644
--- a/includes/sanitizers/class-amp-embed-sanitizer.php
+++ b/includes/sanitizers/class-amp-embed-sanitizer.php
@@ -36,14 +36,12 @@ public function __construct( $dom, $args = [] ) {
 	}
 
 	/**
-	 * Checks if each embed_handler has sanitize_raw_method and calls it.
+	 * Allow each embed handler sanitize their respective raw embeds.
 	 */
 	public function sanitize() {
 
 		foreach ( $this->embed_handlers as $embed_handler ) {
-			if ( method_exists( $embed_handler, 'sanitize_raw_embeds' ) ) {
-				$embed_handler->sanitize_raw_embeds( $this->dom, $this->args );
-			}
+			$embed_handler->sanitize_raw_embeds( $this->dom );
 		}
 	}
 }
diff --git a/tests/php/test-amp-dailymotion-embed-handler.php b/tests/php/test-amp-dailymotion-embed-handler.php
index d4058752b56..423627a0eb6 100644
--- a/tests/php/test-amp-dailymotion-embed-handler.php
+++ b/tests/php/test-amp-dailymotion-embed-handler.php
@@ -26,7 +26,6 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_DailyMotion_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -55,7 +54,6 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_DailyMotion_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-amp-facebook-embed-handler.php b/tests/php/test-amp-facebook-embed-handler.php
index 2ca132a9c3c..83da6730dd3 100644
--- a/tests/php/test-amp-facebook-embed-handler.php
+++ b/tests/php/test-amp-facebook-embed-handler.php
@@ -92,7 +92,6 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Facebook_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -272,7 +271,6 @@ public function get_raw_embed_dataset() {
 	 */
 	public function test__raw_embed_sanitizer( $source, $expected ) {
 		$embed = new AMP_Facebook_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-amp-instagram-embed-handler.php b/tests/php/test-amp-instagram-embed-handler.php
index 295e4f2ca97..eafae727272 100644
--- a/tests/php/test-amp-instagram-embed-handler.php
+++ b/tests/php/test-amp-instagram-embed-handler.php
@@ -56,7 +56,6 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Instagram_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -94,7 +93,6 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Instagram_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-amp-scribd-embed-handler.php b/tests/php/test-amp-scribd-embed-handler.php
index 7d08d7a6c3d..d8191c30347 100644
--- a/tests/php/test-amp-scribd-embed-handler.php
+++ b/tests/php/test-amp-scribd-embed-handler.php
@@ -116,7 +116,6 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Scribd_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -156,7 +155,6 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Scribd_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-amp-soundcloud-embed-handler.php b/tests/php/test-amp-soundcloud-embed-handler.php
index cbcbe64fd51..996c4580bb1 100644
--- a/tests/php/test-amp-soundcloud-embed-handler.php
+++ b/tests/php/test-amp-soundcloud-embed-handler.php
@@ -141,7 +141,6 @@ public function get_embed_conversion_data() {
 	 */
 	public function test_embed_conversion( $source, $expected ) {
 		$embed = new AMP_SoundCloud_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -185,7 +184,6 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_SoundCloud_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-amp-twitter-embed-handler.php b/tests/php/test-amp-twitter-embed-handler.php
index bef8cc43a19..7cc3c60578b 100644
--- a/tests/php/test-amp-twitter-embed-handler.php
+++ b/tests/php/test-amp-twitter-embed-handler.php
@@ -153,7 +153,6 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Twitter_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -187,7 +186,6 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Twitter_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-amp-vimeo-embed-handler.php b/tests/php/test-amp-vimeo-embed-handler.php
index 55d7b0dd59a..de4b5295e02 100644
--- a/tests/php/test-amp-vimeo-embed-handler.php
+++ b/tests/php/test-amp-vimeo-embed-handler.php
@@ -51,7 +51,6 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Vimeo_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -91,7 +90,6 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Vimeo_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-class-amp-gfycat-embed-handler.php b/tests/php/test-class-amp-gfycat-embed-handler.php
index cc58a72642a..59e9a7ef063 100644
--- a/tests/php/test-class-amp-gfycat-embed-handler.php
+++ b/tests/php/test-class-amp-gfycat-embed-handler.php
@@ -88,7 +88,6 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Gfycat_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -126,7 +125,6 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Gfycat_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-class-amp-hulu-embed-handler.php b/tests/php/test-class-amp-hulu-embed-handler.php
index d540a3d10cd..9c5ec2cc627 100644
--- a/tests/php/test-class-amp-hulu-embed-handler.php
+++ b/tests/php/test-class-amp-hulu-embed-handler.php
@@ -93,7 +93,6 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $url, $expected ) {
 		$embed = new AMP_Hulu_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $url );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -131,7 +130,6 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $url, $expected ) {
 		$embed = new AMP_Hulu_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $url );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-class-amp-tiktok-embed-handler.php b/tests/php/test-class-amp-tiktok-embed-handler.php
index d93e4ef7df8..31fb82633f6 100644
--- a/tests/php/test-class-amp-tiktok-embed-handler.php
+++ b/tests/php/test-class-amp-tiktok-embed-handler.php
@@ -91,7 +91,6 @@ public function test_conversion( $source, $expected ) {
 		}
 
 		$embed = new AMP_TikTok_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-class-amp-wordpress-tv-embed-handler.php b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
index 03944e7b204..f31f7710911 100644
--- a/tests/php/test-class-amp-wordpress-tv-embed-handler.php
+++ b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
@@ -89,7 +89,6 @@ public function get_conversion_data() {
 	 */
 	public function test_conversion( $source, $expected ) {
 		$embed = new AMP_WordPress_TV_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-class-amp-youtube-embed-handler.php b/tests/php/test-class-amp-youtube-embed-handler.php
index 16564470e60..1e8c26d404b 100644
--- a/tests/php/test-class-amp-youtube-embed-handler.php
+++ b/tests/php/test-class-amp-youtube-embed-handler.php
@@ -137,8 +137,6 @@ public function get_conversion_data() {
 	 * @dataProvider get_conversion_data
 	 */
 	public function test__conversion( $source, $expected, $fallback_for_expected = null ) {
-		$this->handler->register_embed();
-
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
 		$this->handler->sanitize_raw_embeds( $dom );
@@ -275,8 +273,6 @@ public function get_scripts_data() {
 	 * @dataProvider get_scripts_data
 	 */
 	public function test__get_scripts( $source, $expected ) {
-		$this->handler->register_embed();
-
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
 		$this->handler->sanitize_raw_embeds( $dom );

From c955f45f42d6aac167020f80a65fe087e470c728 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 21 May 2020 15:29:08 -0400
Subject: [PATCH 19/45] Sanitize Imgur embeds

---
 .../embeds/class-amp-imgur-embed-handler.php  | 140 ++++--------------
 .../test-class-amp-imgur-embed-handler.php    |  29 ++--
 2 files changed, 46 insertions(+), 123 deletions(-)

diff --git a/includes/embeds/class-amp-imgur-embed-handler.php b/includes/embeds/class-amp-imgur-embed-handler.php
index 3d862302192..c08546e9773 100644
--- a/includes/embeds/class-amp-imgur-embed-handler.php
+++ b/includes/embeds/class-amp-imgur-embed-handler.php
@@ -6,145 +6,69 @@
  * @since 1.0
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Imgur_Embed_Handler
  */
 class AMP_Imgur_Embed_Handler extends AMP_Base_Embed_Handler {
+
 	/**
-	 * Regex matched to produce output amp-imgur.
+	 * Default width.
 	 *
-	 * @var string
+	 * @var int
 	 */
-	const URL_PATTERN = '#https?://(www\.)?imgur\.com/.*#i';
+	protected $DEFAULT_WIDTH = 540;
 
 	/**
-	 * Register embed.
+	 * Default height.
+	 *
+	 * @var int
 	 */
-	public function register_embed() {
-		if ( version_compare( strtok( get_bloginfo( 'version' ), '-' ), '4.9', '<' ) ) {
-
-			// Before 4.9 the embedding Imgur is not working properly, register embed for that case.
-			wp_embed_register_handler( 'amp-imgur', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
-		} else {
-			add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
-		}
-	}
+	protected $DEFAULT_HEIGHT = 500;
 
 	/**
-	 * Unregister embed.
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
 	 */
-	public function unregister_embed() {
-		if ( version_compare( strtok( get_bloginfo( 'version' ), '-' ), '4.9', '<' ) ) {
-			wp_embed_unregister_handler( 'amp-imgur', -1 );
-		} else {
-			remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
-		}
-	}
+	protected $amp_tag = 'amp-imgur';
 
 	/**
-	 * Oembed.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param array  $matches Matches.
-	 * @param array  $attr Attributes.
-	 * @param string $url URL.
-	 * @return string Embed.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function oembed( $matches, $attr, $url ) {
-		return $this->render( [ 'url' => $url ] );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( '//blockquote[ @class = "imgur-embed-pub" ]' );
 	}
 
 	/**
-	 * Render embed.
+	 * Make embed AMP compatible.
 	 *
-	 * @param array $args Args.
-	 * @return string Embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function render( $args ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'url' => false,
-			]
-		);
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$imgur_id = $node->getAttribute( 'data-id' );
 
-		if ( empty( $args['url'] ) ) {
-			return '';
+		if ( empty( $imgur_id ) ) {
+			return;
 		}
 
-		$this->did_convert_elements = true;
-
-		$id = $this->get_imgur_id_from_url( $args['url'] );
-		if ( false === $id ) {
-			return '';
-		}
-		return AMP_HTML_Utils::build_tag(
-			'amp-imgur',
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$this->amp_tag,
 			[
+				'data-imgur-id' => $imgur_id,
+				'layout'        => 'responsive',
 				'width'         => $this->args['width'],
 				'height'        => $this->args['height'],
-				'data-imgur-id' => $id,
 			]
 		);
-	}
-
-	/**
-	 * Filter oEmbed HTML for Imgur to prepare it for AMP.
-	 *
-	 * @param mixed  $return The oEmbed HTML.
-	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   Attributes.
-	 * @return string Embed.
-	 */
-	public function filter_embed_oembed_html( $return, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'imgur.com' ) ) {
-			if ( preg_match( '/width=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['width'] = $matches[1];
-			}
-			if ( preg_match( '/height=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['height'] = $matches[1];
-			}
-
-			if ( empty( $attr['height'] ) ) {
-				return $return;
-			}
-
-			$attributes = wp_array_slice_assoc( $attr, [ 'width', 'height' ] );
-
-			if ( empty( $attr['width'] ) ) {
-				$attributes['layout'] = 'fixed-height';
-				$attributes['width']  = 'auto';
-			}
 
-			$attributes['data-imgur-id'] = $this->get_imgur_id_from_url( $url );
-			if ( false === $attributes['data-imgur-id'] ) {
-				return $return;
-			}
-
-			$return = AMP_HTML_Utils::build_tag(
-				'amp-imgur',
-				$attributes
-			);
-		}
-		return $return;
-	}
-
-	/**
-	 * Get Imgur ID from URL.
-	 *
-	 * @param string $url URL.
-	 * @return bool|string ID / false.
-	 */
-	protected function get_imgur_id_from_url( $url ) {
-		$parsed_url = wp_parse_url( $url );
-		$pieces     = explode( '/gallery/', $parsed_url['path'] );
-		if ( ! isset( $pieces[1] ) ) {
-			if ( ! preg_match( '/\/([A-Za-z0-9]+)/', $parsed_url['path'], $matches ) ) {
-				return false;
-			}
-			return $matches[1];
-		}
+		$this->maybe_remove_script_sibling( $node, 's.imgur.com/min/embed.js' );
 
-		return $pieces[1];
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
diff --git a/tests/php/test-class-amp-imgur-embed-handler.php b/tests/php/test-class-amp-imgur-embed-handler.php
index f59051fe44e..da8052fe707 100644
--- a/tests/php/test-class-amp-imgur-embed-handler.php
+++ b/tests/php/test-class-amp-imgur-embed-handler.php
@@ -64,13 +64,6 @@ static function( $pre, $r, $url ) {
 	 * @return array
 	 */
 	public function get_conversion_data() {
-		if ( version_compare( strtok( get_bloginfo( 'version' ), '-' ), '4.9', '<' ) ) {
-			$width  = 600;
-			$height = 480;
-		} else {
-			$width  = 500;
-			$height = 750;
-		}
 		return [
 			'no_embed'        => [
 				'<p>Hello world.</p>',
@@ -79,17 +72,17 @@ public function get_conversion_data() {
 
 			'url_simple'      => [
 				'https://imgur.com/fmHGADZ' . PHP_EOL,
-				'<p><amp-imgur width="' . $width . '" height="' . $height . '" data-imgur-id="fmHGADZ"></amp-imgur></p>' . PHP_EOL,
+				'<amp-imgur data-imgur-id="fmHGADZ" layout="responsive" width="540" height="500"></amp-imgur>' . PHP_EOL . PHP_EOL,
 			],
 
 			'url_with_detail' => [
 				'https://imgur.com/gallery/1ApvcWB' . PHP_EOL,
-				'<p><amp-imgur width="' . $width . '" height="' . $height . '" data-imgur-id="1ApvcWB"></amp-imgur></p>' . PHP_EOL,
+				'<amp-imgur data-imgur-id="a/1ApvcWB" layout="responsive" width="540" height="500"></amp-imgur>' . PHP_EOL . PHP_EOL,
 			],
 
 			'url_with_params' => [
 				'https://imgur.com/gallery/1ApvcWB?foo=bar' . PHP_EOL,
-				'<p><amp-imgur width="' . $width . '" height="' . $height . '" data-imgur-id="1ApvcWB"></amp-imgur></p>' . PHP_EOL,
+				'<amp-imgur data-imgur-id="a/1ApvcWB" layout="responsive" width="540" height="500"></amp-imgur>' . PHP_EOL . PHP_EOL,
 			],
 
 		];
@@ -104,10 +97,14 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Imgur_Embed_Handler();
-		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
+
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -137,10 +134,12 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Imgur_Embed_Handler();
-		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 
 		$scripts = array_merge(

From 21ae657d0c3228051f9138941da32759c38dd387 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 21 May 2020 19:16:13 -0400
Subject: [PATCH 20/45] Sanitize Tumblr embeds

---
 .../embeds/class-amp-tumblr-embed-handler.php |  94 ++++++++++-----
 tests/php/test-amp-tumblr-embed-handler.php   | 113 ++++++++++++++++++
 2 files changed, 177 insertions(+), 30 deletions(-)
 create mode 100644 tests/php/test-amp-tumblr-embed-handler.php

diff --git a/includes/embeds/class-amp-tumblr-embed-handler.php b/includes/embeds/class-amp-tumblr-embed-handler.php
index ffa29c38367..75b66031984 100644
--- a/includes/embeds/class-amp-tumblr-embed-handler.php
+++ b/includes/embeds/class-amp-tumblr-embed-handler.php
@@ -6,54 +6,88 @@
  * @since 0.7
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Tumblr_Embed_Handler
  */
 class AMP_Tumblr_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	/**
-	 * Register embed.
+	 * Default width.
+	 *
+	 * Tumblr embeds for web have a fixed width of 540px.
+	 * See <https://tumblr.zendesk.com/hc/en-us/articles/226261028-Embed-pro-tips>.
+	 *
+	 * @var int
 	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
-	}
+	protected $DEFAULT_WIDTH = 540;
+
+	/**
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
+	 */
+	protected $base_embed_url = 'https://embed.tumblr.com/embed/post/';
 
 	/**
-	 * Unregister embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//div[ @class = "tumblr-post" and starts-with( @data-href, "%s" ) ]', $this->base_embed_url ) );
 	}
 
 	/**
-	 * Filter oEmbed HTML for Tumblr to prepare it for AMP.
+	 * Make embed AMP compatible.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @return string Embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function filter_embed_oembed_html( $cache, $url ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false === strpos( $parsed_url['host'], 'tumblr.com' ) ) {
-			return $cache;
-		}
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$dom        = Document::fromNode( $node );
+		$iframe_src = $node->getAttribute( 'data-href' );
+
+		$attributes = [
+			'src'       => $iframe_src,
+			'layout'    => 'responsive',
+			'width'     => $this->args['width'],
+			'height'    => $this->args['height'],
+			'resizable' => '',
+			'sandbox'   => 'allow-scripts allow-popups allow-same-origin'
+		];
 
-		// @todo The iframe will not get sized properly.
-		if ( preg_match( '#data-href="(?P<href>https://embed.tumblr.com/embed/post/\w+/\w+)"#', $cache, $matches ) ) {
-			$cache = AMP_HTML_Utils::build_tag(
-				'amp-iframe',
-				[
-					'width'   => $this->args['width'],
-					'height'  => $this->args['height'],
-					'layout'  => 'responsive',
-					'sandbox' => 'allow-scripts allow-popups', // The allow-scripts is needed to allow the iframe to render; allow-popups needed to allow clicking.
-					'src'     => $matches['href'],
-				],
-				sprintf( '<a placeholder href="%s">Tumblr</a>', $url )
-			);
+		$amp_node = AMP_DOM_Utils::create_node(
+			$dom,
+			$this->amp_tag,
+			$attributes
+		);
+
+		// Add an overflow node to allow the amp-iframe to resize.
+		$overflow_node = AMP_DOM_Utils::create_node(
+			$dom,
+			'div',
+			[
+				'overflow' => '',
+				'tabindex' => 0,
+				'role'     => 'button',
+				'aria-label' => esc_attr__( 'See more', 'amp' ),
+			]
+		);
+		$overflow_node->textContent = esc_html__( 'See more', 'amp' );
+		$amp_node->appendChild( $overflow_node );
+
+		// Append the original link as a placeholder node.
+		if ( $node->firstChild instanceof DOMElement && 'a' === $node->firstChild->nodeName ) {
+			$placeholder_node = $node->firstChild;
+			$placeholder_node->setAttribute( 'placeholder', '' );
+			$amp_node->appendChild( $placeholder_node );
 		}
 
-		return $cache;
+		$this->maybe_remove_script_sibling( $node, 'assets.tumblr.com/post.js' );
+
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
 
diff --git a/tests/php/test-amp-tumblr-embed-handler.php b/tests/php/test-amp-tumblr-embed-handler.php
new file mode 100644
index 00000000000..73ba05b5d88
--- /dev/null
+++ b/tests/php/test-amp-tumblr-embed-handler.php
@@ -0,0 +1,113 @@
+<?php
+
+class AMP_Tumblr_Embed_Handler_Test extends WP_UnitTestCase {
+
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		parent::setUp();
+
+		// Mock the HTTP request.
+		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
+	}
+
+	/**
+	 * Tear down.
+	 */
+	public function tearDown() {
+		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
+		parent::tearDown();
+	}
+
+	/**
+	 * Mock HTTP request.
+	 *
+	 * @param mixed  $pre Whether to preempt an HTTP request's return value. Default false.
+	 * @param mixed  $r   HTTP request arguments.
+	 * @param string $url The request URL.
+	 * @return array Response data.
+	 */
+	public function mock_http_request( $pre, $r, $url ) {
+		if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
+			return $pre;
+		}
+
+		if ( false === strpos( $url, 'tumblr.com' ) ) {
+			return $pre;
+		}
+
+		$body = '{"cache_age":3600,"url":"https:\/\/ifpaintingscouldtext.tumblr.com\/post\/92003045635\/grant-wood-american-gothic-1930","provider_url":"https:\/\/www.tumblr.com","provider_name":"Tumblr","author_name":"If Paintings Could Text","version":"1.0","author_url":"https:\/\/ifpaintingscouldtext.tumblr.com\/","type":"rich","html":"\u003Cdiv class=\u0022tumblr-post\u0022 data-href=\u0022https:\/\/embed.tumblr.com\/embed\/post\/2JT2XTaiTxO08wh21dqQrw\/92003045635\u0022 data-did=\u00227ce4825965cbd8bfd208f6aae43de7a528859aee\u0022  \u003E\u003Ca href=\u0022https:\/\/ifpaintingscouldtext.tumblr.com\/post\/92003045635\/grant-wood-american-gothic-1930\u0022\u003Ehttps:\/\/ifpaintingscouldtext.tumblr.com\/post\/92003045635\/grant-wood-american-gothic-1930\u003C\/a\u003E\u003C\/div\u003E\u003Cscript async src=\u0022https:\/\/assets.tumblr.com\/post.js\u0022\u003E\u003C\/script\u003E","height":null,"width":540}';
+
+		return [
+			'body'     => $body,
+			'response' => [
+				'code'    => 200,
+				'message' => 'OK',
+			],
+		];
+	}
+
+	public function get_conversion_data() {
+		return [
+			'no_embed'       => [
+				'<p>Hello world.</p>',
+				'<p>Hello world.</p>' . PHP_EOL,
+			],
+
+			'url_simple'     => [
+				'https://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930' . PHP_EOL,
+				'<amp-iframe src="https://embed.tumblr.com/embed/post/2JT2XTaiTxO08wh21dqQrw/92003045635" layout="responsive" width="540" height="480" resizable="" sandbox="allow-scripts allow-popups allow-same-origin"><div overflow="" tabindex="0" role="button" aria-label="See more">See more</div><a href="https://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930" placeholder="">https://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930</a></amp-iframe>' . PHP_EOL . PHP_EOL,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider get_conversion_data
+	 */
+	public function test__conversion( $source, $expected ) {
+		$embed = new AMP_Tumblr_Embed_Handler();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
+
+		$this->assertEquals( $expected, $content );
+	}
+
+	public function get_scripts_data() {
+		return [
+			'not_converted' => [
+				'<p>Hello World.</p>',
+				[],
+			],
+			'converted'     => [
+				'https://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930' . PHP_EOL,
+				[ 'amp-iframe' => true ],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider get_scripts_data
+	 */
+	public function test__get_scripts( $source, $expected ) {
+		$embed = new AMP_Tumblr_Embed_Handler();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
+		$whitelist_sanitizer->sanitize();
+
+		$scripts = array_merge(
+			$embed->get_scripts(),
+			$whitelist_sanitizer->get_scripts()
+		);
+
+		$this->assertEquals( $expected, $scripts );
+	}
+}

From 8850a0f5dccec00a6128643179f9945b1338eee2 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 21 May 2020 19:17:51 -0400
Subject: [PATCH 21/45] Mock tests for DailyMotion

---
 .../test-amp-dailymotion-embed-handler.php    | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/tests/php/test-amp-dailymotion-embed-handler.php b/tests/php/test-amp-dailymotion-embed-handler.php
index 423627a0eb6..9b2bb87e3e0 100644
--- a/tests/php/test-amp-dailymotion-embed-handler.php
+++ b/tests/php/test-amp-dailymotion-embed-handler.php
@@ -2,6 +2,52 @@
 
 class AMP_DailyMotion_Embed_Handler_Test extends WP_UnitTestCase {
 
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		parent::setUp();
+
+		// Mock the HTTP request.
+		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
+	}
+
+	/**
+	 * Tear down.
+	 */
+	public function tearDown() {
+		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
+		parent::tearDown();
+	}
+
+	/**
+	 * Mock HTTP request.
+	 *
+	 * @param mixed  $pre Whether to preempt an HTTP request's return value. Default false.
+	 * @param mixed  $r   HTTP request arguments.
+	 * @param string $url The request URL.
+	 * @return array Response data.
+	 */
+	public function mock_http_request( $pre, $r, $url ) {
+		if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
+			return $pre;
+		}
+
+		if ( false === strpos( $url, 'dailymotion.com' ) ) {
+			return $pre;
+		}
+
+		$body = '{"type":"video","version":"1.0","provider_name":"Dailymotion","provider_url":"https:\/\/www.dailymotion.com","title":"Snatched - Official Trailer 2 (HD)","description":"M\u00e1s info http:\/\/trailersyestrenos.es\/snatched-jonathan-levine\/ - TWITTER: https:\/\/twitter.com\/TrailersyEstren - FACEBOOK: https:\/\/www.facebook.com\/trailersyestrenos - GOOGLE+: https:\/\/www.google.com\/+TrailersyEstrenos  Sinopsis: Una madre y una hija se enfrentar\u00e1n a distintos problemas que surgen mientras est\u00e1n de vacaciones  Director: Jonathan Levine Reparto: Amy Schumer, Ike Barinholtz, Goldie Hawn, Christopher Meloni, Randall Park, Wanda Sykes, \u00d3scar Jaenada, Colin Quinn, Tom Bateman, Kevin Kane, Sharon M. Bell  (El trailer pertenece a la productora y distribuidora de la pel\u00edcula y ha sido subido sin \u00e1nimo de lucro)","author_name":"Trailers y Estrenos","author_url":"https:\/\/www.dailymotion.com\/TrailersyEstrenos","width":480,"height":204,"html":"<iframe frameborder=\"0\" width=\"480\" height=\"204\" src=\"https:\/\/www.dailymotion.com\/embed\/video\/x5awwth\" allowfullscreen allow=\"autoplay\"><\/iframe>","thumbnail_url":"https:\/\/s2.dmcdn.net\/v\/J7Emb1Ungw3_0rEtU\/x120","thumbnail_width":214,"thumbnail_height":120}';
+
+		return [
+			'body'     => $body,
+			'response' => [
+				'code'    => 200,
+				'message' => 'OK',
+			],
+		];
+	}
+
 	public function get_conversion_data() {
 		return [
 			'no_embed'       => [

From decbb49dd719bccc180ebf108e1558300cb5901e Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 21 May 2020 22:35:50 -0400
Subject: [PATCH 22/45] Sanitize Reddit embeds

---
 .../embeds/class-amp-base-embed-handler.php   |  37 +++---
 .../class-amp-dailymotion-embed-handler.php   |   2 +-
 .../embeds/class-amp-gfycat-embed-handler.php |   2 +-
 .../embeds/class-amp-hulu-embed-handler.php   |   2 +-
 .../embeds/class-amp-imgur-embed-handler.php  |   2 +-
 .../class-amp-instagram-embed-handler.php     |   2 +-
 .../embeds/class-amp-reddit-embed-handler.php | 123 +++++++++++------
 .../embeds/class-amp-scribd-embed-handler.php |   4 +-
 .../class-amp-soundcloud-embed-handler.php    |   2 +-
 .../embeds/class-amp-tiktok-embed-handler.php |   2 +-
 .../embeds/class-amp-tumblr-embed-handler.php |  11 +-
 .../class-amp-twitter-embed-handler.php       |   4 +-
 .../embeds/class-amp-vimeo-embed-handler.php  |   2 +-
 .../class-amp-wordpress-tv-embed-handler.php  |   4 +-
 .../class-amp-youtube-embed-handler.php       |   2 +-
 tests/php/test-amp-reddit-embed-handler.php   | 124 ++++++++++++++++++
 tests/php/test-amp-tumblr-embed-handler.php   |   4 +-
 17 files changed, 250 insertions(+), 79 deletions(-)
 create mode 100644 tests/php/test-amp-reddit-embed-handler.php

diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index 6d16065d5c1..612cf20f6cd 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -157,6 +157,21 @@ function ( $attr_name ) {
 		return wp_array_slice_assoc( $matches, $attribute_names );
 	}
 
+	/**
+	 * Get all child elements of the specified element.
+	 *
+	 * @param DOMElement $node Element.
+	 * @return DOMElement[] Array of child elements for specified element.
+	 */
+	protected function get_child_elements( DOMElement $node ) {
+		return array_filter(
+			iterator_to_array( $node->childNodes ),
+			static function ( DOMNode $child ) {
+				return $child instanceof DOMElement;
+			}
+		);
+	}
+
 	/**
 	 * Replace the node's parent with itself if the parent is a <p> tag, has no attributes and has no other children.
 	 * This usually happens while `wpautop()` processes the element.
@@ -165,18 +180,11 @@ function ( $attr_name ) {
 	 *
 	 * @param DOMElement $node Node.
 	 */
-	protected function maybe_unwrap_p_element( DOMElement $node ) {
+	protected function unwrap_p_element( DOMElement $node ) {
 		$parent_element = AMP_DOM_Utils::get_parent_element( $node );
 
 		if ( $parent_element && 'p' === $parent_element->nodeName && false === $parent_element->hasAttributes() ) {
-			$child_element_count = array_sum(
-				array_map(
-					static function ( DOMNode $child ) {
-						return $child instanceof DOMElement ? 1 : 0;
-					},
-					iterator_to_array( $parent_element->childNodes )
-				)
-			);
+			$child_element_count = count( $this->get_child_elements( $parent_element ) );
 			if ( 1 === $child_element_count ) {
 				$parent_element->parentNode->replaceChild( $node, $parent_element );
 			}
@@ -192,7 +200,7 @@ static function ( DOMNode $child ) {
 	 * @param string     $base_src_url Script URL to match against.
 	 * @param string     $content      Text content of node to match against.
 	 */
-	protected function maybe_remove_script_sibling( DOMElement $node, $base_src_url, $content = '' ) {
+	protected function remove_script_sibling( DOMElement $node, $base_src_url, $content = '' ) {
 		$next_element_sibling = $node->nextSibling;
 
 		while ( $next_element_sibling && ! ( $next_element_sibling instanceof DOMElement ) ) {
@@ -201,14 +209,7 @@ protected function maybe_remove_script_sibling( DOMElement $node, $base_src_url,
 
 		// Handle case where script is wrapped in paragraph by wpautop.
 		if ( $next_element_sibling instanceof DOMElement && 'p' === $next_element_sibling->nodeName ) {
-			$children_elements = array_values(
-				array_filter(
-					iterator_to_array( $next_element_sibling->childNodes ),
-					static function ( DOMNode $child ) {
-						return $child instanceof DOMElement;
-					}
-				)
-			);
+			$children_elements = array_values( $this->get_child_elements( $next_element_sibling ) );
 
 			if (
 				1 === count( $children_elements ) &&
diff --git a/includes/embeds/class-amp-dailymotion-embed-handler.php b/includes/embeds/class-amp-dailymotion-embed-handler.php
index 58cf7ac6742..806cb2a62a3 100644
--- a/includes/embeds/class-amp-dailymotion-embed-handler.php
+++ b/includes/embeds/class-amp-dailymotion-embed-handler.php
@@ -98,7 +98,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			$attributes
 		);
 
-		$this->maybe_unwrap_p_element( $node );
+		$this->unwrap_p_element( $node );
 
 		$node->parentNode->replaceChild( $amp_node, $node );
 	}
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index 06579a1b561..eec5d6c93e5 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -62,7 +62,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			$attributes
 		);
 
-		$this->maybe_unwrap_p_element( $node );
+		$this->unwrap_p_element( $node );
 
 		$node->parentNode->replaceChild( $amp_node, $node );
 	}
diff --git a/includes/embeds/class-amp-hulu-embed-handler.php b/includes/embeds/class-amp-hulu-embed-handler.php
index 64830fc8073..3e1a1dd5559 100644
--- a/includes/embeds/class-amp-hulu-embed-handler.php
+++ b/includes/embeds/class-amp-hulu-embed-handler.php
@@ -78,7 +78,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			$attributes
 		);
 
-		$this->maybe_unwrap_p_element( $node );
+		$this->unwrap_p_element( $node );
 
 		$node->parentNode->replaceChild( $amp_node, $node );
 	}
diff --git a/includes/embeds/class-amp-imgur-embed-handler.php b/includes/embeds/class-amp-imgur-embed-handler.php
index c08546e9773..e19d3f25866 100644
--- a/includes/embeds/class-amp-imgur-embed-handler.php
+++ b/includes/embeds/class-amp-imgur-embed-handler.php
@@ -67,7 +67,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			]
 		);
 
-		$this->maybe_remove_script_sibling( $node, 's.imgur.com/min/embed.js' );
+		$this->remove_script_sibling( $node, 's.imgur.com/min/embed.js' );
 
 		$node->parentNode->replaceChild( $amp_node, $node );
 	}
diff --git a/includes/embeds/class-amp-instagram-embed-handler.php b/includes/embeds/class-amp-instagram-embed-handler.php
index 40ec7aba50a..9ceb6f00273 100644
--- a/includes/embeds/class-amp-instagram-embed-handler.php
+++ b/includes/embeds/class-amp-instagram-embed-handler.php
@@ -72,7 +72,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 
 		$new_node = AMP_DOM_Utils::create_node( Document::fromNode( $node ), $this->amp_tag, $node_args );
 
-		$this->maybe_remove_script_sibling( $node, 'instagram.com/embed.js' );
+		$this->remove_script_sibling( $node, 'instagram.com/embed.js' );
 
 		$node->parentNode->replaceChild( $new_node, $node );
 	}
diff --git a/includes/embeds/class-amp-reddit-embed-handler.php b/includes/embeds/class-amp-reddit-embed-handler.php
index 8199dde0910..b4e8f9212a0 100644
--- a/includes/embeds/class-amp-reddit-embed-handler.php
+++ b/includes/embeds/class-amp-reddit-embed-handler.php
@@ -6,70 +6,115 @@
  * @since 0.7
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Reddit_Embed_Handler
  */
 class AMP_Reddit_Embed_Handler extends AMP_Base_Embed_Handler {
+
 	/**
-	 * Regex matched to produce output amp-reddit.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
-	 * @const string
+	 * @var string
 	 */
-	const URL_PATTERN = '#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i';
+	protected $amp_tag = 'amp-embedly-card';
 
 	/**
-	 * Register embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function register_embed() {
-		wp_embed_register_handler( 'amp-reddit', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		/*
+		 * The blockquote being queried has two anchor elements. The first one is what we need since it has the URL of the
+		 * Reddit page being embedded.
+		 */
+		return $dom->xpath->query( '//blockquote[ @class = "reddit-card" and //a[1][ starts-with( @href, "https://www.reddit.com" ) ] ]' );
 	}
 
 	/**
-	 * Unregister embed.
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
 	 */
-	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-reddit', -1 );
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$anchor_node = $this->get_anchor_node( $node );
+		if ( null === $anchor_node ) {
+			return;
+		}
+
+		$reddit_url = $anchor_node->getAttribute( 'href' );
+		if ( empty( $reddit_url ) ) {
+			return;
+		}
+
+		$attributes = [
+			'layout'   => 'responsive',
+			'width'    => 100,
+			'height'   => 100,
+			'data-url' => $anchor_node->getAttribute( 'href' ),
+		];
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$this->amp_tag,
+			$attributes
+		);
+
+		// Add the raw embed as the placeholder.
+		$placeholder_node = $node->cloneNode( true );
+		$placeholder_node->setAttribute( 'placeholder', '' );
+		$amp_node->appendChild( $placeholder_node );
+
+		$this->remove_script_sibling( $node, 'embed.redditmedia.com/widgets/platform.js' );
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 
 	/**
-	 * Embed found with matching URL callback.
+	 * Get the first child anchor element from the blockquote element.
 	 *
-	 * @param array $matches URL regex matches.
-	 * @param array $attr    Additional parameters.
-	 * @param array $url     URL.
-	 * @return string Embed.
+	 * @param DOMElement $blockquote_node Blockquote element.
+	 * @return DOMElement|null Anchor element if found, otherwise null.
 	 */
-	public function oembed( $matches, $attr, $url ) {
-		return $this->render( [ 'url' => $url ] );
+	private function get_anchor_node( DOMElement $blockquote_node ) {
+		$first_child_element = $this->get_first_child_element( $blockquote_node );
+
+		if ( null === $first_child_element ) {
+			return null;
+		}
+
+		$anchor_node = null;
+
+		if ( 'a' === $first_child_element->nodeName ) {
+			// Anchor tag was not wrapped by `wpautop`.
+			$anchor_node = $first_child_element;
+		} elseif ( 'p' === $first_child_element->nodeName ) {
+			// If the anchor tag is wrapped by `wpautop`, it should be the first child of the `p` tag.
+			$first_child_element = $this->get_first_child_element( $first_child_element );
+
+			if ( null !== $first_child_element && 'a' === $first_child_element->nodeName ) {
+				$anchor_node = $first_child_element;
+			}
+		}
+
+		return $anchor_node;
 	}
 
 	/**
-	 * Output the Reddit amp element.
+	 * Get first child element for specified element.
 	 *
-	 * @param array $args parameters used for output.
-	 * @return string Rendered content.
+	 * @param DOMElement $node Element.
+	 * @return DOMElement|null First element if found, otherwise null.
 	 */
-	public function render( $args ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'url' => false,
-			]
-		);
-
-		if ( empty( $args['url'] ) ) {
-			return '';
+	private function get_first_child_element( DOMElement $node ) {
+		foreach ( $node->childNodes as $child_node ) {
+			if ( $child_node instanceof DOMElement ) {
+				return $child_node;
+			}
 		}
-
-		return AMP_HTML_Utils::build_tag(
-			'amp-embedly-card',
-			[
-				'layout'   => 'responsive',
-				'width'    => '100',
-				'height'   => '100',
-				'data-url' => $args['url'],
-			]
-		);
+		return null;
 	}
 }
 
diff --git a/includes/embeds/class-amp-scribd-embed-handler.php b/includes/embeds/class-amp-scribd-embed-handler.php
index 87d031bab93..7b959ea25da 100644
--- a/includes/embeds/class-amp-scribd-embed-handler.php
+++ b/includes/embeds/class-amp-scribd-embed-handler.php
@@ -31,8 +31,8 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 		);
 		$node->setAttribute( 'layout', 'responsive' );
 
-		$this->maybe_remove_script_sibling( $node, null, 'scribd.com/javascripts/embed_code/inject.j' );
-		$this->maybe_unwrap_p_element( $node );
+		$this->remove_script_sibling( $node, null, 'scribd.com/javascripts/embed_code/inject.j' );
+		$this->unwrap_p_element( $node );
 
 		// The iframe sanitizer will further sanitize and convert this into an amp-iframe.
 	}
diff --git a/includes/embeds/class-amp-soundcloud-embed-handler.php b/includes/embeds/class-amp-soundcloud-embed-handler.php
index 519ea62a698..32aba776f96 100644
--- a/includes/embeds/class-amp-soundcloud-embed-handler.php
+++ b/includes/embeds/class-amp-soundcloud-embed-handler.php
@@ -82,7 +82,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			$attributes
 		);
 
-		$this->maybe_unwrap_p_element( $node );
+		$this->unwrap_p_element( $node );
 
 		$node->parentNode->replaceChild( $amp_node, $node );
 	}
diff --git a/includes/embeds/class-amp-tiktok-embed-handler.php b/includes/embeds/class-amp-tiktok-embed-handler.php
index 97edcdb02bf..1cbb1bfadbd 100644
--- a/includes/embeds/class-amp-tiktok-embed-handler.php
+++ b/includes/embeds/class-amp-tiktok-embed-handler.php
@@ -43,7 +43,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			return;
 		}
 
-		$this->maybe_remove_script_sibling( $node, 'tiktok.com/embed.js' );
+		$this->remove_script_sibling( $node, 'tiktok.com/embed.js' );
 
 		$amp_node = AMP_DOM_Utils::create_node(
 			Document::fromNode( $dom ),
diff --git a/includes/embeds/class-amp-tumblr-embed-handler.php b/includes/embeds/class-amp-tumblr-embed-handler.php
index 75b66031984..914287d5e6f 100644
--- a/includes/embeds/class-amp-tumblr-embed-handler.php
+++ b/includes/embeds/class-amp-tumblr-embed-handler.php
@@ -55,7 +55,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			'width'     => $this->args['width'],
 			'height'    => $this->args['height'],
 			'resizable' => '',
-			'sandbox'   => 'allow-scripts allow-popups allow-same-origin'
+			'sandbox'   => 'allow-scripts allow-popups allow-same-origin',
 		];
 
 		$amp_node = AMP_DOM_Utils::create_node(
@@ -69,12 +69,13 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			$dom,
 			'div',
 			[
-				'overflow' => '',
-				'tabindex' => 0,
-				'role'     => 'button',
+				'overflow'   => '',
+				'tabindex'   => 0,
+				'role'       => 'button',
 				'aria-label' => esc_attr__( 'See more', 'amp' ),
 			]
 		);
+
 		$overflow_node->textContent = esc_html__( 'See more', 'amp' );
 		$amp_node->appendChild( $overflow_node );
 
@@ -85,7 +86,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			$amp_node->appendChild( $placeholder_node );
 		}
 
-		$this->maybe_remove_script_sibling( $node, 'assets.tumblr.com/post.js' );
+		$this->remove_script_sibling( $node, 'assets.tumblr.com/post.js' );
 
 		$node->parentNode->replaceChild( $amp_node, $node );
 	}
diff --git a/includes/embeds/class-amp-twitter-embed-handler.php b/includes/embeds/class-amp-twitter-embed-handler.php
index b88f16d957c..49a5881ee45 100644
--- a/includes/embeds/class-amp-twitter-embed-handler.php
+++ b/includes/embeds/class-amp-twitter-embed-handler.php
@@ -181,9 +181,9 @@ protected function sanitize_raw_embeds_with_type( $embed_type, DOMNodeList $node
 			$new_node->appendChild( $placeholder );
 
 			$this->remove_br_sibling_elements( $node );
-			$this->maybe_remove_script_sibling( $node, 'platform.twitter.com/widgets.js' );
+			$this->remove_script_sibling( $node, 'platform.twitter.com/widgets.js' );
 			// We can unwrap the <p> tag once the accompanied <script> is removed.
-			$this->maybe_unwrap_p_element( $node );
+			$this->unwrap_p_element( $node );
 
 			$node->parentNode->replaceChild( $new_node, $node );
 		}
diff --git a/includes/embeds/class-amp-vimeo-embed-handler.php b/includes/embeds/class-amp-vimeo-embed-handler.php
index bc31b4fe8b0..c69c43119d8 100644
--- a/includes/embeds/class-amp-vimeo-embed-handler.php
+++ b/includes/embeds/class-amp-vimeo-embed-handler.php
@@ -88,7 +88,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			]
 		);
 
-		$this->maybe_unwrap_p_element( $node );
+		$this->unwrap_p_element( $node );
 
 		$node->parentNode->replaceChild( $amp_node, $node );
 	}
diff --git a/includes/embeds/class-amp-wordpress-tv-embed-handler.php b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
index 763463857ca..3150261ca6e 100644
--- a/includes/embeds/class-amp-wordpress-tv-embed-handler.php
+++ b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
@@ -28,7 +28,7 @@ class AMP_WordPress_TV_Embed_Handler extends AMP_Base_Embed_Handler {
 	protected function sanitize_raw_embed( DOMElement $node ) {
 		$node->setAttribute( 'layout', 'responsive' );
 
-		$this->maybe_remove_script_sibling( $node, 'v0.wordpress.com/js/next/videopress-iframe.js' );
-		$this->maybe_unwrap_p_element( $node );
+		$this->remove_script_sibling( $node, 'v0.wordpress.com/js/next/videopress-iframe.js' );
+		$this->unwrap_p_element( $node );
 	}
 }
diff --git a/includes/embeds/class-amp-youtube-embed-handler.php b/includes/embeds/class-amp-youtube-embed-handler.php
index b5a9fb916fa..458f4ac3507 100644
--- a/includes/embeds/class-amp-youtube-embed-handler.php
+++ b/includes/embeds/class-amp-youtube-embed-handler.php
@@ -105,7 +105,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 
 		$this->append_placeholder( $amp_node, $video_id, $attributes['title'] );
 
-		$this->maybe_unwrap_p_element( $node );
+		$this->unwrap_p_element( $node );
 
 		$node->parentNode->replaceChild( $amp_node, $node );
 	}
diff --git a/tests/php/test-amp-reddit-embed-handler.php b/tests/php/test-amp-reddit-embed-handler.php
new file mode 100644
index 00000000000..8a394a0ad2c
--- /dev/null
+++ b/tests/php/test-amp-reddit-embed-handler.php
@@ -0,0 +1,124 @@
+<?php
+
+class AMP_Reddit_Embed_Handler_Test extends WP_UnitTestCase {
+
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		parent::setUp();
+
+		// Mock the HTTP request.
+		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
+	}
+
+	/**
+	 * Tear down.
+	 */
+	public function tearDown() {
+		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
+		parent::tearDown();
+	}
+
+	/**
+	 * Mock HTTP request.
+	 *
+	 * @param mixed  $pre Whether to preempt an HTTP request's return value. Default false.
+	 * @param mixed  $r   HTTP request arguments.
+	 * @param string $url The request URL.
+	 * @return array Response data.
+	 */
+	public function mock_http_request( $pre, $r, $url ) {
+		if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
+			return $pre;
+		}
+
+		if ( false === strpos( $url, 'reddit.com' ) ) {
+			return $pre;
+		}
+
+		$body = '{"provider_url": "https://www.reddit.com/", "version": "1.0", "title": "Sticky bun for you!", "provider_name": "reddit", "type": "rich", "html": "\n    \u003Cblockquote class=\"reddit-card\" \u003E\n      \u003Ca href=\"https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed\u0026amp;ref=share\"\u003ESticky bun for you!\u003C/a\u003E from\n      \u003Ca href=\"https://www.reddit.com/r/aww/\"\u003Eaww\u003C/a\u003E\n    \u003C/blockquote\u003E\n    \u003Cscript async src=\"https://embed.redditmedia.com/widgets/platform.js\" charset=\"UTF-8\"\u003E\u003C/script\u003E\n", "author_name": "rnielsen776"}';
+
+		return [
+			'body'     => $body,
+			'response' => [
+				'code'    => 200,
+				'message' => 'OK',
+			],
+		];
+	}
+
+	public function get_conversion_data() {
+		return [
+			'no_embed'   => [
+				'<p>Hello world.</p>',
+				'<p>Hello world.</p>' . PHP_EOL,
+			],
+
+			'url_simple' => [
+				'https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/' . PHP_EOL,
+				'<amp-embedly-card layout="responsive" width="100" height="100" data-url="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share"><blockquote class="reddit-card" placeholder=""><p>      <a href="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share">Sticky bun for you!</a> from      <a href="https://www.reddit.com/r/aww/">aww</a>    </p></blockquote></amp-embedly-card>' . PHP_EOL . PHP_EOL,
+			],
+
+			'shortcode'  => [
+				'[embed]https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/[/embed]' . PHP_EOL,
+				'<amp-embedly-card layout="responsive" width="100" height="100" data-url="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share"><blockquote class="reddit-card" placeholder=""><p>' . PHP_EOL . '      <a href="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share">Sticky bun for you!</a> from<br>' . PHP_EOL . '      <a href="https://www.reddit.com/r/aww/">aww</a>' . PHP_EOL . '    </p></blockquote></amp-embedly-card>' . PHP_EOL . PHP_EOL,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider get_conversion_data
+	 */
+	public function test__conversion( $source, $expected ) {
+		$embed = new AMP_Reddit_Embed_Handler();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+
+		if ( "<br />\n" === substr( $filtered_content, 0, 7 ) ) {
+			// Remove prepended break line tag and new line.
+			$filtered_content = substr( $filtered_content, 7 );
+		}
+
+		$dom = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
+
+		$this->assertEquals( $expected, $content );
+	}
+
+	public function get_scripts_data() {
+		return [
+			'not_converted' => [
+				'<p>Hello World.</p>',
+				[],
+			],
+			'converted'     => [
+				'https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/' . PHP_EOL,
+				[ 'amp-embedly-card' => true ],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider get_scripts_data
+	 */
+	public function test__get_scripts( $source, $expected ) {
+		$embed = new AMP_Reddit_Embed_Handler();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
+		$whitelist_sanitizer->sanitize();
+
+		$scripts = array_merge(
+			$embed->get_scripts(),
+			$whitelist_sanitizer->get_scripts()
+		);
+
+		$this->assertEquals( $expected, $scripts );
+	}
+}
diff --git a/tests/php/test-amp-tumblr-embed-handler.php b/tests/php/test-amp-tumblr-embed-handler.php
index 73ba05b5d88..1d433fe182e 100644
--- a/tests/php/test-amp-tumblr-embed-handler.php
+++ b/tests/php/test-amp-tumblr-embed-handler.php
@@ -50,12 +50,12 @@ public function mock_http_request( $pre, $r, $url ) {
 
 	public function get_conversion_data() {
 		return [
-			'no_embed'       => [
+			'no_embed'   => [
 				'<p>Hello world.</p>',
 				'<p>Hello world.</p>' . PHP_EOL,
 			],
 
-			'url_simple'     => [
+			'url_simple' => [
 				'https://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930' . PHP_EOL,
 				'<amp-iframe src="https://embed.tumblr.com/embed/post/2JT2XTaiTxO08wh21dqQrw/92003045635" layout="responsive" width="540" height="480" resizable="" sandbox="allow-scripts allow-popups allow-same-origin"><div overflow="" tabindex="0" role="button" aria-label="See more">See more</div><a href="https://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930" placeholder="">https://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930</a></amp-iframe>' . PHP_EOL . PHP_EOL,
 			],

From 361b712dc90273d3a349cadc329e30a121e81313 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 22 May 2020 09:28:10 -0400
Subject: [PATCH 23/45] Implement `get_raw_embed_nodes` in
 `AMP_Base_Embed_Handler`

---
 includes/class-amp-theme-support.php               |  5 ++++-
 includes/embeds/class-amp-base-embed-handler.php   | 14 +++++++++++---
 .../embeds/class-amp-dailymotion-embed-handler.php | 10 ++++++++++
 includes/embeds/class-amp-gfycat-embed-handler.php | 10 ++++++++++
 includes/embeds/class-amp-issuu-embed-handler.php  |  6 ------
 includes/embeds/class-amp-scribd-embed-handler.php | 12 ++++++++++++
 .../embeds/class-amp-soundcloud-embed-handler.php  | 10 ++++++++++
 includes/embeds/class-amp-vimeo-embed-handler.php  | 10 ++++++++++
 .../class-amp-wordpress-tv-embed-handler.php       | 12 ++++++++++++
 includes/templates/class-amp-content.php           | 11 ++++++++---
 tests/php/test-amp-dailymotion-embed-handler.php   |  4 ++--
 tests/php/test-amp-reddit-embed-handler.php        |  2 +-
 12 files changed, 90 insertions(+), 16 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 0069f164041..b04f9b7fc3c 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1175,7 +1175,10 @@ public static function register_content_embed_handlers() {
 				continue;
 			}
 
-			$embed_handler->register_embed();
+			// @todo Conditional below can be removed once all embed handlers can sanitize raw embeds.
+			if ( method_exists( $embed_handler, 'register_embed' ) ) {
+				$embed_handler->register_embed();
+			}
 			$embed_handlers[] = $embed_handler;
 		}
 
diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index 612cf20f6cd..a818d5557d5 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -78,6 +78,10 @@ public function __construct( $args = [] ) {
 	public function sanitize_raw_embeds( Document $dom ) {
 		$nodes = $this->get_raw_embed_nodes( $dom );
 
+		if ( 0 === $nodes->length ) {
+			return;
+		}
+
 		foreach ( $nodes as $node ) {
 			if ( ! $this->is_raw_embed( $node ) ) {
 				continue;
@@ -88,12 +92,13 @@ public function sanitize_raw_embeds( Document $dom ) {
 
 	/**
 	 * Get all raw embeds from the DOM.
+	 * // @todo This method can be made abstract once all embed handlers can sanitize raw embeds.
 	 *
 	 * @param Document $dom Document.
 	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	protected function get_raw_embed_nodes( Document $dom ) {
-		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
+	protected function get_raw_embed_nodes( Document $dom ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		return new DOMNodeList();
 	}
 
 	/**
@@ -108,10 +113,13 @@ protected function is_raw_embed( DOMElement $node ) {
 
 	/**
 	 * Make embed AMP compatible.
+	 * // @todo Make this method abstract once all embed handlers have `sanitize_raw_embeds` implemented.
 	 *
 	 * @param DOMElement $node DOM element.
 	 */
-	abstract protected function sanitize_raw_embed( DOMElement $node );
+	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		// To be overridden.
+	}
 
 	/**
 	 * Get mapping of AMP component names to AMP script URLs.
diff --git a/includes/embeds/class-amp-dailymotion-embed-handler.php b/includes/embeds/class-amp-dailymotion-embed-handler.php
index 806cb2a62a3..9b9204534b5 100644
--- a/includes/embeds/class-amp-dailymotion-embed-handler.php
+++ b/includes/embeds/class-amp-dailymotion-embed-handler.php
@@ -64,6 +64,16 @@ public function __construct( $args = [] ) {
 		}
 	}
 
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
+	}
+
 	/**
 	 * Make embed AMP compatible.
 	 *
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index eec5d6c93e5..1888001d9b5 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -27,6 +27,16 @@ class AMP_Gfycat_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $base_embed_url = 'https://gfycat.com/ifr/';
 
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
+	}
+
 	/**
 	 * Make embed AMP compatible.
 	 *
diff --git a/includes/embeds/class-amp-issuu-embed-handler.php b/includes/embeds/class-amp-issuu-embed-handler.php
index a4c27109603..f27ef969bcb 100644
--- a/includes/embeds/class-amp-issuu-embed-handler.php
+++ b/includes/embeds/class-amp-issuu-embed-handler.php
@@ -10,12 +10,6 @@
  * Class AMP_Issuu_Embed_Handler
  */
 class AMP_Issuu_Embed_Handler extends AMP_Base_Embed_Handler {
-	/**
-	 * Regex matched to produce output amp-iframe.
-	 *
-	 * @const string
-	 */
-	const URL_PATTERN = '#https?://(www\.)?issuu\.com/.+/docs/.+#i';
 
 	/**
 	 * Register embed.
diff --git a/includes/embeds/class-amp-scribd-embed-handler.php b/includes/embeds/class-amp-scribd-embed-handler.php
index 7b959ea25da..4849cb5db46 100644
--- a/includes/embeds/class-amp-scribd-embed-handler.php
+++ b/includes/embeds/class-amp-scribd-embed-handler.php
@@ -6,6 +6,8 @@
  * @since 1.4
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Scribd_Embed_Handler
  */
@@ -18,6 +20,16 @@ class AMP_Scribd_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $base_embed_url = 'https://www.scribd.com/embeds/';
 
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
+	}
+
 	/**
 	 * Make embed AMP compatible.
 	 *
diff --git a/includes/embeds/class-amp-soundcloud-embed-handler.php b/includes/embeds/class-amp-soundcloud-embed-handler.php
index 32aba776f96..54685998df5 100644
--- a/includes/embeds/class-amp-soundcloud-embed-handler.php
+++ b/includes/embeds/class-amp-soundcloud-embed-handler.php
@@ -35,6 +35,16 @@ class AMP_SoundCloud_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $amp_tag = 'amp-soundcloud';
 
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
+	}
+
 	/**
 	 * Make embed AMP compatible.
 	 *
diff --git a/includes/embeds/class-amp-vimeo-embed-handler.php b/includes/embeds/class-amp-vimeo-embed-handler.php
index c69c43119d8..a37726c723f 100644
--- a/includes/embeds/class-amp-vimeo-embed-handler.php
+++ b/includes/embeds/class-amp-vimeo-embed-handler.php
@@ -64,6 +64,16 @@ public function __construct( $args = [] ) {
 		}
 	}
 
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
+	}
+
 	/**
 	 * Make embed AMP compatible.
 	 *
diff --git a/includes/embeds/class-amp-wordpress-tv-embed-handler.php b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
index 3150261ca6e..de34896c473 100644
--- a/includes/embeds/class-amp-wordpress-tv-embed-handler.php
+++ b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
@@ -6,6 +6,8 @@
  * @since 1.4
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_WordPress_TV_Embed_Handler
  *
@@ -20,6 +22,16 @@ class AMP_WordPress_TV_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $base_embed_url = 'https://video.wordpress.com/embed/';
 
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
+	}
+
 	/**
 	 * Make embed AMP compatible.
 	 *
diff --git a/includes/templates/class-amp-content.php b/includes/templates/class-amp-content.php
index 24a7ead0602..737213cd445 100644
--- a/includes/templates/class-amp-content.php
+++ b/includes/templates/class-amp-content.php
@@ -184,7 +184,10 @@ private function register_embed_handlers( $embed_handler_classes ) {
 				continue;
 			}
 
-			$embed_handler->register_embed();
+			// @todo Conditional below can be removed once all embed handlers can sanitize raw embeds.
+			if ( method_exists( $embed_handler, 'register_embed' ) ) {
+				$embed_handler->register_embed();
+			}
 			$embed_handlers[] = $embed_handler;
 		}
 
@@ -198,8 +201,10 @@ private function register_embed_handlers( $embed_handler_classes ) {
 	 */
 	private function unregister_embed_handlers( $embed_handlers ) {
 		foreach ( $embed_handlers as $embed_handler ) {
-			$this->add_scripts( $embed_handler->get_scripts() );
-			$embed_handler->unregister_embed();
+			// @todo Conditional below can be removed once all embed handlers can sanitize raw embeds.
+			if ( method_exists( $embed_handler, 'unregister_embed' ) ) {
+				$embed_handler->unregister_embed();
+			}
 		}
 	}
 
diff --git a/tests/php/test-amp-dailymotion-embed-handler.php b/tests/php/test-amp-dailymotion-embed-handler.php
index 9b2bb87e3e0..1fb4a24b758 100644
--- a/tests/php/test-amp-dailymotion-embed-handler.php
+++ b/tests/php/test-amp-dailymotion-embed-handler.php
@@ -57,12 +57,12 @@ public function get_conversion_data() {
 
 			'url_simple'     => [
 				'https://www.dailymotion.com/video/x5awwth' . PHP_EOL,
-				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="500" height="212"></amp-dailymotion>' . PHP_EOL,
+				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="480" height="204"></amp-dailymotion>' . PHP_EOL,
 			],
 
 			'url_with_title' => [
 				'http://www.dailymotion.com/video/x5awwth_snatched-official-trailer-2-hd_shortfilms' . PHP_EOL,
-				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="500" height="212"></amp-dailymotion>' . PHP_EOL,
+				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="480" height="204"></amp-dailymotion>' . PHP_EOL,
 			],
 		];
 	}
diff --git a/tests/php/test-amp-reddit-embed-handler.php b/tests/php/test-amp-reddit-embed-handler.php
index 8a394a0ad2c..6711599d44b 100644
--- a/tests/php/test-amp-reddit-embed-handler.php
+++ b/tests/php/test-amp-reddit-embed-handler.php
@@ -57,7 +57,7 @@ public function get_conversion_data() {
 
 			'url_simple' => [
 				'https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/' . PHP_EOL,
-				'<amp-embedly-card layout="responsive" width="100" height="100" data-url="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share"><blockquote class="reddit-card" placeholder=""><p>      <a href="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share">Sticky bun for you!</a> from      <a href="https://www.reddit.com/r/aww/">aww</a>    </p></blockquote></amp-embedly-card>' . PHP_EOL . PHP_EOL,
+				'<amp-embedly-card layout="responsive" width="100" height="100" data-url="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share"><blockquote class="reddit-card" placeholder=""><p>' . PHP_EOL . '      <a href="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share">Sticky bun for you!</a> from<br>' . PHP_EOL . '      <a href="https://www.reddit.com/r/aww/">aww</a>' . PHP_EOL . '    </p></blockquote></amp-embedly-card>' . PHP_EOL . PHP_EOL,
 			],
 
 			'shortcode'  => [

From 28b4394357d02bdeee5d678cdc3cdea5d0038dc1 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 22 May 2020 09:51:18 -0400
Subject: [PATCH 24/45] Remove `get_parent_element` method

---
 includes/embeds/class-amp-base-embed-handler.php | 11 +++++++----
 includes/utils/class-amp-dom-utils.php           | 15 ---------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index a818d5557d5..7f59b5580d5 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -189,12 +189,15 @@ static function ( DOMNode $child ) {
 	 * @param DOMElement $node Node.
 	 */
 	protected function unwrap_p_element( DOMElement $node ) {
-		$parent_element = AMP_DOM_Utils::get_parent_element( $node );
+		$parent_node = $node->parentNode;
+		while ( $parent_node && ! ( $parent_node instanceof DOMElement ) ) {
+			$parent_node = $parent_node->parentNode;
+		}
 
-		if ( $parent_element && 'p' === $parent_element->nodeName && false === $parent_element->hasAttributes() ) {
-			$child_element_count = count( $this->get_child_elements( $parent_element ) );
+		if ( $parent_node instanceof DOMElement && 'p' === $parent_node->nodeName && false === $parent_node->hasAttributes() ) {
+			$child_element_count = count( $this->get_child_elements( $parent_node ) );
 			if ( 1 === $child_element_count ) {
-				$parent_element->parentNode->replaceChild( $node, $parent_element );
+				$parent_node->parentNode->replaceChild( $node, $parent_node );
 			}
 		}
 	}
diff --git a/includes/utils/class-amp-dom-utils.php b/includes/utils/class-amp-dom-utils.php
index ba16afb9a91..c7eadeaf234 100644
--- a/includes/utils/class-amp-dom-utils.php
+++ b/includes/utils/class-amp-dom-utils.php
@@ -490,19 +490,4 @@ public static function copy_attributes( $attributes, DOMElement $from, DOMElemen
 			}
 		}
 	}
-
-	/**
-	 * Get closest parent element for specified DOM node.
-	 *
-	 * @param DOMNode $node DOMNode.
-	 * @return DOMElement|null
-	 */
-	public static function get_parent_element( DOMNode $node ) {
-		$parent_node = $node->parentNode;
-		while ( $parent_node && ! ( $parent_node instanceof DOMElement ) ) {
-			$parent_node = $parent_node->parentNode;
-		}
-
-		return $parent_node;
-	}
 }

From c663535fd65b1c4d2d0c999d3423e590ec406b58 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 4 Jun 2020 21:11:41 -0400
Subject: [PATCH 25/45] Make YouTube xpath query more specific

---
 .../embeds/class-amp-youtube-embed-handler.php    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/includes/embeds/class-amp-youtube-embed-handler.php b/includes/embeds/class-amp-youtube-embed-handler.php
index 458f4ac3507..e9286cd004d 100644
--- a/includes/embeds/class-amp-youtube-embed-handler.php
+++ b/includes/embeds/class-amp-youtube-embed-handler.php
@@ -42,6 +42,13 @@ class AMP_YouTube_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $amp_tag = 'amp-youtube';
 
+	/**
+	 * List of domains that are applicable for this embed.
+	 *
+	 * @var string[]
+	 */
+	protected $applicable_domains = [ 'youtu.be', 'youtube.com', 'youtube-nocookie.com' ];
+
 	/**
 	 * AMP_YouTube_Embed_Handler constructor.
 	 *
@@ -65,7 +72,11 @@ public function __construct( $args = [] ) {
 	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
-		return $dom->xpath->query( '//iframe[ @src ]' );
+		$query_segments = array_map( static function ( $domain ) {
+			return sprintf( 'contains( @src, "%s" )', $domain );
+		}, $this->applicable_domains );
+		$query = implode( ' or ', $query_segments );
+		return $dom->xpath->query( sprintf( '//iframe[ %s ]', $query ) );
 	}
 
 	/**
@@ -161,7 +172,7 @@ private function get_video_id_from_url( $url ) {
 		}
 
 		$domain = implode( '.', array_slice( explode( '.', $parsed_url['host'] ), -2 ) );
-		if ( ! in_array( $domain, [ 'youtu.be', 'youtube.com', 'youtube-nocookie.com' ], true ) ) {
+		if ( ! in_array( $domain, $this->applicable_domains, true ) ) {
 			return false;
 		}
 

From 573334a41f8938ab807622596ce8fa88f67ee80f Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Wed, 17 Jun 2020 21:22:02 -0400
Subject: [PATCH 26/45] Fix lint issues

---
 includes/embeds/class-amp-youtube-embed-handler.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/includes/embeds/class-amp-youtube-embed-handler.php b/includes/embeds/class-amp-youtube-embed-handler.php
index c0760567639..7a757593927 100644
--- a/includes/embeds/class-amp-youtube-embed-handler.php
+++ b/includes/embeds/class-amp-youtube-embed-handler.php
@@ -72,10 +72,13 @@ public function __construct( $args = [] ) {
 	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
-		$query_segments = array_map( static function ( $domain ) {
-			return sprintf( 'contains( @src, "%s" )', $domain );
-		}, $this->applicable_domains );
-		$query = implode( ' or ', $query_segments );
+		$query_segments = array_map(
+			static function ( $domain ) {
+				return sprintf( 'contains( @src, "%s" )', $domain );
+			},
+			$this->applicable_domains
+		);
+		$query          = implode( ' or ', $query_segments );
 		return $dom->xpath->query( sprintf( '//iframe[ %s ]', $query ) );
 	}
 

From c695846ed3f58446dc57c30568af346ef78f4914 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Wed, 17 Jun 2020 21:22:56 -0400
Subject: [PATCH 27/45] Mock Instagram embed test

---
 .../class-amp-instagram-embed-handler.php     |  6 +--
 .../php/test-amp-instagram-embed-handler.php  | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/includes/embeds/class-amp-instagram-embed-handler.php b/includes/embeds/class-amp-instagram-embed-handler.php
index 9ceb6f00273..4713d9c7c47 100644
--- a/includes/embeds/class-amp-instagram-embed-handler.php
+++ b/includes/embeds/class-amp-instagram-embed-handler.php
@@ -44,7 +44,7 @@ class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
-		return $dom->getElementsByTagName( 'blockquote' );
+		return $dom->xpath->query( '//blockquote[ @data-instgrm-permalink ]' );
 	}
 
 	/**
@@ -53,10 +53,6 @@ protected function get_raw_embed_nodes( Document $dom ) {
 	 * @param DOMElement $node DOM element.
 	 */
 	protected function sanitize_raw_embed( DOMElement $node ) {
-		if ( ! $node->hasAttribute( 'data-instgrm-permalink' ) ) {
-			return;
-		}
-
 		$instagram_id = $this->get_instagram_id_from_url( $node->getAttribute( 'data-instgrm-permalink' ) );
 
 		$node_args = [
diff --git a/tests/php/test-amp-instagram-embed-handler.php b/tests/php/test-amp-instagram-embed-handler.php
index eafae727272..5f4a0bfe201 100644
--- a/tests/php/test-amp-instagram-embed-handler.php
+++ b/tests/php/test-amp-instagram-embed-handler.php
@@ -2,6 +2,52 @@
 
 class AMP_Instagram_Embed_Handler_Test extends WP_UnitTestCase {
 
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		parent::setUp();
+
+		// Mock the HTTP request.
+		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
+	}
+
+	/**
+	 * Tear down.
+	 */
+	public function tearDown() {
+		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
+		parent::tearDown();
+	}
+
+	/**
+	 * Mock HTTP request.
+	 *
+	 * @param mixed  $pre Whether to preempt an HTTP request's return value. Default false.
+	 * @param mixed  $r   HTTP request arguments.
+	 * @param string $url The request URL.
+	 * @return array Response data.
+	 */
+	public function mock_http_request( $pre, $r, $url ) {
+		if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
+			return $pre;
+		}
+
+		if ( false === strpos( $url, '7-l0z_p4A4' ) ) {
+			return $pre;
+		}
+
+		$body = '{"version": "1.0", "title": "Ice Bear requires more sprinkles.\ud83c\udf66#lastdaysofsummer #webarebears", "author_name": "cartoonnetworkofficial", "author_url": "https://www.instagram.com/cartoonnetworkofficial", "author_id": 1385592527, "media_id": "1080467317577973816_1385592527", "provider_name": "Instagram", "provider_url": "https://www.instagram.com", "type": "rich", "width": 658, "height": null, "html": "\u003cblockquote class=\"instagram-media\" data-instgrm-captioned data-instgrm-permalink=\"https://www.instagram.com/p/7-l0z_p4A4/?utm_source=ig_embed\u0026amp;utm_campaign=loading\" data-instgrm-version=\"12\" style=\" background:#FFF; border:0; border-radius:3px; box-shadow:0 0 1px 0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin: 1px; max-width:658px; min-width:326px; padding:0; width:99.375%; width:-webkit-calc(100% - 2px); width:calc(100% - 2px);\"\u003e\u003cdiv style=\"padding:16px;\"\u003e \u003ca href=\"https://www.instagram.com/p/7-l0z_p4A4/?utm_source=ig_embed\u0026amp;utm_campaign=loading\" style=\" background:#FFFFFF; line-height:0; padding:0 0; text-align:center; text-decoration:none; width:100%;\" target=\"_blank\"\u003e \u003cdiv style=\" display: flex; flex-direction: row; align-items: center;\"\u003e \u003cdiv style=\"background-color: #F4F4F4; border-radius: 50%; flex-grow: 0; height: 40px; margin-right: 14px; width: 40px;\"\u003e\u003c/div\u003e \u003cdiv style=\"display: flex; flex-direction: column; flex-grow: 1; justify-content: center;\"\u003e \u003cdiv style=\" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; margin-bottom: 6px; width: 100px;\"\u003e\u003c/div\u003e \u003cdiv style=\" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; width: 60px;\"\u003e\u003c/div\u003e\u003c/div\u003e\u003c/div\u003e\u003cdiv style=\"padding: 19% 0;\"\u003e\u003c/div\u003e \u003cdiv style=\"display:block; height:50px; margin:0 auto 12px; width:50px;\"\u003e\u003csvg width=\"50px\" height=\"50px\" viewBox=\"0 0 60 60\" version=\"1.1\" xmlns=\"https://www.w3.org/2000/svg\" xmlns:xlink=\"https://www.w3.org/1999/xlink\"\u003e\u003cg stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\"\u003e\u003cg transform=\"translate(-511.000000, -20.000000)\" fill=\"#000000\"\u003e\u003cg\u003e\u003cpath d=\"M556.869,30.41 C554.814,30.41 553.148,32.076 553.148,34.131 C553.148,36.186 554.814,37.852 556.869,37.852 C558.924,37.852 560.59,36.186 560.59,34.131 C560.59,32.076 558.924,30.41 556.869,30.41 M541,60.657 C535.114,60.657 530.342,55.887 530.342,50 C530.342,44.114 535.114,39.342 541,39.342 C546.887,39.342 551.658,44.114 551.658,50 C551.658,55.887 546.887,60.657 541,60.657 M541,33.886 C532.1,33.886 524.886,41.1 524.886,50 C524.886,58.899 532.1,66.113 541,66.113 C549.9,66.113 557.115,58.899 557.115,50 C557.115,41.1 549.9,33.886 541,33.886 M565.378,62.101 C565.244,65.022 564.756,66.606 564.346,67.663 C563.803,69.06 563.154,70.057 562.106,71.106 C561.058,72.155 560.06,72.803 558.662,73.347 C557.607,73.757 556.021,74.244 553.102,74.378 C549.944,74.521 548.997,74.552 541,74.552 C533.003,74.552 532.056,74.521 528.898,74.378 C525.979,74.244 524.393,73.757 523.338,73.347 C521.94,72.803 520.942,72.155 519.894,71.106 C518.846,70.057 518.197,69.06 517.654,67.663 C517.244,66.606 516.755,65.022 516.623,62.101 C516.479,58.943 516.448,57.996 516.448,50 C516.448,42.003 516.479,41.056 516.623,37.899 C516.755,34.978 517.244,33.391 517.654,32.338 C518.197,30.938 518.846,29.942 519.894,28.894 C520.942,27.846 521.94,27.196 523.338,26.654 C524.393,26.244 525.979,25.756 528.898,25.623 C532.057,25.479 533.004,25.448 541,25.448 C548.997,25.448 549.943,25.479 553.102,25.623 C556.021,25.756 557.607,26.244 558.662,26.654 C560.06,27.196 561.058,27.846 562.106,28.894 C563.154,29.942 563.803,30.938 564.346,32.338 C564.756,33.391 565.244,34.978 565.378,37.899 C565.522,41.056 565.552,42.003 565.552,50 C565.552,57.996 565.522,58.943 565.378,62.101 M570.82,37.631 C570.674,34.438 570.167,32.258 569.425,30.349 C568.659,28.377 567.633,26.702 565.965,25.035 C564.297,23.368 562.623,22.342 560.652,21.575 C558.743,20.834 556.562,20.326 553.369,20.18 C550.169,20.033 549.148,20 541,20 C532.853,20 531.831,20.033 528.631,20.18 C525.438,20.326 523.257,20.834 521.349,21.575 C519.376,22.342 517.703,23.368 516.035,25.035 C514.368,26.702 513.342,28.377 512.574,30.349 C511.834,32.258 511.326,34.438 511.181,37.631 C511.035,40.831 511,41.851 511,50 C511,58.147 511.035,59.17 511.181,62.369 C511.326,65.562 511.834,67.743 512.574,69.651 C513.342,71.625 514.368,73.296 516.035,74.965 C517.703,76.634 519.376,77.658 521.349,78.425 C523.257,79.167 525.438,79.673 528.631,79.82 C531.831,79.965 532.853,80.001 541,80.001 C549.148,80.001 550.169,79.965 553.369,79.82 C556.562,79.673 558.743,79.167 560.652,78.425 C562.623,77.658 564.297,76.634 565.965,74.965 C567.633,73.296 568.659,71.625 569.425,69.651 C570.167,67.743 570.674,65.562 570.82,62.369 C570.966,59.17 571,58.147 571,50 C571,41.851 570.966,40.831 570.82,37.631\"\u003e\u003c/path\u003e\u003c/g\u003e\u003c/g\u003e\u003c/g\u003e\u003c/svg\u003e\u003c/div\u003e\u003cdiv style=\"padding-top: 8px;\"\u003e \u003cdiv style=\" color:#3897f0; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:550; line-height:18px;\"\u003e View this post on Instagram\u003c/div\u003e\u003c/div\u003e\u003cdiv style=\"padding: 12.5% 0;\"\u003e\u003c/div\u003e \u003cdiv style=\"display: flex; flex-direction: row; margin-bottom: 14px; align-items: center;\"\u003e\u003cdiv\u003e \u003cdiv style=\"background-color: #F4F4F4; border-radius: 50%; height: 12.5px; width: 12.5px; transform: translateX(0px) translateY(7px);\"\u003e\u003c/div\u003e \u003cdiv style=\"background-color: #F4F4F4; height: 12.5px; transform: rotate(-45deg) translateX(3px) translateY(1px); width: 12.5px; flex-grow: 0; margin-right: 14px; margin-left: 2px;\"\u003e\u003c/div\u003e \u003cdiv style=\"background-color: #F4F4F4; border-radius: 50%; height: 12.5px; width: 12.5px; transform: translateX(9px) translateY(-18px);\"\u003e\u003c/div\u003e\u003c/div\u003e\u003cdiv style=\"margin-left: 8px;\"\u003e \u003cdiv style=\" background-color: #F4F4F4; border-radius: 50%; flex-grow: 0; height: 20px; width: 20px;\"\u003e\u003c/div\u003e \u003cdiv style=\" width: 0; height: 0; border-top: 2px solid transparent; border-left: 6px solid #f4f4f4; border-bottom: 2px solid transparent; transform: translateX(16px) translateY(-4px) rotate(30deg)\"\u003e\u003c/div\u003e\u003c/div\u003e\u003cdiv style=\"margin-left: auto;\"\u003e \u003cdiv style=\" width: 0px; border-top: 8px solid #F4F4F4; border-right: 8px solid transparent; transform: translateY(16px);\"\u003e\u003c/div\u003e \u003cdiv style=\" background-color: #F4F4F4; flex-grow: 0; height: 12px; width: 16px; transform: translateY(-4px);\"\u003e\u003c/div\u003e \u003cdiv style=\" width: 0; height: 0; border-top: 8px solid #F4F4F4; border-left: 8px solid transparent; transform: translateY(-4px) translateX(8px);\"\u003e\u003c/div\u003e\u003c/div\u003e\u003c/div\u003e\u003c/a\u003e \u003cp style=\" margin:8px 0 0 0; padding:0 4px;\"\u003e \u003ca href=\"https://www.instagram.com/p/7-l0z_p4A4/?utm_source=ig_embed\u0026amp;utm_campaign=loading\" style=\" color:#000; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:normal; line-height:17px; text-decoration:none; word-wrap:break-word;\" target=\"_blank\"\u003eIce Bear requires more sprinkles.\ud83c\udf66#lastdaysofsummer #webarebears\u003c/a\u003e\u003c/p\u003e \u003cp style=\" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; line-height:17px; margin-bottom:0; margin-top:8px; overflow:hidden; padding:8px 0 7px; text-align:center; text-overflow:ellipsis; white-space:nowrap;\"\u003eA post shared by \u003ca href=\"https://www.instagram.com/cartoonnetworkofficial/?utm_source=ig_embed\u0026amp;utm_campaign=loading\" style=\" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:normal; line-height:17px;\" target=\"_blank\"\u003e Cartoon Network\u003c/a\u003e (@cartoonnetworkofficial) on \u003ctime style=\" font-family:Arial,sans-serif; font-size:14px; line-height:17px;\" datetime=\"2015-09-23T15:22:43+00:00\"\u003eSep 23, 2015 at 8:22am PDT\u003c/time\u003e\u003c/p\u003e\u003c/div\u003e\u003c/blockquote\u003e\n\u003cscript async src=\"//www.instagram.com/embed.js\"\u003e\u003c/script\u003e", "thumbnail_url": "https://scontent-lga3-1.cdninstagram.com/v/t51.2885-15/sh0.08/e35/s640x640/11906204_1475523516088375_164900015_n.jpg?_nc_ht=scontent-lga3-1.cdninstagram.com\u0026_nc_cat=107\u0026_nc_ohc=eKlJu6SefhcAX_CwEfY\u0026oh=2ad53afd14a8357251b2b945f4ff28a3\u0026oe=5F1369B7", "thumbnail_width": 640, "thumbnail_height": 640}';
+
+		return [
+			'body'     => $body,
+			'response' => [
+				'code'    => 200,
+				'message' => 'OK',
+			],
+		];
+	}
+
 	public function get_conversion_data() {
 		return [
 			'no_embed'                           => [

From 67bf70854ef779a916f8b6c1e715073a039c6e73 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Wed, 17 Jun 2020 21:35:12 -0400
Subject: [PATCH 28/45] Update docblocks specifying alternative return values

---
 includes/embeds/class-amp-twitter-embed-handler.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/embeds/class-amp-twitter-embed-handler.php b/includes/embeds/class-amp-twitter-embed-handler.php
index 2234d43722e..c4ceca4c171 100644
--- a/includes/embeds/class-amp-twitter-embed-handler.php
+++ b/includes/embeds/class-amp-twitter-embed-handler.php
@@ -193,7 +193,7 @@ protected function sanitize_raw_embeds_with_type( $embed_type, DOMNodeList $node
 	 * Extracts Tweet id.
 	 *
 	 * @param DOMElement $node The DOMNode to adjust and replace.
-	 * @return string Tweet ID, or null if not found.
+	 * @return string|null Tweet ID, or null if not found.
 	 */
 	private function get_tweet_id( DOMElement $node ) {
 		$anchors = $node->getElementsByTagName( 'a' );
@@ -217,7 +217,7 @@ private function get_tweet_id( DOMElement $node ) {
 	 * Parse Twitter timeline attributes from a URL.
 	 *
 	 * @param string $url URL.
-	 * @return array Timeline attributes.
+	 * @return array|null Timeline attributes, or null if the attributes were not found.
 	 */
 	private function get_timeline_attributes( $url ) {
 		$found = preg_match( self::URL_PATTERN_TIMELINE, $url, $matches );
@@ -232,7 +232,7 @@ private function get_timeline_attributes( $url ) {
 	 * Parse Twitter moment ID from a URL.
 	 *
 	 * @param string $url URL.
-	 * @return array Timeline attributes.
+	 * @return array|null Timeline attributes, or null if the moment ID was not found.
 	 */
 	private function get_moment_id( $url ) {
 		$found = preg_match( self::URL_PATTERN_MOMENT, $url, $matches );

From e1c768d0e3be61e793a89b686f462b50af11e031 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 18 Jun 2020 20:36:59 -0400
Subject: [PATCH 29/45] Fix test cases for Dailymotion, Twitter, Gfycat and
 WordPress TV embeds

---
 .../embeds/class-amp-gfycat-embed-handler.php | 15 +++++++++-----
 .../class-amp-twitter-embed-handler.php       | 13 +++++++++++-
 .../test-amp-dailymotion-embed-handler.php    |  6 +++---
 tests/php/test-amp-twitter-embed-handler.php  | 20 +++++++++----------
 .../test-class-amp-gfycat-embed-handler.php   |  6 +++---
 ...t-class-amp-wordpress-tv-embed-handler.php |  2 +-
 6 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index 1888001d9b5..a5790f44661 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -58,12 +58,17 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			'width'      => $this->args['width'],
 		];
 
-		if ( $node->hasAttribute( 'width' ) ) {
-			$attributes['width'] = $node->getAttribute( 'width' );
-		}
+		if ( '100%' === $node->getAttribute( 'width' ) && '100%' === $node->getAttribute( 'height' ) ) {
+			$attributes['layout'] = 'fill';
+			unset( $attributes['width'], $attributes['height'] );
+		} else {
+			if ( $node->hasAttribute( 'width' ) ) {
+				$attributes['width'] = $node->getAttribute( 'width' );
+			}
 
-		if ( $node->hasAttribute( 'height' ) ) {
-			$attributes['height'] = $node->getAttribute( 'height' );
+			if ( $node->hasAttribute( 'height' ) ) {
+				$attributes['height'] = $node->getAttribute( 'height' );
+			}
 		}
 
 		$amp_node = AMP_DOM_Utils::create_node(
diff --git a/includes/embeds/class-amp-twitter-embed-handler.php b/includes/embeds/class-amp-twitter-embed-handler.php
index c4ceca4c171..37bfe5e7540 100644
--- a/includes/embeds/class-amp-twitter-embed-handler.php
+++ b/includes/embeds/class-amp-twitter-embed-handler.php
@@ -119,6 +119,16 @@ protected function sanitize_raw_embeds_with_type( $embed_type, DOMNodeList $node
 				'layout' => 'responsive',
 			];
 
+			if ( $node->hasAttribute( 'data-width' ) ) {
+				$attributes['width'] = $node->getAttribute( 'data-width' );
+				$node->removeAttribute( 'data-width' );
+			}
+
+			if ( $node->hasAttribute( 'data-height' ) ) {
+				$attributes['height'] = $node->getAttribute( 'data-height' );
+				$node->removeAttribute( 'data-height' );
+			}
+
 			switch ( $embed_type ) {
 				case 'tweet':
 					$tweet_id = $this->get_tweet_id( $node );
@@ -157,9 +167,10 @@ protected function sanitize_raw_embeds_with_type( $embed_type, DOMNodeList $node
 
 			if ( $node->hasAttributes() ) {
 				foreach ( $node->attributes as $attr ) {
-					// Copy only `data-` attributes.
+					// Strip `data-` attributes and apply them to the AMP component.
 					if ( false !== strpos( $attr->nodeName, 'data-', 0 ) ) {
 						$attributes[ $attr->nodeName ] = $attr->nodeValue;
+						$node->removeAttribute( $attr->nodeName );
 					}
 				}
 			}
diff --git a/tests/php/test-amp-dailymotion-embed-handler.php b/tests/php/test-amp-dailymotion-embed-handler.php
index 1fb4a24b758..b31fbf65b38 100644
--- a/tests/php/test-amp-dailymotion-embed-handler.php
+++ b/tests/php/test-amp-dailymotion-embed-handler.php
@@ -37,7 +37,7 @@ public function mock_http_request( $pre, $r, $url ) {
 			return $pre;
 		}
 
-		$body = '{"type":"video","version":"1.0","provider_name":"Dailymotion","provider_url":"https:\/\/www.dailymotion.com","title":"Snatched - Official Trailer 2 (HD)","description":"M\u00e1s info http:\/\/trailersyestrenos.es\/snatched-jonathan-levine\/ - TWITTER: https:\/\/twitter.com\/TrailersyEstren - FACEBOOK: https:\/\/www.facebook.com\/trailersyestrenos - GOOGLE+: https:\/\/www.google.com\/+TrailersyEstrenos  Sinopsis: Una madre y una hija se enfrentar\u00e1n a distintos problemas que surgen mientras est\u00e1n de vacaciones  Director: Jonathan Levine Reparto: Amy Schumer, Ike Barinholtz, Goldie Hawn, Christopher Meloni, Randall Park, Wanda Sykes, \u00d3scar Jaenada, Colin Quinn, Tom Bateman, Kevin Kane, Sharon M. Bell  (El trailer pertenece a la productora y distribuidora de la pel\u00edcula y ha sido subido sin \u00e1nimo de lucro)","author_name":"Trailers y Estrenos","author_url":"https:\/\/www.dailymotion.com\/TrailersyEstrenos","width":480,"height":204,"html":"<iframe frameborder=\"0\" width=\"480\" height=\"204\" src=\"https:\/\/www.dailymotion.com\/embed\/video\/x5awwth\" allowfullscreen allow=\"autoplay\"><\/iframe>","thumbnail_url":"https:\/\/s2.dmcdn.net\/v\/J7Emb1Ungw3_0rEtU\/x120","thumbnail_width":214,"thumbnail_height":120}';
+		$body = '{"type":"video","version":"1.0","provider_name":"Dailymotion","provider_url":"https:\/\/www.dailymotion.com","title":"Snatched - Official Trailer 2 (HD)","description":"M\u00e1s info http:\/\/trailersyestrenos.es\/snatched-jonathan-levine\/ - TWITTER: https:\/\/twitter.com\/TrailersyEstren - FACEBOOK: https:\/\/www.facebook.com\/trailersyestrenos - GOOGLE+: https:\/\/www.google.com\/+TrailersyEstrenos  Sinopsis: Una madre y una hija se enfrentar\u00e1n a distintos problemas que surgen mientras est\u00e1n de vacaciones  Director: Jonathan Levine Reparto: Amy Schumer, Ike Barinholtz, Goldie Hawn, Christopher Meloni, Randall Park, Wanda Sykes, \u00d3scar Jaenada, Colin Quinn, Tom Bateman, Kevin Kane, Sharon M. Bell  (El trailer pertenece a la productora y distribuidora de la pel\u00edcula y ha sido subido sin \u00e1nimo de lucro)","author_name":"Trailers y Estrenos","author_url":"https:\/\/www.dailymotion.com\/TrailersyEstrenos","width":480,"height":204,"html":"<iframe frameborder=\"0\" width=\"480\" height=\"204\" src=\"https:\/\/www.dailymotion.com\/embed\/video\/x5awwth\" allowfullscreen allow=\"autoplay\"><\/iframe>","thumbnail_url":"https:\/\/s1.dmcdn.net\/v\/J7Emb1UwvEwLi4MKo\/x120","thumbnail_width":214,"thumbnail_height":120}';
 
 		return [
 			'body'     => $body,
@@ -57,12 +57,12 @@ public function get_conversion_data() {
 
 			'url_simple'     => [
 				'https://www.dailymotion.com/video/x5awwth' . PHP_EOL,
-				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="480" height="204"></amp-dailymotion>' . PHP_EOL,
+				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="500" height="212"></amp-dailymotion>' . PHP_EOL,
 			],
 
 			'url_with_title' => [
 				'http://www.dailymotion.com/video/x5awwth_snatched-official-trailer-2-hd_shortfilms' . PHP_EOL,
-				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="480" height="204"></amp-dailymotion>' . PHP_EOL,
+				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="500" height="212"></amp-dailymotion>' . PHP_EOL,
 			],
 		];
 	}
diff --git a/tests/php/test-amp-twitter-embed-handler.php b/tests/php/test-amp-twitter-embed-handler.php
index 7cc3c60578b..2d9b7d2c42e 100644
--- a/tests/php/test-amp-twitter-embed-handler.php
+++ b/tests/php/test-amp-twitter-embed-handler.php
@@ -94,52 +94,52 @@ public function get_conversion_data() {
 
 			'url_simple'                              => [
 				'https://twitter.com/wordpress/status/987437752164737025',
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-width="500" data-dnt="true"><blockquote class="twitter-tweet" data-width="500" data-dnt="true" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+				'<amp-twitter width="500" height="480" layout="responsive" data-tweetid="987437752164737025" data-dnt="true"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
 
 			'url_with_big_tweet_id'                   => [
 				'https://twitter.com/wordpress/status/705219971425574912' . PHP_EOL,
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="705219971425574912" data-width="500" data-dnt="true"><blockquote class="twitter-tweet" data-width="500" data-dnt="true" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">On our way to the <a href="https://twitter.com/hashtag/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw">#GoogleDance</a>! <a href="https://twitter.com/hashtag/SMX?src=hash&amp;ref_src=twsrc%5Etfw">#SMX</a> 💃🏻 <a href="https://t.co/N8kZ9M3eN4">pic.twitter.com/N8kZ9M3eN4</a></p>' . PHP_EOL . '<p>— Search Engine Land (@sengineland) <a href="https://twitter.com/sengineland/status/705219971425574912?ref_src=twsrc%5Etfw">March 3, 2016</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+				'<amp-twitter width="500" height="480" layout="responsive" data-tweetid="705219971425574912" data-dnt="true"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">On our way to the <a href="https://twitter.com/hashtag/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw">#GoogleDance</a>! <a href="https://twitter.com/hashtag/SMX?src=hash&amp;ref_src=twsrc%5Etfw">#SMX</a> 💃🏻 <a href="https://t.co/N8kZ9M3eN4">pic.twitter.com/N8kZ9M3eN4</a></p>' . PHP_EOL . '<p>— Search Engine Land (@sengineland) <a href="https://twitter.com/sengineland/status/705219971425574912?ref_src=twsrc%5Etfw">March 3, 2016</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
 
 			'timeline_url_with_profile'               => [
 				'https://twitter.com/wordpress' . PHP_EOL,
-				'<amp-twitter width="600" height="480" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/WordPress?ref_src=twsrc%5Etfw"><a class="twitter-timeline" href="https://twitter.com/WordPress?ref_src=twsrc%5Etfw" placeholder="">Tweets by WordPress</a></amp-twitter>' . PHP_EOL,
+				'<amp-twitter width="500" height="750" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/WordPress?ref_src=twsrc%5Etfw" data-dnt="true"><a class="twitter-timeline" href="https://twitter.com/WordPress?ref_src=twsrc%5Etfw" placeholder="">Tweets by WordPress</a></amp-twitter>' . PHP_EOL,
 			],
 
 			'timeline_url_with_likes'                 => [
 				'https://twitter.com/wordpress/likes' . PHP_EOL,
-				'<amp-twitter width="600" height="480" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/WordPress/likes?ref_src=twsrc%5Etfw"><a class="twitter-timeline" href="https://twitter.com/WordPress/likes?ref_src=twsrc%5Etfw" placeholder="">Tweets Liked by @WordPress</a></amp-twitter>' . PHP_EOL,
+				'<amp-twitter width="500" height="750" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/WordPress/likes?ref_src=twsrc%5Etfw" data-dnt="true"><a class="twitter-timeline" href="https://twitter.com/WordPress/likes?ref_src=twsrc%5Etfw" placeholder="">Tweets Liked by @WordPress</a></amp-twitter>' . PHP_EOL,
 			],
 
 			'timeline_url_with_list'                  => [
 				'https://twitter.com/robertnyman/lists/web-gdes' . PHP_EOL,
-				'<amp-twitter width="600" height="480" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/robertnyman/lists/web-gdes?ref_src=twsrc%5Etfw"><a class="twitter-timeline" href="https://twitter.com/robertnyman/lists/web-gdes?ref_src=twsrc%5Etfw" placeholder="">A Twitter List by robertnyman</a></amp-twitter>' . PHP_EOL,
+				'<amp-twitter width="500" height="750" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/robertnyman/lists/web-gdes?ref_src=twsrc%5Etfw" data-dnt="true"><a class="twitter-timeline" href="https://twitter.com/robertnyman/lists/web-gdes?ref_src=twsrc%5Etfw" placeholder="">A Twitter List by robertnyman</a></amp-twitter>' . PHP_EOL,
 			],
 
 			'moment_url'                              => [
 				'https://twitter.com/i/moments/625792726546558977' . PHP_EOL,
-				'<amp-twitter width="600" height="480" layout="responsive" data-momentid="625792726546558977"><a class="twitter-moment" href="https://twitter.com/i/moments/625792726546558977?ref_src=twsrc%5Etfw" placeholder="">Michelle Obama Opens Special Olympics</a></amp-twitter>' . PHP_EOL,
+				'<amp-twitter width="500" height="480" layout="responsive" data-momentid="625792726546558977" data-dnt="true"><a class="twitter-moment" href="https://twitter.com/i/moments/625792726546558977?ref_src=twsrc%5Etfw" placeholder="">Michelle Obama Opens Special Olympics</a></amp-twitter>' . PHP_EOL,
 			],
 
 			'blockquote_embed'                        => [
 				wpautop( '<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-lang="en"><blockquote class="twitter-tweet" data-lang="en" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-lang="en"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
 
 			'blockquote_embed_with_data_conversation' => [
 				wpautop( '<blockquote class="twitter-tweet" data-conversation="none"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>&mdash; WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-conversation="none"><blockquote class="twitter-tweet" data-conversation="none" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-conversation="none"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
 
 			'blockquote_embed_with_data_theme'        => [
 				wpautop( '<blockquote class="twitter-tweet" data-theme="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>&mdash; WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-theme="en"><blockquote class="twitter-tweet" data-theme="en" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-theme="en"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
 
 			'blockquote_embed_not_autop'              => [
 				'<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-lang="en"><blockquote class="twitter-tweet" data-lang="en" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-lang="en"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
 		];
 	}
diff --git a/tests/php/test-class-amp-gfycat-embed-handler.php b/tests/php/test-class-amp-gfycat-embed-handler.php
index 59e9a7ef063..3e6f1ff63ed 100644
--- a/tests/php/test-class-amp-gfycat-embed-handler.php
+++ b/tests/php/test-class-amp-gfycat-embed-handler.php
@@ -63,17 +63,17 @@ public function get_conversion_data() {
 
 			'url_simple'      => [
 				'https://gfycat.com/tautwhoppingcougar' . PHP_EOL,
-				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="responsive" height="100" width="100"></amp-gfycat>' . PHP_EOL,
+				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="fill"></amp-gfycat>' . PHP_EOL,
 			],
 
 			'url_with_detail' => [
 				'https://gfycat.com/gifs/detail/tautwhoppingcougar' . PHP_EOL,
-				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="responsive" height="100" width="100"></amp-gfycat>' . PHP_EOL,
+				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="fill"></amp-gfycat>' . PHP_EOL,
 			],
 
 			'url_with_params' => [
 				'https://gfycat.com/gifs/detail/tautwhoppingcougar?foo=bar' . PHP_EOL,
-				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="responsive" height="100" width="100"></amp-gfycat>' . PHP_EOL,
+				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="fill"></amp-gfycat>' . PHP_EOL,
 			],
 
 		];
diff --git a/tests/php/test-class-amp-wordpress-tv-embed-handler.php b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
index f31f7710911..7f13db7cb44 100644
--- a/tests/php/test-class-amp-wordpress-tv-embed-handler.php
+++ b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
@@ -74,7 +74,7 @@ public function get_conversion_data() {
 
 			'correct_url'                   => [
 				'https://wordpress.tv/2019/10/08/the-history-of-wordpress-in-four-minutes/',
-				'<iframe width="500" height="281" src="https://video.wordpress.com/embed/yFCmLMGL?hd=0" frameborder="0" allowfullscreen layout="responsive"></iframe>' . PHP_EOL,
+				'<iframe width="500" height="281" src="https://video.wordpress.com/embed/yFCmLMGL?hd=1" frameborder="0" allowfullscreen layout="responsive"></iframe>' . PHP_EOL,
 			],
 		];
 	}

From 5b2ece9842d7dcc392046a2e8d1550c67af9bfb1 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 19 Jun 2020 00:59:01 -0400
Subject: [PATCH 30/45] Update mocked responses

---
 tests/php/test-amp-dailymotion-embed-handler.php        | 2 +-
 tests/php/test-amp-twitter-embed-handler.php            | 8 ++++----
 tests/php/test-class-amp-gfycat-embed-handler.php       | 2 +-
 tests/php/test-class-amp-hulu-embed-handler.php         | 4 ++++
 tests/php/test-class-amp-wordpress-tv-embed-handler.php | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/tests/php/test-amp-dailymotion-embed-handler.php b/tests/php/test-amp-dailymotion-embed-handler.php
index b31fbf65b38..f97aebf8604 100644
--- a/tests/php/test-amp-dailymotion-embed-handler.php
+++ b/tests/php/test-amp-dailymotion-embed-handler.php
@@ -37,7 +37,7 @@ public function mock_http_request( $pre, $r, $url ) {
 			return $pre;
 		}
 
-		$body = '{"type":"video","version":"1.0","provider_name":"Dailymotion","provider_url":"https:\/\/www.dailymotion.com","title":"Snatched - Official Trailer 2 (HD)","description":"M\u00e1s info http:\/\/trailersyestrenos.es\/snatched-jonathan-levine\/ - TWITTER: https:\/\/twitter.com\/TrailersyEstren - FACEBOOK: https:\/\/www.facebook.com\/trailersyestrenos - GOOGLE+: https:\/\/www.google.com\/+TrailersyEstrenos  Sinopsis: Una madre y una hija se enfrentar\u00e1n a distintos problemas que surgen mientras est\u00e1n de vacaciones  Director: Jonathan Levine Reparto: Amy Schumer, Ike Barinholtz, Goldie Hawn, Christopher Meloni, Randall Park, Wanda Sykes, \u00d3scar Jaenada, Colin Quinn, Tom Bateman, Kevin Kane, Sharon M. Bell  (El trailer pertenece a la productora y distribuidora de la pel\u00edcula y ha sido subido sin \u00e1nimo de lucro)","author_name":"Trailers y Estrenos","author_url":"https:\/\/www.dailymotion.com\/TrailersyEstrenos","width":480,"height":204,"html":"<iframe frameborder=\"0\" width=\"480\" height=\"204\" src=\"https:\/\/www.dailymotion.com\/embed\/video\/x5awwth\" allowfullscreen allow=\"autoplay\"><\/iframe>","thumbnail_url":"https:\/\/s1.dmcdn.net\/v\/J7Emb1UwvEwLi4MKo\/x120","thumbnail_width":214,"thumbnail_height":120}';
+		$body = '{"type":"video","version":"1.0","provider_name":"Dailymotion","provider_url":"https:\/\/www.dailymotion.com","title":"Snatched - Official Trailer 2 (HD)","description":"M\u00e1s info http:\/\/trailersyestrenos.es\/snatched-jonathan-levine\/ - TWITTER: https:\/\/twitter.com\/TrailersyEstren - FACEBOOK: https:\/\/www.facebook.com\/trailersyestrenos - GOOGLE+: https:\/\/www.google.com\/+TrailersyEstrenos  Sinopsis: Una madre y una hija se enfrentar\u00e1n a distintos problemas que surgen mientras est\u00e1n de vacaciones  Director: Jonathan Levine Reparto: Amy Schumer, Ike Barinholtz, Goldie Hawn, Christopher Meloni, Randall Park, Wanda Sykes, \u00d3scar Jaenada, Colin Quinn, Tom Bateman, Kevin Kane, Sharon M. Bell  (El trailer pertenece a la productora y distribuidora de la pel\u00edcula y ha sido subido sin \u00e1nimo de lucro)","author_name":"Trailers y Estrenos","author_url":"https:\/\/www.dailymotion.com\/TrailersyEstrenos","width":500,"height":212,"html":"<iframe frameborder=\"0\" width=\"500\" height=\"212\" src=\"https:\/\/www.dailymotion.com\/embed\/video\/x5awwth\" allowfullscreen allow=\"autoplay\"><\/iframe>","thumbnail_url":"https:\/\/s2.dmcdn.net\/v\/J7Emb1UwvEwLi4MKo\/x120","thumbnail_width":214,"thumbnail_height":120}';
 
 		return [
 			'body'     => $body,
diff --git a/tests/php/test-amp-twitter-embed-handler.php b/tests/php/test-amp-twitter-embed-handler.php
index 2d9b7d2c42e..a158a341c84 100644
--- a/tests/php/test-amp-twitter-embed-handler.php
+++ b/tests/php/test-amp-twitter-embed-handler.php
@@ -52,13 +52,13 @@ public function mock_http_request( $preempt, $r, $url ) {
 		} elseif ( false !== strpos( $url, '705219971425574912' ) ) {
 			$body = '{"url":"https:\/\/twitter.com\/sengineland\/status\/705219971425574912","author_name":"Search Engine Land","author_url":"https:\/\/twitter.com\/sengineland","html":"\u003Cblockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"\u003E\u003Cp lang=\"en\" dir=\"ltr\"\u003EOn our way to the \u003Ca href=\"https:\/\/twitter.com\/hashtag\/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw\"\u003E#GoogleDance\u003C\/a\u003E! \u003Ca href=\"https:\/\/twitter.com\/hashtag\/SMX?src=hash&amp;ref_src=twsrc%5Etfw\"\u003E#SMX\u003C\/a\u003E \uD83D\uDC83\uD83C\uDFFB \u003Ca href=\"https:\/\/t.co\/N8kZ9M3eN4\"\u003Epic.twitter.com\/N8kZ9M3eN4\u003C\/a\u003E\u003C\/p\u003E&mdash; Search Engine Land (@sengineland) \u003Ca href=\"https:\/\/twitter.com\/sengineland\/status\/705219971425574912?ref_src=twsrc%5Etfw\"\u003EMarch 3, 2016\u003C\/a\u003E\u003C\/blockquote\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
 		} elseif ( false !== strpos( $url, 'moments%2F625792726546558977' ) ) {
-			$body = '{"url":"https:\/\/twitter.com\/i\/moments\/625792726546558977","title":"Michelle Obama Opens Special Olympics","html":"\u003Ca class=\"twitter-moment\" href=\"https:\/\/twitter.com\/i\/moments\/625792726546558977?ref_src=twsrc%5Etfw\"\u003EMichelle Obama Opens Special Olympics\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":550,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+			$body = '{"url":"https:\/\/twitter.com\/i\/moments\/625792726546558977","title":"Michelle Obama Opens Special Olympics","html":"\u003Ca class=\"twitter-moment\" data-width=\"500\" data-dnt=\"true\" href=\"https:\/\/twitter.com\/i\/moments\/625792726546558977?ref_src=twsrc%5Etfw\"\u003EMichelle Obama Opens Special Olympics\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
 		} elseif ( false !== strpos( $url, 'lists%2Fweb-gdes' ) ) {
-			$body = '{"url":"https:\/\/twitter.com\/robertnyman\/lists\/web-gdes","title":"Web GDEs","html":"\u003Ca class=\"twitter-timeline\" href=\"https:\/\/twitter.com\/robertnyman\/lists\/web-gdes?ref_src=twsrc%5Etfw\"\u003EA Twitter List by robertnyman\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":null,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+			$body = '{"url":"https:\/\/twitter.com\/robertnyman\/lists\/web-gdes","title":"Web GDEs","html":"\u003Ca class=\"twitter-timeline\" data-width=\"500\" data-height=\"750\" data-dnt=\"true\" href=\"https:\/\/twitter.com\/robertnyman\/lists\/web-gdes?ref_src=twsrc%5Etfw\"\u003EA Twitter List by robertnyman\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
 		} elseif ( false !== strpos( $url, 'wordpress%2Flikes' ) ) { // phpcs:ignore WordPress.WP.CapitalPDangit.Misspelled
-			$body = '{"url":"https:\/\/twitter.com\/WordPress\/likes","title":"","html":"\u003Ca class=\"twitter-timeline\" href=\"https:\/\/twitter.com\/WordPress\/likes?ref_src=twsrc%5Etfw\"\u003ETweets Liked by @WordPress\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":null,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+			$body = '{"url":"https:\/\/twitter.com\/WordPress\/likes","title":"","html":"\u003Ca class=\"twitter-timeline\" data-width=\"500\" data-height=\"750\" data-dnt=\"true\" href=\"https:\/\/twitter.com\/WordPress\/likes?ref_src=twsrc%5Etfw\"\u003ETweets Liked by @WordPress\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
 		} elseif ( false !== strpos( $url, 'twitter.com%2Fwordpress' ) ) {
-			$body = '{"url":"https:\/\/twitter.com\/WordPress","title":"","html":"\u003Ca class=\"twitter-timeline\" href=\"https:\/\/twitter.com\/WordPress?ref_src=twsrc%5Etfw\"\u003ETweets by WordPress\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":null,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+			$body = '{"url":"https:\/\/twitter.com\/WordPress","title":"","html":"\u003Ca class=\"twitter-timeline\" data-width=\"500\" data-height=\"750\" data-dnt=\"true\" href=\"https:\/\/twitter.com\/WordPress?ref_src=twsrc%5Etfw\"\u003ETweets by WordPress\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
 		} else {
 			$body = '';
 		}
diff --git a/tests/php/test-class-amp-gfycat-embed-handler.php b/tests/php/test-class-amp-gfycat-embed-handler.php
index 3e6f1ff63ed..fce21ea8016 100644
--- a/tests/php/test-class-amp-gfycat-embed-handler.php
+++ b/tests/php/test-class-amp-gfycat-embed-handler.php
@@ -32,7 +32,7 @@ static function( $pre, $url ) {
 				if ( false === strpos( $url, 'tautwhoppingcougar' ) ) {
 					return $pre;
 				}
-				return '<iframe src=\'https://gfycat.com/ifr/tautwhoppingcougar#?secret=aBCUbiiIh5\' frameborder=\'0\' scrolling=\'no\' width=\'100\' height=\'100\'  allowfullscreen></iframe>';
+				return '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" title="Melanie Raccoon riding bike-side angle (reddit)" src=\'https://gfycat.com/ifr/tautwhoppingcougar#?secret=Brq0P9wYCr\' data-secret=\'Brq0P9wYCr\' frameborder=\'0\' scrolling=\'no\' width=\'100%\' height=\'100%\'></iframe>';
 			},
 			10,
 			2
diff --git a/tests/php/test-class-amp-hulu-embed-handler.php b/tests/php/test-class-amp-hulu-embed-handler.php
index 9c5ec2cc627..fb5e1893c59 100644
--- a/tests/php/test-class-amp-hulu-embed-handler.php
+++ b/tests/php/test-class-amp-hulu-embed-handler.php
@@ -98,6 +98,10 @@ public function test__conversion( $url, $expected ) {
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
 		$embed->sanitize_raw_embeds( $dom );
 
+		if ( self::is_external_http_test_suite() && "<p>$url</p>" === trim( $filtered_content ) ) {
+			$this->markTestSkipped( 'Endpoint is down.' );
+		}
+
 		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
 		$this->assertEquals( $expected, $content );
diff --git a/tests/php/test-class-amp-wordpress-tv-embed-handler.php b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
index 7f13db7cb44..d4ef574cb47 100644
--- a/tests/php/test-class-amp-wordpress-tv-embed-handler.php
+++ b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
@@ -44,7 +44,7 @@ public function mock_http_request( $preempt, $r, $url ) {
 		}
 
 		return [
-			'body'          => '{"type":"video","version":"1.0","title":null,"width":500,"height":281,"html":"<iframe width=\'500\' height=\'281\' src=\'https:\\/\\/video.wordpress.com\\/embed\\/yFCmLMGL?hd=0\' frameborder=\'0\' allowfullscreen><\\/iframe><script src=\'https:\\/\\/v0.wordpress.com\\/js\\/next\\/videopress-iframe.js?m=1435166243\'></script>"}', // phpcs:ignore
+			'body'          => '{"type":"video","version":"1.0","title":null,"width":400,"height":225,"html":"<iframe width=\'400\' height=\'225\' src=\'https:\/\/video.wordpress.com\/embed\/yFCmLMGL?hd=1\' frameborder=\'0\' allowfullscreen><\/iframe><script src=\'https:\/\/v0.wordpress.com\/js\/next\/videopress-iframe.js?m=1435166243\'><\/script>"}', // phpcs:ignore
 			'headers'       => [],
 			'response'      => [
 				'code'    => 200,

From 5fa1cdbf11b49ea2f25105795d01f419c89f2cbf Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 19 Jun 2020 02:24:36 -0400
Subject: [PATCH 31/45] Sanitize Meetup embeds

---
 .../embeds/class-amp-meetup-embed-handler.php | 42 ++++++++++---------
 ...t-class-amp-wordpress-tv-embed-handler.php |  2 +-
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/includes/embeds/class-amp-meetup-embed-handler.php b/includes/embeds/class-amp-meetup-embed-handler.php
index 6f39aa01dbe..ed3712bec35 100644
--- a/includes/embeds/class-amp-meetup-embed-handler.php
+++ b/includes/embeds/class-amp-meetup-embed-handler.php
@@ -6,40 +6,44 @@
  * @since 0.7
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Meetup_Embed_Handler
  */
 class AMP_Meetup_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	/**
-	 * Register embed.
+	 * Determine if the node is indeed a raw embed.
+	 *
+	 * @param DOMElement $node DOM element.
+	 * @return bool True if it is a raw embed, false otherwise.
 	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
+	protected function is_raw_embed( DOMElement $node ) {
+		$width  = filter_var( $node->getAttribute( 'width' ), FILTER_SANITIZE_NUMBER_INT );
+		$height = filter_var( $node->getAttribute( 'height' ), FILTER_SANITIZE_NUMBER_INT );
+
+		return 50 !== $width && 50 !== $height;
 	}
 
 	/**
-	 * Unregister embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( '//div[ @id="meetup_oembed" ]//div[ @class="photo" ]/img' );
 	}
 
 	/**
-	 * Filter oEmbed HTML for Meetup to prepare it for AMP.
+	 * Make embed AMP compatible.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @return string Embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function filter_embed_oembed_html( $cache, $url ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'meetup.com' ) ) {
-
-			// Supply the width/height so that we don't have to make requests to look them up later.
-			$cache = str_replace( '<img ', '<img width="50" height="50" ', $cache );
-		}
-		return $cache;
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		// Supply the width/height so that we don't have to make requests to look them up later.
+		$node->setAttribute( 'width', 50 );
+		$node->setAttribute( 'height', 50 );
 	}
 }
-
diff --git a/tests/php/test-class-amp-wordpress-tv-embed-handler.php b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
index d4ef574cb47..3e5ccff2e14 100644
--- a/tests/php/test-class-amp-wordpress-tv-embed-handler.php
+++ b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
@@ -44,7 +44,7 @@ public function mock_http_request( $preempt, $r, $url ) {
 		}
 
 		return [
-			'body'          => '{"type":"video","version":"1.0","title":null,"width":400,"height":225,"html":"<iframe width=\'400\' height=\'225\' src=\'https:\/\/video.wordpress.com\/embed\/yFCmLMGL?hd=1\' frameborder=\'0\' allowfullscreen><\/iframe><script src=\'https:\/\/v0.wordpress.com\/js\/next\/videopress-iframe.js?m=1435166243\'><\/script>"}', // phpcs:ignore
+			'body'          => '{"type":"video","version":"1.0","title":null,"width":500,"height":281,"html":"<iframe width=\'500\' height=\'281\' src=\'https:\/\/video.wordpress.com\/embed\/yFCmLMGL?hd=1\' frameborder=\'0\' allowfullscreen><\/iframe><script src=\'https:\/\/v0.wordpress.com\/js\/next\/videopress-iframe.js?m=1435166243\'><\/script>"}', // phpcs:ignore
 			'headers'       => [],
 			'response'      => [
 				'code'    => 200,

From 85b55cbee6aaa8a4e6888bce06731e4f30840551 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 19 Jun 2020 03:13:00 -0400
Subject: [PATCH 32/45] Sanitize Issuu embeds

---
 .../embeds/class-amp-issuu-embed-handler.php  | 72 +++++++++--------
 tests/php/test-amp-issuu-embed-handler.php    | 79 +++++++++++++++++++
 2 files changed, 118 insertions(+), 33 deletions(-)
 create mode 100644 tests/php/test-amp-issuu-embed-handler.php

diff --git a/includes/embeds/class-amp-issuu-embed-handler.php b/includes/embeds/class-amp-issuu-embed-handler.php
index f27ef969bcb..03312522bc8 100644
--- a/includes/embeds/class-amp-issuu-embed-handler.php
+++ b/includes/embeds/class-amp-issuu-embed-handler.php
@@ -6,54 +6,60 @@
  * @since 0.7
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Issuu_Embed_Handler
  */
 class AMP_Issuu_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
-	}
-
-	/**
-	 * Unregister embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( '//div[ @class="issuuembed" and @data-url ]' );
 	}
 
 	/**
-	 * Filter oEmbed HTML for Meetup to prepare it for AMP.
+	 * Make embed AMP compatible.
 	 *
-	 * @param mixed  $return The oEmbed HTML.
-	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   Attributes.
-	 * @return string Embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function filter_embed_oembed_html( $return, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'issuu.com' ) ) {
-			if ( preg_match( '/width\s*:\s*(\d+)px/', $return, $matches ) ) {
-				$attr['width'] = $matches[1];
-			}
-			if ( preg_match( '/height\s*:\s*(\d+)px/', $return, $matches ) ) {
-				$attr['height'] = $matches[1];
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$url = $node->getAttribute( 'data-url' );
+
+		$attributes = [
+			'width'   => $this->args['width'],
+			'height'  => $this->args['height'],
+			'src'     => $url,
+			'sandbox' => 'allow-scripts allow-same-origin',
+		];
+
+		if ( $node->hasAttribute( 'style' ) ) {
+			$style = $node->getAttribute( 'style' );
+
+			if ( preg_match( '/width\s*:\s*(\d+)px/', $style, $matches ) ) {
+				$attributes['width'] = $matches[1];
 			}
 
-			$return = AMP_HTML_Utils::build_tag(
-				'amp-iframe',
-				[
-					'width'   => $attr['width'],
-					'height'  => $attr['height'],
-					'src'     => $url,
-					'sandbox' => 'allow-scripts allow-same-origin',
-				]
-			);
+			if ( preg_match( '/height\s*:\s*(\d+)px/', $style, $matches ) ) {
+				$attributes['height'] = $matches[1];
+			}
 		}
-		return $return;
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$this->amp_tag,
+			$attributes
+		);
+
+		$this->unwrap_p_element( $node );
+		$this->remove_script_sibling( $node, '//e.issuu.com/embed.js' );
+
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
 
diff --git a/tests/php/test-amp-issuu-embed-handler.php b/tests/php/test-amp-issuu-embed-handler.php
new file mode 100644
index 00000000000..ab640254d66
--- /dev/null
+++ b/tests/php/test-amp-issuu-embed-handler.php
@@ -0,0 +1,79 @@
+<?php
+
+class AMP_Issuu_Embed_Handler_Test extends WP_UnitTestCase {
+
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		parent::setUp();
+
+		// Mock the HTTP request.
+		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
+	}
+
+	/**
+	 * Tear down.
+	 */
+	public function tearDown() {
+		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
+		parent::tearDown();
+	}
+
+	/**
+	 * Mock HTTP request.
+	 *
+	 * @param mixed  $pre Whether to preempt an HTTP request's return value. Default false.
+	 * @param mixed  $r   HTTP request arguments.
+	 * @param string $url The request URL.
+	 * @return array Response data.
+	 */
+	public function mock_http_request( $pre, $r, $url ) {
+		if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
+			return $pre;
+		}
+
+		if ( false === strpos( $url, 'issuu.com' ) ) {
+			return $pre;
+		}
+
+		$body = '{"version":"1.0","type":"rich","width":500,"height":324,"title":"A Seat at the Table Syllabus","description":"","url":"https://issuu.com/ajcwfu/docs/seatatthetablefinal","author_name":"ajcwfu","author_url":"https://issuu.com/ajcwfu","provider_name":"Issuu","provider_url":"https://issuu.com","html":"<div data-url=\"https://issuu.com/ajcwfu/docs/seatatthetablefinal\" style=\"width: 500px; height: 324px;\" class=\"issuuembed\"></div><script type=\"text/javascript\" src=\"//e.issuu.com/embed.js\" async=\"true\"></script>","thumbnail_url":"https://image.issuu.com/170209231446-0e77cd67a4a596188ee591ddd6dbdb61/jpg/page_1_thumb_large.jpg","thumbnail_width":320,"thumbnail_height":414}'; // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+
+		return [
+			'body'     => $body,
+			'response' => [
+				'code'    => 200,
+				'message' => 'OK',
+			],
+		];
+	}
+
+	public function get_conversion_data() {
+		return [
+			'no_embed'  => [
+				'<p>Hello world.</p>',
+				'<p>Hello world.</p>' . PHP_EOL,
+			],
+
+			'url_embed' => [
+				'https://issuu.com/ajcwfu/docs/seatatthetablefinal' . PHP_EOL,
+				'<amp-iframe width="500" height="324" src="https://issuu.com/ajcwfu/docs/seatatthetablefinal" sandbox="allow-scripts allow-same-origin"></amp-iframe>' . PHP_EOL . PHP_EOL,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider get_conversion_data
+	 */
+	public function test__conversion( $source, $expected ) {
+		$embed = new AMP_Issuu_Embed_Handler();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
+
+		$this->assertEquals( $expected, $content );
+	}
+}

From 996862aef080c803ffd468d4eaca94f5c48f8130 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 19 Jun 2020 13:50:17 -0400
Subject: [PATCH 33/45] Sanitize CrowdSignal embeds

---
 .../embeds/class-amp-base-embed-handler.php   |  26 ++---
 .../class-amp-crowdsignal-embed-handler.php   | 101 ++++++++++++------
 .../test-amp-crowdsignal-embed-handler.php    |  16 +--
 3 files changed, 92 insertions(+), 51 deletions(-)

diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index 7f59b5580d5..46e729c9b72 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -210,17 +210,19 @@ protected function unwrap_p_element( DOMElement $node ) {
 	 * @param DOMElement $node         The DOMNode to whose sibling is the script to be removed.
 	 * @param string     $base_src_url Script URL to match against.
 	 * @param string     $content      Text content of node to match against.
+	 * @param bool       $is_next_to   Whether the script sibling is next or preceding the specified element.
 	 */
-	protected function remove_script_sibling( DOMElement $node, $base_src_url, $content = '' ) {
-		$next_element_sibling = $node->nextSibling;
+	protected function remove_script_sibling( DOMElement $node, $base_src_url, $content = '', $is_next_to = true ) {
+		$sibling_location = $is_next_to ? 'nextSibling' : 'previousSibling';
+		$element_sibling  = $node->{$sibling_location};
 
-		while ( $next_element_sibling && ! ( $next_element_sibling instanceof DOMElement ) ) {
-			$next_element_sibling = $next_element_sibling->nextSibling;
+		while ( $element_sibling && ! ( $element_sibling instanceof DOMElement ) ) {
+			$element_sibling = $element_sibling->{$sibling_location};
 		}
 
 		// Handle case where script is wrapped in paragraph by wpautop.
-		if ( $next_element_sibling instanceof DOMElement && 'p' === $next_element_sibling->nodeName ) {
-			$children_elements = array_values( $this->get_child_elements( $next_element_sibling ) );
+		if ( $element_sibling instanceof DOMElement && 'p' === $element_sibling->nodeName ) {
+			$children_elements = array_values( $this->get_child_elements( $element_sibling ) );
 
 			if (
 				1 === count( $children_elements ) &&
@@ -230,22 +232,22 @@ protected function remove_script_sibling( DOMElement $node, $base_src_url, $cont
 					( $content && false !== strpos( $children_elements[0]->textContent, $content ) )
 				)
 			) {
-				$next_element_sibling->parentNode->removeChild( $next_element_sibling );
+				$element_sibling->parentNode->removeChild( $element_sibling );
 				return;
 			}
 		}
 
 		// Handle case where script is immediately following.
 		$is_embed_script = (
-			$next_element_sibling instanceof DOMElement &&
-			'script' === strtolower( $next_element_sibling->nodeName ) &&
+			$element_sibling instanceof DOMElement &&
+			'script' === strtolower( $element_sibling->nodeName ) &&
 			(
-				( $base_src_url && false !== strpos( $next_element_sibling->getAttribute( 'src' ), $base_src_url ) ) ||
-				( $content && false !== strpos( $next_element_sibling->textContent, $content ) )
+				( $base_src_url && false !== strpos( $element_sibling->getAttribute( 'src' ), $base_src_url ) ) ||
+				( $content && false !== strpos( $element_sibling->textContent, $content ) )
 			)
 		);
 		if ( $is_embed_script ) {
-			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
+			$element_sibling->parentNode->removeChild( $element_sibling );
 		}
 	}
 }
diff --git a/includes/embeds/class-amp-crowdsignal-embed-handler.php b/includes/embeds/class-amp-crowdsignal-embed-handler.php
index f243bed4625..a2e606645e8 100644
--- a/includes/embeds/class-amp-crowdsignal-embed-handler.php
+++ b/includes/embeds/class-amp-crowdsignal-embed-handler.php
@@ -8,59 +8,96 @@
  * @since 1.2
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Crowdsignal_Embed_Handler
  */
 class AMP_Crowdsignal_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	/**
-	 * Register embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		$queries = [
+			// For poll embeds.
+			'//iframe[ @class="cs-iframe-embed" and starts-with( @src, "https://poll.fm/" ) ]',
+			// For survey embeds.
+			'//div[ @class="pd-embed" and @data-settings ]',
+		];
+
+		return $dom->xpath->query( implode( ' | ', $queries ) );
 	}
 
 	/**
-	 * Unregister embed.
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$is_poll = 'cs-iframe-embed' === $node->getAttribute( 'class' );
+
+		if ( $is_poll ) {
+			$this->sanitize_poll_embed( $node );
+		} else {
+			$this->sanitize_survey_embed( $node );
+		}
 	}
 
 	/**
-	 * Filter oEmbed HTML for Crowdsignal for AMP output.
+	 * Sanitize poll embed.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @param array  $attr  Shortcode attributes.
-	 * @return string Embed.
+	 * @param DOMElement $node Poll embed.
 	 */
-	public function filter_embed_oembed_html( $cache, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( empty( $parsed_url['host'] ) || empty( $parsed_url['path'] ) || ! preg_match( '#(^|\.)(?P<host>polldaddy\.com|crowdsignal\.com|survey\.fm|poll\.fm)#', $parsed_url['host'], $matches ) ) {
-			return $cache;
-		}
+	private function sanitize_poll_embed( DOMElement $node ) {
+		// Replace the `noscript` parent element with the iframe.
+		$node->parentNode->parentNode->replaceChild( $node, $node->parentNode );
 
-		$parsed_url['host'] = $matches['host'];
+		$this->unwrap_p_element( $node );
+		$this->remove_script_sibling( $node, 'https://secure.polldaddy.com', '', false );
+	}
 
-		$output = '';
+	/**
+	 * Sanitize survey embed.
+	 *
+	 * @param DOMElement $node Survey embed.
+	 */
+	private function sanitize_survey_embed( DOMElement $node ) {
+		$settings = json_decode( $node->getAttribute( 'data-settings' ), false );
 
-		// Poll oEmbed responses include noscript which can be used as the AMP response.
-		if ( preg_match( '#<noscript>(.+?)</noscript>#s', $cache, $matches ) ) {
-			$output = $matches[1];
+		// We can't form the iframe URL without a domain and survey ID.
+		if ( ! ( property_exists( $settings, 'domain' ) || property_exists( $settings, 'id' ) ) ) {
+			return;
 		}
 
-		if ( empty( $output ) ) {
-			if ( ! empty( $attr['title'] ) ) {
-				$name = $attr['title'];
-			} elseif ( 'survey.fm' === $parsed_url['host'] || preg_match( '#^/s/#', $parsed_url['path'] ) ) {
-				$name = __( 'View Survey', 'amp' );
-			} else {
-				$name = __( 'View Poll', 'amp' );
-			}
-			$output = sprintf( '<a href="%s" target="_blank">%s</a>', esc_url( $url ), esc_html( $name ) );
-		}
+		// Logic for building the iframe `src` can be found in https://polldaddy.com/survey.js.
+		$iframe_src = sprintf(
+			'https://%s/%s?%s',
+			$settings->domain,
+			$settings->id,
+			property_exists( $settings, 'auto' ) && $settings->auto ? 'ft=1&iframe=' . amp_get_current_url() : 'iframe=1'
+		);
+
+		$iframe_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			'iframe',
+			[
+				'src'               => $iframe_src,
+				'layout'            => 'responsive',
+				'width'             => 600,
+				'height'            => 600,
+				'frameborder'       => 0,
+				'scrolling'         => 'no',
+				'allowtransparency' => 'true',
+				'sandbox'           => 'allow-scripts allow-same-origin',
+			]
+		);
+
+		$this->remove_script_sibling( $node, null, 'https://polldaddy.com/survey.js' );
 
-		return $output;
+		$node->parentNode->replaceChild( $iframe_node, $node );
 	}
 }
diff --git a/tests/php/test-amp-crowdsignal-embed-handler.php b/tests/php/test-amp-crowdsignal-embed-handler.php
index e13fea080e1..c929366e364 100644
--- a/tests/php/test-amp-crowdsignal-embed-handler.php
+++ b/tests/php/test-amp-crowdsignal-embed-handler.php
@@ -40,19 +40,19 @@ public function get_conversion_data() {
 		$data = [
 			'poll.fm'          => [
 				'https://poll.fm/7012505',
-				'<p><iframe title="Which design do you prefer?" src="https://poll.fm/7012505/embed" frameborder="0" class="cs-iframe-embed"></iframe></p>',
+				'<iframe title="Which design do you prefer?" src="https://poll.fm/7012505/embed" frameborder="0" class="cs-iframe-embed"></iframe>' . PHP_EOL,
 				$poll_response,
 			],
 
 			'polldaddy_poll'   => [
 				'https://polldaddy.com/poll/7012505/',
-				'<p><iframe title="Which design do you prefer?" src="https://poll.fm/7012505/embed" frameborder="0" class="cs-iframe-embed"></iframe></p>',
+				'<iframe title="Which design do you prefer?" src="https://poll.fm/7012505/embed" frameborder="0" class="cs-iframe-embed"></iframe>' . PHP_EOL,
 				$poll_response,
 			],
 
 			'polldaddy_survey' => [
 				'https://rydk.polldaddy.com/s/test-survey',
-				'<p><a href="https://rydk.polldaddy.com/s/test-survey" target="_blank">View Survey</a></p>',
+				'<iframe src="https://rydk.survey.fm/test-survey?ft=1&amp;iframe=http://example.org/" layout="responsive" width="600" height="600" frameborder="0" scrolling="no" allowtransparency="true" sandbox="allow-scripts allow-same-origin"></iframe>' . PHP_EOL . PHP_EOL,
 				$survey_response,
 			],
 		];
@@ -64,7 +64,7 @@ public function get_conversion_data() {
 		if ( version_compare( get_bloginfo( 'version' ), '5.2.0', '>=' ) ) {
 			$data['survey.fm'] = [
 				'https://rydk.survey.fm/test-survey',
-				'<p><a href="https://rydk.survey.fm/test-survey" target="_blank">View Survey</a></p>',
+				'<iframe src="https://rydk.survey.fm/test-survey?ft=1&amp;iframe=http://example.org/" layout="responsive" width="600" height="600" frameborder="0" scrolling="no" allowtransparency="true" sandbox="allow-scripts allow-same-origin"></iframe>' . PHP_EOL . PHP_EOL,
 				$survey_response,
 			];
 		}
@@ -106,12 +106,14 @@ static function ( $pre, $r, $request_url ) use ( $oembed_response ) {
 		);
 
 		$embed = new AMP_Crowdsignal_Embed_Handler();
-		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $url );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
 
-		$expected = $this->adapt_iframe_title( $expected );
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( trim( $expected ), trim( $filtered_content ) );
+		$this->assertEquals( $expected, $content );
 	}
 
 	private function adapt_iframe_title( $html ) {

From 4885788ab498d9ea72acb54ee6f69df7387d6ced Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Fri, 19 Jun 2020 15:00:53 -0400
Subject: [PATCH 34/45] Sanitize Pinterest embeds

---
 .../class-amp-pinterest-embed-handler.php     | 36 ++++++++++++++++---
 .../php/test-amp-pinterest-embed-handler.php  | 18 +++++++---
 .../php/test-class-amp-hulu-embed-handler.php |  4 +++
 3 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/includes/embeds/class-amp-pinterest-embed-handler.php b/includes/embeds/class-amp-pinterest-embed-handler.php
index a0debc6e855..6732f796cec 100644
--- a/includes/embeds/class-amp-pinterest-embed-handler.php
+++ b/includes/embeds/class-amp-pinterest-embed-handler.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Pinterest_Embed_Handler
  */
@@ -26,12 +28,19 @@ class AMP_Pinterest_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $DEFAULT_HEIGHT = 750;
 
+	/**
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
+	 */
+	protected $amp_tag = 'amp-pinterest';
+
 	/**
 	 * Registers embed.
 	 */
 	public function register_embed() {
 		wp_embed_register_handler(
-			'amp-pinterest',
+			$this->amp_tag,
 			self::URL_PATTERN,
 			[ $this, 'oembed' ],
 			-1
@@ -42,7 +51,7 @@ public function register_embed() {
 	 * Unregisters embed.
 	 */
 	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-pinterest', -1 );
+		wp_embed_unregister_handler( $this->amp_tag, -1 );
 	}
 
 	/**
@@ -75,10 +84,8 @@ public function render( $args ) {
 			return '';
 		}
 
-		$this->did_convert_elements = true;
-
 		return AMP_HTML_Utils::build_tag(
-			'amp-pinterest',
+			$this->amp_tag,
 			[
 				'width'    => $this->args['width'],
 				'height'   => $this->args['height'],
@@ -87,4 +94,23 @@ public function render( $args ) {
 			]
 		);
 	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//%s', $this->amp_tag ) );
+	}
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$this->unwrap_p_element( $node );
+	}
 }
diff --git a/tests/php/test-amp-pinterest-embed-handler.php b/tests/php/test-amp-pinterest-embed-handler.php
index 62467fc7f5f..5794484433b 100644
--- a/tests/php/test-amp-pinterest-embed-handler.php
+++ b/tests/php/test-amp-pinterest-embed-handler.php
@@ -10,11 +10,11 @@ public function get_conversion_data() {
 			],
 			'simple_url_https' => [
 				'https://www.pinterest.com/pin/606156431067611861/' . PHP_EOL,
-				'<p><amp-pinterest width="450" height="750" data-do="embedPin" data-url="https://www.pinterest.com/pin/606156431067611861/"></amp-pinterest></p>' . PHP_EOL,
+				'<amp-pinterest width="450" height="750" data-do="embedPin" data-url="https://www.pinterest.com/pin/606156431067611861/"></amp-pinterest>' . PHP_EOL,
 			],
 			'simple_url_http'  => [
 				'http://www.pinterest.com/pin/606156431067611861/' . PHP_EOL,
-				'<p><amp-pinterest width="450" height="750" data-do="embedPin" data-url="http://www.pinterest.com/pin/606156431067611861/"></amp-pinterest></p>' . PHP_EOL,
+				'<amp-pinterest width="450" height="750" data-do="embedPin" data-url="http://www.pinterest.com/pin/606156431067611861/"></amp-pinterest>' . PHP_EOL,
 			],
 		];
 	}
@@ -25,9 +25,14 @@ public function get_conversion_data() {
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Pinterest_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	public function get_scripts_data() {
@@ -49,9 +54,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Pinterest_Embed_Handler();
 		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 
 		$scripts = array_merge(
diff --git a/tests/php/test-class-amp-hulu-embed-handler.php b/tests/php/test-class-amp-hulu-embed-handler.php
index fb5e1893c59..04626164dd7 100644
--- a/tests/php/test-class-amp-hulu-embed-handler.php
+++ b/tests/php/test-class-amp-hulu-embed-handler.php
@@ -139,6 +139,10 @@ public function test__get_scripts( $url, $expected ) {
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
 		$embed->sanitize_raw_embeds( $dom );
 
+		if ( self::is_external_http_test_suite() && "<p>$url</p>" === trim( $filtered_content ) ) {
+			$this->markTestSkipped( 'Endpoint is down.' );
+		}
+
 		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 

From 59066e889f33652fc609a9bb191570fa8f491212 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 21 Jun 2020 17:01:33 -0400
Subject: [PATCH 35/45] Sanitize Vine embeds

---
 .../embeds/class-amp-vine-embed-handler.php   | 36 ++++++++++++++++---
 tests/php/test-amp-vine-embed-handler.php     | 16 ++++++---
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/includes/embeds/class-amp-vine-embed-handler.php b/includes/embeds/class-amp-vine-embed-handler.php
index 1848c58634f..7f43bbbea0b 100644
--- a/includes/embeds/class-amp-vine-embed-handler.php
+++ b/includes/embeds/class-amp-vine-embed-handler.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Vine_Embed_Handler
  */
@@ -25,18 +27,25 @@ class AMP_Vine_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $DEFAULT_HEIGHT = 400;
 
+	/**
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
+	 */
+	protected $amp_tag = 'amp-vine';
+
 	/**
 	 * Registers embed.
 	 */
 	public function register_embed() {
-		wp_embed_register_handler( 'amp-vine', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
+		wp_embed_register_handler( $this->amp_tag, self::URL_PATTERN, [ $this, 'oembed' ], -1 );
 	}
 
 	/**
 	 * Unregisters embed.
 	 */
 	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-vine', -1 );
+		wp_embed_unregister_handler( $this->amp_tag, -1 );
 	}
 
 	/**
@@ -82,10 +91,8 @@ public function render( $args ) {
 			);
 		}
 
-		$this->did_convert_elements = true;
-
 		return AMP_HTML_Utils::build_tag(
-			'amp-vine',
+			$this->amp_tag,
 			[
 				'data-vineid' => $args['vine_id'],
 				'layout'      => 'responsive',
@@ -94,4 +101,23 @@ public function render( $args ) {
 			]
 		);
 	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//%s', $this->amp_tag ) );
+	}
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$this->unwrap_p_element( $node );
+	}
 }
diff --git a/tests/php/test-amp-vine-embed-handler.php b/tests/php/test-amp-vine-embed-handler.php
index 68365990e11..3b140f1a017 100644
--- a/tests/php/test-amp-vine-embed-handler.php
+++ b/tests/php/test-amp-vine-embed-handler.php
@@ -10,7 +10,7 @@ public function get_conversion_data() {
 			],
 			'simple_url' => [
 				'https://vine.co/v/MdKjXez002d' . PHP_EOL,
-				'<p><amp-vine data-vineid="MdKjXez002d" layout="responsive" width="400" height="400"></amp-vine></p>' . PHP_EOL,
+				'<amp-vine data-vineid="MdKjXez002d" layout="responsive" width="400" height="400"></amp-vine>' . PHP_EOL,
 			],
 		];
 	}
@@ -21,9 +21,14 @@ public function get_conversion_data() {
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Vine_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	public function get_scripts_data() {
@@ -45,9 +50,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Vine_Embed_Handler();
 		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$whitelist_sanitizer->sanitize();
 
 		$scripts = array_merge(

From 7c03ced475170a193f516e4c873ba3398c9f2a81 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 21 Jun 2020 19:06:06 -0400
Subject: [PATCH 36/45] Add `Registerable` interface to indicate embed handlers
 that hook into WordPress

---
 includes/class-amp-theme-support.php          |  5 ++--
 .../embeds/class-amp-base-embed-handler.php   | 14 +++++----
 .../embeds/class-amp-core-block-handler.php   |  3 +-
 .../class-amp-gallery-embed-handler.php       | 11 +++----
 .../class-amp-playlist-embed-handler.php      |  4 ++-
 includes/templates/class-amp-content.php      |  8 ++---
 src/Embed/Registerable.php                    | 29 +++++++++++++++++++
 7 files changed, 55 insertions(+), 19 deletions(-)
 create mode 100644 src/Embed/Registerable.php

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 5e41b559e20..75381ba3d67 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -6,6 +6,7 @@
  */
 
 use AmpProject\Amp;
+use AmpProject\AmpWP\Embed\Registerable;
 use AmpProject\AmpWP\Option;
 use AmpProject\AmpWP\RemoteRequest\CachedRemoteGetRequest;
 use AmpProject\AmpWP\ConfigurationArgument;
@@ -1179,9 +1180,7 @@ public static function register_content_embed_handlers() {
 				);
 				continue;
 			}
-
-			// @todo Conditional below can be removed once all embed handlers can sanitize raw embeds.
-			if ( method_exists( $embed_handler, 'register_embed' ) ) {
+			if ( $embed_handler instanceof Registerable ) {
 				$embed_handler->register_embed();
 			}
 			$embed_handlers[] = $embed_handler;
diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index 46e729c9b72..697ab13d9ef 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -78,6 +78,11 @@ public function __construct( $args = [] ) {
 	public function sanitize_raw_embeds( Document $dom ) {
 		$nodes = $this->get_raw_embed_nodes( $dom );
 
+		if ( null === $nodes ) {
+			// Bail since embed handler does not sanitize embeds.
+			return;
+		}
+
 		if ( 0 === $nodes->length ) {
 			return;
 		}
@@ -92,13 +97,12 @@ public function sanitize_raw_embeds( Document $dom ) {
 
 	/**
 	 * Get all raw embeds from the DOM.
-	 * // @todo This method can be made abstract once all embed handlers can sanitize raw embeds.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, otherwise null if method is not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		return new DOMNodeList();
+		return null;
 	}
 
 	/**
@@ -113,12 +117,12 @@ protected function is_raw_embed( DOMElement $node ) {
 
 	/**
 	 * Make embed AMP compatible.
-	 * // @todo Make this method abstract once all embed handlers have `sanitize_raw_embeds` implemented.
 	 *
 	 * @param DOMElement $node DOM element.
+	 * @return null If method is not implemented.
 	 */
 	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		// To be overridden.
+		return null;
 	}
 
 	/**
diff --git a/includes/embeds/class-amp-core-block-handler.php b/includes/embeds/class-amp-core-block-handler.php
index 94de522b13a..5be3b743e5a 100644
--- a/includes/embeds/class-amp-core-block-handler.php
+++ b/includes/embeds/class-amp-core-block-handler.php
@@ -5,6 +5,7 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
 use AmpProject\Attribute;
 use AmpProject\Dom\Document;
 
@@ -13,7 +14,7 @@
  *
  * @since 1.0
  */
-class AMP_Core_Block_Handler extends AMP_Base_Embed_Handler {
+class AMP_Core_Block_Handler extends AMP_Base_Embed_Handler implements Registerable {
 
 	/**
 	 * Attribute to store the original width on a video or iframe just before WordPress removes it.
diff --git a/includes/embeds/class-amp-gallery-embed-handler.php b/includes/embeds/class-amp-gallery-embed-handler.php
index 875ad3e793a..a11c93dd9ab 100644
--- a/includes/embeds/class-amp-gallery-embed-handler.php
+++ b/includes/embeds/class-amp-gallery-embed-handler.php
@@ -5,6 +5,7 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
 use AmpProject\Dom\Document;
 use AmpProject\AmpWP\Dom\ElementList;
 use AmpProject\AmpWP\Component\Carousel;
@@ -14,7 +15,7 @@
  *
  * @since 0.2
  */
-class AMP_Gallery_Embed_Handler extends AMP_Base_Embed_Handler {
+class AMP_Gallery_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
 
 	/**
 	 * Register embed.
@@ -220,7 +221,7 @@ public function render( $args ) {
 
 		$images = new ElementList();
 		foreach ( $args['images'] as $props ) {
-			$image_atts = [
+			$image_attrs = [
 				'src'    => $props['url'],
 				'width'  => $props['width'],
 				'height' => $props['height'],
@@ -228,16 +229,16 @@ public function render( $args ) {
 				'alt'    => $props['alt'],
 			];
 			if ( ! empty( $props['srcset'] ) ) {
-				$image_atts['srcset'] = $props['srcset'];
+				$image_attrs['srcset'] = $props['srcset'];
 			}
 
 			if ( ! empty( $args['lightbox'] ) ) {
-				$image_atts['lightbox'] = '';
+				$image_attrs['lightbox'] = '';
 			}
 			$image = AMP_DOM_Utils::create_node(
 				$dom,
 				'img',
-				$image_atts
+				$image_attrs
 			);
 
 			if ( ! empty( $props['href'] ) ) {
diff --git a/includes/embeds/class-amp-playlist-embed-handler.php b/includes/embeds/class-amp-playlist-embed-handler.php
index 271f5ab8656..f1e0c5a5113 100644
--- a/includes/embeds/class-amp-playlist-embed-handler.php
+++ b/includes/embeds/class-amp-playlist-embed-handler.php
@@ -6,6 +6,8 @@
  * @since 0.7
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
+
 /**
  * Class AMP_Playlist_Embed_Handler
  *
@@ -13,7 +15,7 @@
  *
  * @package AMP
  */
-class AMP_Playlist_Embed_Handler extends AMP_Base_Embed_Handler {
+class AMP_Playlist_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
 
 	/**
 	 * The tag of the shortcode.
diff --git a/includes/templates/class-amp-content.php b/includes/templates/class-amp-content.php
index efa06bba235..1174abeefeb 100644
--- a/includes/templates/class-amp-content.php
+++ b/includes/templates/class-amp-content.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
+
 /**
  * Class AMP_Content
  *
@@ -184,8 +186,7 @@ private function register_embed_handlers( $embed_handler_classes ) {
 				continue;
 			}
 
-			// @todo Conditional below can be removed once all embed handlers can sanitize raw embeds.
-			if ( method_exists( $embed_handler, 'register_embed' ) ) {
+			if ( $embed_handler instanceof Registerable ) {
 				$embed_handler->register_embed();
 			}
 			$embed_handlers[] = $embed_handler;
@@ -201,8 +202,7 @@ private function register_embed_handlers( $embed_handler_classes ) {
 	 */
 	private function unregister_embed_handlers( $embed_handlers ) {
 		foreach ( $embed_handlers as $embed_handler ) {
-			// @todo Conditional below can be removed once all embed handlers can sanitize raw embeds.
-			if ( method_exists( $embed_handler, 'unregister_embed' ) ) {
+			if ( $embed_handler instanceof Registerable ) {
 				$embed_handler->unregister_embed();
 			}
 		}
diff --git a/src/Embed/Registerable.php b/src/Embed/Registerable.php
new file mode 100644
index 00000000000..d20d842cd43
--- /dev/null
+++ b/src/Embed/Registerable.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Interface Registerable.
+ *
+ * @package AmpProject\AmpWP
+ */
+
+namespace AmpProject\AmpWP\Embed;
+
+/**
+ * Indicates embed handlers that hook into WordPress to perform any actions necessary for the handler to output an
+ * AMP-compatible embed.
+ */
+interface Registerable {
+
+	/**
+	 * Register the embed.
+	 *
+	 * @return void
+	 */
+	public function register_embed();
+
+	/**
+	 * Unregister the embed.
+	 *
+	 * @return void
+	 */
+	public function unregister_embed();
+}

From 1d91d0b02c592fb57362e097fde357c8e9cbf191 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 21 Jun 2020 19:39:55 -0400
Subject: [PATCH 37/45] Fix lint and static analysis errors

---
 .../embeds/class-amp-base-embed-handler.php   | 25 ++++++++-----------
 .../embeds/class-amp-core-block-handler.php   | 18 +++++++++++++
 .../class-amp-crowdsignal-embed-handler.php   |  2 +-
 .../class-amp-dailymotion-embed-handler.php   |  2 +-
 .../class-amp-facebook-embed-handler.php      |  2 +-
 .../class-amp-gallery-embed-handler.php       | 18 +++++++++++++
 .../embeds/class-amp-gfycat-embed-handler.php |  2 +-
 .../embeds/class-amp-hulu-embed-handler.php   |  2 +-
 .../embeds/class-amp-imgur-embed-handler.php  |  2 +-
 .../class-amp-instagram-embed-handler.php     |  2 +-
 .../embeds/class-amp-issuu-embed-handler.php  |  2 +-
 .../embeds/class-amp-meetup-embed-handler.php |  2 +-
 .../class-amp-pinterest-embed-handler.php     |  2 +-
 .../class-amp-playlist-embed-handler.php      | 19 ++++++++++++++
 .../embeds/class-amp-reddit-embed-handler.php |  2 +-
 .../embeds/class-amp-scribd-embed-handler.php |  2 +-
 .../class-amp-soundcloud-embed-handler.php    |  2 +-
 .../embeds/class-amp-tiktok-embed-handler.php |  2 +-
 .../embeds/class-amp-tumblr-embed-handler.php |  2 +-
 .../class-amp-twitter-embed-handler.php       | 11 +++++++-
 .../embeds/class-amp-vimeo-embed-handler.php  |  2 +-
 .../embeds/class-amp-vine-embed-handler.php   |  2 +-
 .../class-amp-wordpress-tv-embed-handler.php  |  2 +-
 .../class-amp-youtube-embed-handler.php       |  2 +-
 24 files changed, 94 insertions(+), 35 deletions(-)

diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index 697ab13d9ef..1c5dc6d0deb 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -79,7 +79,7 @@ public function sanitize_raw_embeds( Document $dom ) {
 		$nodes = $this->get_raw_embed_nodes( $dom );
 
 		if ( null === $nodes ) {
-			// Bail since embed handler does not sanitize embeds.
+			// Bail if the embed handler returns null.
 			return;
 		}
 
@@ -95,16 +95,6 @@ public function sanitize_raw_embeds( Document $dom ) {
 		}
 	}
 
-	/**
-	 * Get all raw embeds from the DOM.
-	 *
-	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, otherwise null if method is not implemented.
-	 */
-	protected function get_raw_embed_nodes( Document $dom ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		return null;
-	}
-
 	/**
 	 * Determine if the node is indeed a raw embed.
 	 *
@@ -115,15 +105,20 @@ protected function is_raw_embed( DOMElement $node ) {
 		return $node->parentNode && $this->amp_tag !== $node->parentNode->nodeName;
 	}
 
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 */
+	abstract protected function get_raw_embed_nodes( Document $dom );
+
 	/**
 	 * Make embed AMP compatible.
 	 *
 	 * @param DOMElement $node DOM element.
-	 * @return null If method is not implemented.
 	 */
-	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		return null;
-	}
+	abstract protected function sanitize_raw_embed( DOMElement $node );
 
 	/**
 	 * Get mapping of AMP component names to AMP script URLs.
diff --git a/includes/embeds/class-amp-core-block-handler.php b/includes/embeds/class-amp-core-block-handler.php
index 5be3b743e5a..161562416d4 100644
--- a/includes/embeds/class-amp-core-block-handler.php
+++ b/includes/embeds/class-amp-core-block-handler.php
@@ -356,4 +356,22 @@ private function process_text_widgets( Document $dom ) {
 			}
 		}
 	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		return null;
+	}
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	}
 }
diff --git a/includes/embeds/class-amp-crowdsignal-embed-handler.php b/includes/embeds/class-amp-crowdsignal-embed-handler.php
index a2e606645e8..3d9f1e74f68 100644
--- a/includes/embeds/class-amp-crowdsignal-embed-handler.php
+++ b/includes/embeds/class-amp-crowdsignal-embed-handler.php
@@ -19,7 +19,7 @@ class AMP_Crowdsignal_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		$queries = [
diff --git a/includes/embeds/class-amp-dailymotion-embed-handler.php b/includes/embeds/class-amp-dailymotion-embed-handler.php
index 9b9204534b5..fe0489453b2 100644
--- a/includes/embeds/class-amp-dailymotion-embed-handler.php
+++ b/includes/embeds/class-amp-dailymotion-embed-handler.php
@@ -68,7 +68,7 @@ public function __construct( $args = [] ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-facebook-embed-handler.php b/includes/embeds/class-amp-facebook-embed-handler.php
index 6de59892360..671fd733c91 100644
--- a/includes/embeds/class-amp-facebook-embed-handler.php
+++ b/includes/embeds/class-amp-facebook-embed-handler.php
@@ -49,7 +49,7 @@ public function sanitize_raw_embeds( Document $dom ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->getElementsByTagName( 'div' );
diff --git a/includes/embeds/class-amp-gallery-embed-handler.php b/includes/embeds/class-amp-gallery-embed-handler.php
index a11c93dd9ab..fe097637af0 100644
--- a/includes/embeds/class-amp-gallery-embed-handler.php
+++ b/includes/embeds/class-amp-gallery-embed-handler.php
@@ -286,4 +286,22 @@ public function print_styles() {
 		</style>
 		<?php
 	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		return null;
+	}
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	}
 }
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index a5790f44661..ee7123e9dab 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -31,7 +31,7 @@ class AMP_Gfycat_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-hulu-embed-handler.php b/includes/embeds/class-amp-hulu-embed-handler.php
index 3e1a1dd5559..d0b907998a4 100644
--- a/includes/embeds/class-amp-hulu-embed-handler.php
+++ b/includes/embeds/class-amp-hulu-embed-handler.php
@@ -38,7 +38,7 @@ class AMP_Hulu_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ contains( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-imgur-embed-handler.php b/includes/embeds/class-amp-imgur-embed-handler.php
index e19d3f25866..b34002cd519 100644
--- a/includes/embeds/class-amp-imgur-embed-handler.php
+++ b/includes/embeds/class-amp-imgur-embed-handler.php
@@ -38,7 +38,7 @@ class AMP_Imgur_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( '//blockquote[ @class = "imgur-embed-pub" ]' );
diff --git a/includes/embeds/class-amp-instagram-embed-handler.php b/includes/embeds/class-amp-instagram-embed-handler.php
index 4713d9c7c47..49aa23b8069 100644
--- a/includes/embeds/class-amp-instagram-embed-handler.php
+++ b/includes/embeds/class-amp-instagram-embed-handler.php
@@ -41,7 +41,7 @@ class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( '//blockquote[ @data-instgrm-permalink ]' );
diff --git a/includes/embeds/class-amp-issuu-embed-handler.php b/includes/embeds/class-amp-issuu-embed-handler.php
index 03312522bc8..e6fa9d4897f 100644
--- a/includes/embeds/class-amp-issuu-embed-handler.php
+++ b/includes/embeds/class-amp-issuu-embed-handler.php
@@ -17,7 +17,7 @@ class AMP_Issuu_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( '//div[ @class="issuuembed" and @data-url ]' );
diff --git a/includes/embeds/class-amp-meetup-embed-handler.php b/includes/embeds/class-amp-meetup-embed-handler.php
index ed3712bec35..ab260075728 100644
--- a/includes/embeds/class-amp-meetup-embed-handler.php
+++ b/includes/embeds/class-amp-meetup-embed-handler.php
@@ -30,7 +30,7 @@ protected function is_raw_embed( DOMElement $node ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( '//div[ @id="meetup_oembed" ]//div[ @class="photo" ]/img' );
diff --git a/includes/embeds/class-amp-pinterest-embed-handler.php b/includes/embeds/class-amp-pinterest-embed-handler.php
index 6732f796cec..7f55a6bcb06 100644
--- a/includes/embeds/class-amp-pinterest-embed-handler.php
+++ b/includes/embeds/class-amp-pinterest-embed-handler.php
@@ -99,7 +99,7 @@ public function render( $args ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//%s', $this->amp_tag ) );
diff --git a/includes/embeds/class-amp-playlist-embed-handler.php b/includes/embeds/class-amp-playlist-embed-handler.php
index f1e0c5a5113..1bc6e7704ff 100644
--- a/includes/embeds/class-amp-playlist-embed-handler.php
+++ b/includes/embeds/class-amp-playlist-embed-handler.php
@@ -7,6 +7,7 @@
  */
 
 use AmpProject\AmpWP\Embed\Registerable;
+use AmpProject\Dom\Document;
 
 /**
  * Class AMP_Playlist_Embed_Handler
@@ -332,4 +333,22 @@ public function get_title( $track ) {
 
 		return '';
 	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		return null;
+	}
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	}
 }
diff --git a/includes/embeds/class-amp-reddit-embed-handler.php b/includes/embeds/class-amp-reddit-embed-handler.php
index b4e8f9212a0..531541c097b 100644
--- a/includes/embeds/class-amp-reddit-embed-handler.php
+++ b/includes/embeds/class-amp-reddit-embed-handler.php
@@ -24,7 +24,7 @@ class AMP_Reddit_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		/*
diff --git a/includes/embeds/class-amp-scribd-embed-handler.php b/includes/embeds/class-amp-scribd-embed-handler.php
index 4849cb5db46..c4beea0eb16 100644
--- a/includes/embeds/class-amp-scribd-embed-handler.php
+++ b/includes/embeds/class-amp-scribd-embed-handler.php
@@ -24,7 +24,7 @@ class AMP_Scribd_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-soundcloud-embed-handler.php b/includes/embeds/class-amp-soundcloud-embed-handler.php
index 54685998df5..b4da8a47151 100644
--- a/includes/embeds/class-amp-soundcloud-embed-handler.php
+++ b/includes/embeds/class-amp-soundcloud-embed-handler.php
@@ -39,7 +39,7 @@ class AMP_SoundCloud_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-tiktok-embed-handler.php b/includes/embeds/class-amp-tiktok-embed-handler.php
index 1cbb1bfadbd..d37790946f8 100644
--- a/includes/embeds/class-amp-tiktok-embed-handler.php
+++ b/includes/embeds/class-amp-tiktok-embed-handler.php
@@ -23,7 +23,7 @@ class AMP_TikTok_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( '//blockquote[ contains( @class, "tiktok-embed" ) ]' );
diff --git a/includes/embeds/class-amp-tumblr-embed-handler.php b/includes/embeds/class-amp-tumblr-embed-handler.php
index 914287d5e6f..01751dcd89e 100644
--- a/includes/embeds/class-amp-tumblr-embed-handler.php
+++ b/includes/embeds/class-amp-tumblr-embed-handler.php
@@ -34,7 +34,7 @@ class AMP_Tumblr_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//div[ @class = "tumblr-post" and starts-with( @data-href, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-twitter-embed-handler.php b/includes/embeds/class-amp-twitter-embed-handler.php
index 37bfe5e7540..8f2f95dc7af 100644
--- a/includes/embeds/class-amp-twitter-embed-handler.php
+++ b/includes/embeds/class-amp-twitter-embed-handler.php
@@ -86,13 +86,22 @@ private function sanitize_moment_embeds( Document $dom ) {
 		$this->sanitize_raw_embeds_with_type( 'moment', $nodes );
 	}
 
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		return null;
+	}
+
 	/**
 	 * Make embed AMP compatible.
 	 *
 	 * @param DOMElement $node DOM element.
 	 */
 	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		// Not implemented.
 	}
 
 	/**
diff --git a/includes/embeds/class-amp-vimeo-embed-handler.php b/includes/embeds/class-amp-vimeo-embed-handler.php
index a37726c723f..22c4958be4e 100644
--- a/includes/embeds/class-amp-vimeo-embed-handler.php
+++ b/includes/embeds/class-amp-vimeo-embed-handler.php
@@ -68,7 +68,7 @@ public function __construct( $args = [] ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-vine-embed-handler.php b/includes/embeds/class-amp-vine-embed-handler.php
index 7f43bbbea0b..bb19f90c57b 100644
--- a/includes/embeds/class-amp-vine-embed-handler.php
+++ b/includes/embeds/class-amp-vine-embed-handler.php
@@ -106,7 +106,7 @@ public function render( $args ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//%s', $this->amp_tag ) );
diff --git a/includes/embeds/class-amp-wordpress-tv-embed-handler.php b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
index de34896c473..f1fe7e75059 100644
--- a/includes/embeds/class-amp-wordpress-tv-embed-handler.php
+++ b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
@@ -26,7 +26,7 @@ class AMP_WordPress_TV_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-youtube-embed-handler.php b/includes/embeds/class-amp-youtube-embed-handler.php
index 7a757593927..472ca534892 100644
--- a/includes/embeds/class-amp-youtube-embed-handler.php
+++ b/includes/embeds/class-amp-youtube-embed-handler.php
@@ -69,7 +69,7 @@ public function __construct( $args = [] ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList A list of DOMElement nodes.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		$query_segments = array_map(

From beadf512b26f239519f76bf5b8a13be24439110f Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Sun, 21 Jun 2020 19:48:33 -0400
Subject: [PATCH 38/45] Rename `whitelist_sanitizer` to `validating_sanitizer`

---
 tests/php/test-amp-reddit-embed-handler.php | 6 +++---
 tests/php/test-amp-tumblr-embed-handler.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/php/test-amp-reddit-embed-handler.php b/tests/php/test-amp-reddit-embed-handler.php
index 6711599d44b..20796114a23 100644
--- a/tests/php/test-amp-reddit-embed-handler.php
+++ b/tests/php/test-amp-reddit-embed-handler.php
@@ -111,12 +111,12 @@ public function test__get_scripts( $source, $expected ) {
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
 		$embed->sanitize_raw_embeds( $dom );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
-		$whitelist_sanitizer->sanitize();
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
+		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
 			$embed->get_scripts(),
-			$whitelist_sanitizer->get_scripts()
+			$validating_sanitizer->get_scripts()
 		);
 
 		$this->assertEquals( $expected, $scripts );
diff --git a/tests/php/test-amp-tumblr-embed-handler.php b/tests/php/test-amp-tumblr-embed-handler.php
index 1d433fe182e..10e7050e73e 100644
--- a/tests/php/test-amp-tumblr-embed-handler.php
+++ b/tests/php/test-amp-tumblr-embed-handler.php
@@ -100,12 +100,12 @@ public function test__get_scripts( $source, $expected ) {
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
 		$embed->sanitize_raw_embeds( $dom );
 
-		$whitelist_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
-		$whitelist_sanitizer->sanitize();
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
+		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
 			$embed->get_scripts(),
-			$whitelist_sanitizer->get_scripts()
+			$validating_sanitizer->get_scripts()
 		);
 
 		$this->assertEquals( $expected, $scripts );

From b0157a1860b670d733ad0f0ba56bb5dd83bb3a8a Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Wed, 24 Jun 2020 21:38:57 -0400
Subject: [PATCH 39/45] Mark Pinterest and Vine embed handlers as registerable

---
 includes/embeds/class-amp-pinterest-embed-handler.php | 3 ++-
 includes/embeds/class-amp-vine-embed-handler.php      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/includes/embeds/class-amp-pinterest-embed-handler.php b/includes/embeds/class-amp-pinterest-embed-handler.php
index 7f55a6bcb06..6435a5255e1 100644
--- a/includes/embeds/class-amp-pinterest-embed-handler.php
+++ b/includes/embeds/class-amp-pinterest-embed-handler.php
@@ -5,12 +5,13 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
 use AmpProject\Dom\Document;
 
 /**
  * Class AMP_Pinterest_Embed_Handler
  */
-class AMP_Pinterest_Embed_Handler extends AMP_Base_Embed_Handler {
+class AMP_Pinterest_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
 
 	const URL_PATTERN = '#https?://(www\.)?pinterest\.com/pin/.*#i';
 
diff --git a/includes/embeds/class-amp-vine-embed-handler.php b/includes/embeds/class-amp-vine-embed-handler.php
index bb19f90c57b..1a8ef23d390 100644
--- a/includes/embeds/class-amp-vine-embed-handler.php
+++ b/includes/embeds/class-amp-vine-embed-handler.php
@@ -5,12 +5,13 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
 use AmpProject\Dom\Document;
 
 /**
  * Class AMP_Vine_Embed_Handler
  */
-class AMP_Vine_Embed_Handler extends AMP_Base_Embed_Handler {
+class AMP_Vine_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
 	const URL_PATTERN = '#https?://vine\.co/v/([^/?]+)#i';
 
 	/**

From b3a2c1c10f6595b60f2801a506dc426ab06b4837 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 25 Jun 2020 00:16:35 -0400
Subject: [PATCH 40/45] Add oEmbed provider URLs for embeds not supported in WP
 5.1

---
 .../class-amp-crowdsignal-embed-handler.php   | 34 ++++++++++++++++++-
 .../class-amp-instagram-embed-handler.php     | 27 ++++++++++++++-
 .../test-amp-crowdsignal-embed-handler.php    | 16 ++++-----
 .../php/test-amp-instagram-embed-handler.php  |  2 ++
 4 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/includes/embeds/class-amp-crowdsignal-embed-handler.php b/includes/embeds/class-amp-crowdsignal-embed-handler.php
index 3d9f1e74f68..6f020d9250b 100644
--- a/includes/embeds/class-amp-crowdsignal-embed-handler.php
+++ b/includes/embeds/class-amp-crowdsignal-embed-handler.php
@@ -8,12 +8,44 @@
  * @since 1.2
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
 use AmpProject\Dom\Document;
 
 /**
  * Class AMP_Crowdsignal_Embed_Handler
  */
-class AMP_Crowdsignal_Embed_Handler extends AMP_Base_Embed_Handler {
+class AMP_Crowdsignal_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
+
+	/**
+	 * Register the embed.
+	 *
+	 * @return void
+	 */
+	public function register_embed() {
+		if ( version_compare( get_bloginfo( 'version' ), '5.1', '>=' ) ) {
+			return;
+		}
+
+		// The oEmbed providers for CrowdSignal embeds are outdated on WP < 5.1. Updating the providers here will
+		// allow for the oEmbed HTML to be fetched, and can then sanitized later below.
+		$formats = [
+			'#https?://(.+\.)?polldaddy\.com/.*#i',
+			'#https?://poll\.fm/.*#i',
+			'#https?://(.+\.)?survey\.fm/.*#i',
+		];
+
+		foreach ( $formats as $format ) {
+			wp_oembed_add_provider( $format, 'https://api.crowdsignal.com/oembed', true );
+		}
+	}
+
+	/**
+	 * Unregister the embed.
+	 *
+	 * @return void
+	 */
+	public function unregister_embed() {
+	}
 
 	/**
 	 * Get all raw embeds from the DOM.
diff --git a/includes/embeds/class-amp-instagram-embed-handler.php b/includes/embeds/class-amp-instagram-embed-handler.php
index 49aa23b8069..65d458726e9 100644
--- a/includes/embeds/class-amp-instagram-embed-handler.php
+++ b/includes/embeds/class-amp-instagram-embed-handler.php
@@ -5,6 +5,7 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
 use AmpProject\Dom\Document;
 
 /**
@@ -12,7 +13,7 @@
  *
  * Much of this class is borrowed from Jetpack embeds
  */
-class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
+class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
 
 	const URL_PATTERN = '#https?:\/\/(www\.)?instagr(\.am|am\.com)\/(p|tv)\/([A-Za-z0-9-_]+)#i';
 
@@ -37,6 +38,30 @@ class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $amp_tag = 'amp-instagram';
 
+	/**
+	 * Register the embed.
+	 *
+	 * @return void
+	 */
+	public function register_embed() {
+		if ( version_compare( get_bloginfo( 'version' ), '5.1', '>=' ) ) {
+			return;
+		}
+
+		// The oEmbed provider for Instagram does not accommodate Instagram TV URLs on WP < 5.1. Modifying the provider format
+		// here will allow for the oEmbed HTML to be fetched, and can then sanitized later below.
+		wp_oembed_remove_provider( '#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i' );
+		wp_oembed_add_provider( self::URL_PATTERN, 'https://api.instagram.com/oembed', true );
+	}
+
+	/**
+	 * Unregister the embed.
+	 *
+	 * @return void
+	 */
+	public function unregister_embed() {
+	}
+
 	/**
 	 * Get all raw embeds from the DOM.
 	 *
diff --git a/tests/php/test-amp-crowdsignal-embed-handler.php b/tests/php/test-amp-crowdsignal-embed-handler.php
index c929366e364..1835252f963 100644
--- a/tests/php/test-amp-crowdsignal-embed-handler.php
+++ b/tests/php/test-amp-crowdsignal-embed-handler.php
@@ -55,19 +55,13 @@ public function get_conversion_data() {
 				'<iframe src="https://rydk.survey.fm/test-survey?ft=1&amp;iframe=http://example.org/" layout="responsive" width="600" height="600" frameborder="0" scrolling="no" allowtransparency="true" sandbox="allow-scripts allow-same-origin"></iframe>' . PHP_EOL . PHP_EOL,
 				$survey_response,
 			],
-		];
 
-		/*
-		 * There is a bug with WordPress's oEmbed handling for Crowdsignal surveys.
-		 * See <https://core.trac.wordpress.org/ticket/46467>.
-		 */
-		if ( version_compare( get_bloginfo( 'version' ), '5.2.0', '>=' ) ) {
-			$data['survey.fm'] = [
+			'survey.fm'        => [
 				'https://rydk.survey.fm/test-survey',
 				'<iframe src="https://rydk.survey.fm/test-survey?ft=1&amp;iframe=http://example.org/" layout="responsive" width="600" height="600" frameborder="0" scrolling="no" allowtransparency="true" sandbox="allow-scripts allow-same-origin"></iframe>' . PHP_EOL . PHP_EOL,
 				$survey_response,
-			];
-		}
+			],
+		];
 
 		return $data;
 	}
@@ -106,12 +100,14 @@ static function ( $pre, $r, $request_url ) use ( $oembed_response ) {
 		);
 
 		$embed = new AMP_Crowdsignal_Embed_Handler();
+		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $url );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
 		$embed->sanitize_raw_embeds( $dom );
 
-		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
+		$content  = AMP_DOM_Utils::get_content_from_dom( $dom );
+		$expected = $this->adapt_iframe_title( $expected );
 
 		$this->assertEquals( $expected, $content );
 	}
diff --git a/tests/php/test-amp-instagram-embed-handler.php b/tests/php/test-amp-instagram-embed-handler.php
index ced41235003..29c76e38b50 100644
--- a/tests/php/test-amp-instagram-embed-handler.php
+++ b/tests/php/test-amp-instagram-embed-handler.php
@@ -102,6 +102,7 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Instagram_Embed_Handler();
+		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -139,6 +140,7 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Instagram_Embed_Handler();
+		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );

From dfaf3e5df71b8cfec72802146a3373df90bd7d9c Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 25 Jun 2020 00:17:10 -0400
Subject: [PATCH 41/45] Fix YouTube embed test

---
 includes/embeds/class-amp-youtube-embed-handler.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/embeds/class-amp-youtube-embed-handler.php b/includes/embeds/class-amp-youtube-embed-handler.php
index 472ca534892..e8da507141c 100644
--- a/includes/embeds/class-amp-youtube-embed-handler.php
+++ b/includes/embeds/class-amp-youtube-embed-handler.php
@@ -96,7 +96,6 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			'layout'       => 'responsive',
 			'width'        => $this->args['width'],
 			'height'       => $this->args['height'],
-			'title'        => null,
 		];
 
 		if ( ! empty( $node->getAttribute( 'title' ) ) ) {
@@ -117,7 +116,7 @@ protected function sanitize_raw_embed( DOMElement $node ) {
 			$attributes
 		);
 
-		$this->append_placeholder( $amp_node, $video_id, $attributes['title'] );
+		$this->append_placeholder( $amp_node, $video_id, isset( $attributes['title'] ) ? $attributes['title'] : null );
 
 		$this->unwrap_p_element( $node );
 

From a857f255ca9a51e22c151b08dcb83aba2dfb2252 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 25 Jun 2020 00:31:35 -0400
Subject: [PATCH 42/45] Remove unused vars

---
 tests/php/test-class-amp-imgur-embed-handler.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/php/test-class-amp-imgur-embed-handler.php b/tests/php/test-class-amp-imgur-embed-handler.php
index 248fe85ce41..dfc149ffd19 100644
--- a/tests/php/test-class-amp-imgur-embed-handler.php
+++ b/tests/php/test-class-amp-imgur-embed-handler.php
@@ -57,9 +57,6 @@ static function( $pre, $r, $url ) {
 	 * @return array
 	 */
 	public function get_conversion_data() {
-		$width  = 500;
-		$height = 750;
-
 		return [
 			'no_embed'        => [
 				'<p>Hello world.</p>',

From 434660ad5b868fb66787c5b2e45394de9faf2ea8 Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 25 Jun 2020 00:58:07 -0400
Subject: [PATCH 43/45] Fix tests failures related to Gutenberg

---
 tests/php/test-amp-issuu-embed-handler.php  | 8 +++++++-
 tests/php/test-amp-reddit-embed-handler.php | 8 +++++++-
 tests/php/test-amp-tumblr-embed-handler.php | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/tests/php/test-amp-issuu-embed-handler.php b/tests/php/test-amp-issuu-embed-handler.php
index ab640254d66..6a72b7fda94 100644
--- a/tests/php/test-amp-issuu-embed-handler.php
+++ b/tests/php/test-amp-issuu-embed-handler.php
@@ -1,12 +1,18 @@
 <?php
 
+use AmpProject\AmpWP\Tests\WithoutBlockPreRendering;
+
 class AMP_Issuu_Embed_Handler_Test extends WP_UnitTestCase {
 
+	use WithoutBlockPreRendering {
+		setUp as prevent_block_pre_render;
+	}
+
 	/**
 	 * Set up.
 	 */
 	public function setUp() {
-		parent::setUp();
+		$this->prevent_block_pre_render();
 
 		// Mock the HTTP request.
 		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
diff --git a/tests/php/test-amp-reddit-embed-handler.php b/tests/php/test-amp-reddit-embed-handler.php
index 20796114a23..b28d0664afb 100644
--- a/tests/php/test-amp-reddit-embed-handler.php
+++ b/tests/php/test-amp-reddit-embed-handler.php
@@ -1,12 +1,18 @@
 <?php
 
+use AmpProject\AmpWP\Tests\WithoutBlockPreRendering;
+
 class AMP_Reddit_Embed_Handler_Test extends WP_UnitTestCase {
 
+	use WithoutBlockPreRendering {
+		setUp as prevent_block_pre_render;
+	}
+
 	/**
 	 * Set up.
 	 */
 	public function setUp() {
-		parent::setUp();
+		$this->prevent_block_pre_render();
 
 		// Mock the HTTP request.
 		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
diff --git a/tests/php/test-amp-tumblr-embed-handler.php b/tests/php/test-amp-tumblr-embed-handler.php
index 10e7050e73e..83c8e24750f 100644
--- a/tests/php/test-amp-tumblr-embed-handler.php
+++ b/tests/php/test-amp-tumblr-embed-handler.php
@@ -1,12 +1,18 @@
 <?php
 
+use AmpProject\AmpWP\Tests\WithoutBlockPreRendering;
+
 class AMP_Tumblr_Embed_Handler_Test extends WP_UnitTestCase {
 
+	use WithoutBlockPreRendering {
+		setUp as prevent_block_pre_render;
+	}
+
 	/**
 	 * Set up.
 	 */
 	public function setUp() {
-		parent::setUp();
+		$this->prevent_block_pre_render();
 
 		// Mock the HTTP request.
 		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );

From 986c036a8114b9c050806f2b742709d21f97bedd Mon Sep 17 00:00:00 2001
From: Pierre Gordon <pierregordon@protonmail.com>
Date: Thu, 25 Jun 2020 01:44:44 -0400
Subject: [PATCH 44/45] Add oEmbed provider URL for Crowdsignal surveys on WP
 5.2.

---
 includes/embeds/class-amp-crowdsignal-embed-handler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/embeds/class-amp-crowdsignal-embed-handler.php b/includes/embeds/class-amp-crowdsignal-embed-handler.php
index 6f020d9250b..b5bd516430d 100644
--- a/includes/embeds/class-amp-crowdsignal-embed-handler.php
+++ b/includes/embeds/class-amp-crowdsignal-embed-handler.php
@@ -22,7 +22,7 @@ class AMP_Crowdsignal_Embed_Handler extends AMP_Base_Embed_Handler implements Re
 	 * @return void
 	 */
 	public function register_embed() {
-		if ( version_compare( get_bloginfo( 'version' ), '5.1', '>=' ) ) {
+		if ( version_compare( get_bloginfo( 'version' ), '5.2', '>=' ) ) {
 			return;
 		}
 
@@ -31,7 +31,7 @@ public function register_embed() {
 		$formats = [
 			'#https?://(.+\.)?polldaddy\.com/.*#i',
 			'#https?://poll\.fm/.*#i',
-			'#https?://(.+\.)?survey\.fm/.*#i',
+			'#https?://(.+\.)?survey\.fm/.*#i', // Not available on WP 5.2.
 		];
 
 		foreach ( $formats as $format ) {

From 0860f489b9e59357abb1c2941d13030b194b12be Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Thu, 25 Jun 2020 16:54:34 -0700
Subject: [PATCH 45/45] Update phpdoc to reflect where methods do not return
 null

---
 includes/embeds/class-amp-crowdsignal-embed-handler.php  | 2 +-
 includes/embeds/class-amp-dailymotion-embed-handler.php  | 2 +-
 includes/embeds/class-amp-facebook-embed-handler.php     | 3 ++-
 includes/embeds/class-amp-gfycat-embed-handler.php       | 2 +-
 includes/embeds/class-amp-hulu-embed-handler.php         | 2 +-
 includes/embeds/class-amp-imgur-embed-handler.php        | 2 +-
 includes/embeds/class-amp-instagram-embed-handler.php    | 2 +-
 includes/embeds/class-amp-issuu-embed-handler.php        | 2 +-
 includes/embeds/class-amp-meetup-embed-handler.php       | 2 +-
 includes/embeds/class-amp-pinterest-embed-handler.php    | 2 +-
 includes/embeds/class-amp-reddit-embed-handler.php       | 2 +-
 includes/embeds/class-amp-scribd-embed-handler.php       | 2 +-
 includes/embeds/class-amp-soundcloud-embed-handler.php   | 2 +-
 includes/embeds/class-amp-tiktok-embed-handler.php       | 2 +-
 includes/embeds/class-amp-tumblr-embed-handler.php       | 2 +-
 includes/embeds/class-amp-vimeo-embed-handler.php        | 2 +-
 includes/embeds/class-amp-vine-embed-handler.php         | 2 +-
 includes/embeds/class-amp-wordpress-tv-embed-handler.php | 2 +-
 includes/embeds/class-amp-youtube-embed-handler.php      | 2 +-
 19 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/includes/embeds/class-amp-crowdsignal-embed-handler.php b/includes/embeds/class-amp-crowdsignal-embed-handler.php
index b5bd516430d..23adc3899d9 100644
--- a/includes/embeds/class-amp-crowdsignal-embed-handler.php
+++ b/includes/embeds/class-amp-crowdsignal-embed-handler.php
@@ -51,7 +51,7 @@ public function unregister_embed() {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		$queries = [
diff --git a/includes/embeds/class-amp-dailymotion-embed-handler.php b/includes/embeds/class-amp-dailymotion-embed-handler.php
index fe0489453b2..9b9204534b5 100644
--- a/includes/embeds/class-amp-dailymotion-embed-handler.php
+++ b/includes/embeds/class-amp-dailymotion-embed-handler.php
@@ -68,7 +68,7 @@ public function __construct( $args = [] ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-facebook-embed-handler.php b/includes/embeds/class-amp-facebook-embed-handler.php
index 671fd733c91..2619024f906 100644
--- a/includes/embeds/class-amp-facebook-embed-handler.php
+++ b/includes/embeds/class-amp-facebook-embed-handler.php
@@ -49,7 +49,7 @@ public function sanitize_raw_embeds( Document $dom ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->getElementsByTagName( 'div' );
@@ -135,6 +135,7 @@ private function remove_fb_root_nodes( Document $dom ) {
 			$script_query = $dom->xpath->query( '//script[ starts-with( @src, "https://connect.facebook.net" ) and contains( @src, "sdk.js" ) ]' );
 
 			foreach ( $script_query as $script ) {
+				/** @var DOMElement $parent_node */
 				$parent_node = $script->parentNode;
 				$parent_node->removeChild( $script );
 
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index ee7123e9dab..a5790f44661 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -31,7 +31,7 @@ class AMP_Gfycat_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-hulu-embed-handler.php b/includes/embeds/class-amp-hulu-embed-handler.php
index d0b907998a4..3e1a1dd5559 100644
--- a/includes/embeds/class-amp-hulu-embed-handler.php
+++ b/includes/embeds/class-amp-hulu-embed-handler.php
@@ -38,7 +38,7 @@ class AMP_Hulu_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ contains( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-imgur-embed-handler.php b/includes/embeds/class-amp-imgur-embed-handler.php
index b34002cd519..e19d3f25866 100644
--- a/includes/embeds/class-amp-imgur-embed-handler.php
+++ b/includes/embeds/class-amp-imgur-embed-handler.php
@@ -38,7 +38,7 @@ class AMP_Imgur_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( '//blockquote[ @class = "imgur-embed-pub" ]' );
diff --git a/includes/embeds/class-amp-instagram-embed-handler.php b/includes/embeds/class-amp-instagram-embed-handler.php
index 65d458726e9..1dddaf67d47 100644
--- a/includes/embeds/class-amp-instagram-embed-handler.php
+++ b/includes/embeds/class-amp-instagram-embed-handler.php
@@ -66,7 +66,7 @@ public function unregister_embed() {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( '//blockquote[ @data-instgrm-permalink ]' );
diff --git a/includes/embeds/class-amp-issuu-embed-handler.php b/includes/embeds/class-amp-issuu-embed-handler.php
index e6fa9d4897f..03312522bc8 100644
--- a/includes/embeds/class-amp-issuu-embed-handler.php
+++ b/includes/embeds/class-amp-issuu-embed-handler.php
@@ -17,7 +17,7 @@ class AMP_Issuu_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( '//div[ @class="issuuembed" and @data-url ]' );
diff --git a/includes/embeds/class-amp-meetup-embed-handler.php b/includes/embeds/class-amp-meetup-embed-handler.php
index ab260075728..ed3712bec35 100644
--- a/includes/embeds/class-amp-meetup-embed-handler.php
+++ b/includes/embeds/class-amp-meetup-embed-handler.php
@@ -30,7 +30,7 @@ protected function is_raw_embed( DOMElement $node ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( '//div[ @id="meetup_oembed" ]//div[ @class="photo" ]/img' );
diff --git a/includes/embeds/class-amp-pinterest-embed-handler.php b/includes/embeds/class-amp-pinterest-embed-handler.php
index 6435a5255e1..681d711a193 100644
--- a/includes/embeds/class-amp-pinterest-embed-handler.php
+++ b/includes/embeds/class-amp-pinterest-embed-handler.php
@@ -100,7 +100,7 @@ public function render( $args ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//%s', $this->amp_tag ) );
diff --git a/includes/embeds/class-amp-reddit-embed-handler.php b/includes/embeds/class-amp-reddit-embed-handler.php
index 531541c097b..b4e8f9212a0 100644
--- a/includes/embeds/class-amp-reddit-embed-handler.php
+++ b/includes/embeds/class-amp-reddit-embed-handler.php
@@ -24,7 +24,7 @@ class AMP_Reddit_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		/*
diff --git a/includes/embeds/class-amp-scribd-embed-handler.php b/includes/embeds/class-amp-scribd-embed-handler.php
index c4beea0eb16..4849cb5db46 100644
--- a/includes/embeds/class-amp-scribd-embed-handler.php
+++ b/includes/embeds/class-amp-scribd-embed-handler.php
@@ -24,7 +24,7 @@ class AMP_Scribd_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-soundcloud-embed-handler.php b/includes/embeds/class-amp-soundcloud-embed-handler.php
index b4da8a47151..54685998df5 100644
--- a/includes/embeds/class-amp-soundcloud-embed-handler.php
+++ b/includes/embeds/class-amp-soundcloud-embed-handler.php
@@ -39,7 +39,7 @@ class AMP_SoundCloud_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-tiktok-embed-handler.php b/includes/embeds/class-amp-tiktok-embed-handler.php
index d37790946f8..1cbb1bfadbd 100644
--- a/includes/embeds/class-amp-tiktok-embed-handler.php
+++ b/includes/embeds/class-amp-tiktok-embed-handler.php
@@ -23,7 +23,7 @@ class AMP_TikTok_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( '//blockquote[ contains( @class, "tiktok-embed" ) ]' );
diff --git a/includes/embeds/class-amp-tumblr-embed-handler.php b/includes/embeds/class-amp-tumblr-embed-handler.php
index 01751dcd89e..914287d5e6f 100644
--- a/includes/embeds/class-amp-tumblr-embed-handler.php
+++ b/includes/embeds/class-amp-tumblr-embed-handler.php
@@ -34,7 +34,7 @@ class AMP_Tumblr_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//div[ @class = "tumblr-post" and starts-with( @data-href, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-vimeo-embed-handler.php b/includes/embeds/class-amp-vimeo-embed-handler.php
index 22c4958be4e..a37726c723f 100644
--- a/includes/embeds/class-amp-vimeo-embed-handler.php
+++ b/includes/embeds/class-amp-vimeo-embed-handler.php
@@ -68,7 +68,7 @@ public function __construct( $args = [] ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-vine-embed-handler.php b/includes/embeds/class-amp-vine-embed-handler.php
index 1a8ef23d390..efe1a346cd6 100644
--- a/includes/embeds/class-amp-vine-embed-handler.php
+++ b/includes/embeds/class-amp-vine-embed-handler.php
@@ -107,7 +107,7 @@ public function render( $args ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//%s', $this->amp_tag ) );
diff --git a/includes/embeds/class-amp-wordpress-tv-embed-handler.php b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
index f1fe7e75059..de34896c473 100644
--- a/includes/embeds/class-amp-wordpress-tv-embed-handler.php
+++ b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
@@ -26,7 +26,7 @@ class AMP_WordPress_TV_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
diff --git a/includes/embeds/class-amp-youtube-embed-handler.php b/includes/embeds/class-amp-youtube-embed-handler.php
index e8da507141c..89467426f02 100644
--- a/includes/embeds/class-amp-youtube-embed-handler.php
+++ b/includes/embeds/class-amp-youtube-embed-handler.php
@@ -69,7 +69,7 @@ public function __construct( $args = [] ) {
 	 * Get all raw embeds from the DOM.
 	 *
 	 * @param Document $dom Document.
-	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
 	protected function get_raw_embed_nodes( Document $dom ) {
 		$query_segments = array_map(