Update embeds handlers to unwrap embeds from <p> tag

includes/amp-helper-functions.php

@@ -1413,6 +1413,7 @@ function amp_get_content_embed_handlers( $post = null ) {
 			AMP_Scribd_Embed_Handler::class       => [],
 			AMP_WordPress_Embed_Handler::class    => [],
 			AMP_WordPress_TV_Embed_Handler::class => [],
+			AMP_Iframe_Embed_Handler::class       => [],
 		],
 		$post
 	);

includes/embeds/class-amp-base-embed-handler.php

@@ -150,7 +150,7 @@
 		if (
 			$parent_node instanceof DOMElement
 			&&
-			'p' === $parent_node->tagName
+			Tag::P === $parent_node->tagName
 			&&
 			false === $parent_node->hasAttributes()
 			&&
@@ -160,6 +160,24 @@
 		}
 	}
 
+	/**
+	 * Unwrap `<p>` element based on passed child tag name.
+	 *
+	 * @since 2.4.2
+	 *
+	 * @param Document $dom            Document.
+	 * @param string   $child_tag_name Child tag name.
+	 */
+	protected function unwrap_p_element_by_child_tag_name( $dom, $child_tag_name ) {
+		$nodes = $dom->xpath->query( "//p/{$child_tag_name}" );
+
+		if ( $nodes->length && $nodes instanceof DOMNodeList ) {
+			foreach ( $nodes as $node ) {
+				$this->unwrap_p_element( $node );
+			}
+		}
+	}
+
 	/**
 	 * Removes the node's nearest `<script>` sibling with a `src` attribute containing the base `src` URL provided.
 	 *

includes/embeds/class-amp-crowdsignal-embed-handler.php

@@ -39,7 +39,7 @@ public function unregister_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 ) ) {
+		if ( empty( $parsed_url['host'] ) || empty( $parsed_url['path'] ) || ! preg_match( '#(^|\.)(?P<host>polldaddy\.com|poll\.fm|crowdsignal\.com|survey\.fm|poll\.fm)#', $parsed_url['host'], $matches ) ) {
 			return $cache;
 		}
 

includes/embeds/class-amp-dailymotion-embed-handler.php

@@ -5,6 +5,9 @@
  * @package AMP
  */
 
+use AmpProject\Extension;
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_DailyMotion_Embed_Handler
  *
@@ -117,6 +120,18 @@
 		);
 	}
 
+	/**
+	 * Sanitize raw embeds.
+	 *
+	 * @param Document $dom Document.
+	 *
+	 * @return void
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
+		$this->unwrap_p_element_by_child_tag_name( $dom, Extension::DAILYMOTION );
+	}
+
 	/**
 	 * Determine the video ID from the URL.
 	 *

includes/embeds/class-amp-facebook-embed-handler.php

@@ -5,6 +5,7 @@
  * @package AMP
  */
 
+use AmpProject\Extension;
 use AmpProject\Dom\Document;
 
 /**
@@ -114,12 +115,7 @@ public function render( $args ) {
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
 		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
-		$embed_nodes = $dom->xpath->query( "//p/{$this->amp_tag}" );
-		if ( $embed_nodes->length ) {
-			foreach ( $embed_nodes as $embed_node ) {
-				$this->unwrap_p_element( $embed_node );
-			}
-		}
+		$this->unwrap_p_element_by_child_tag_name( $dom, Extension::FACEBOOK );
 
 		$nodes     = $dom->getElementsByTagName( $this->sanitize_tag );
 		$num_nodes = $nodes->length;

includes/embeds/class-amp-gfycat-embed-handler.php

@@ -6,6 +6,9 @@
  * @since 1.0
  */
 
+use AmpProject\Extension;
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Gfycat_Embed_Handler
  *
@@ -79,5 +82,17 @@
 		}
 		return $return;
 	}
+
+	/**
+	 * Sanitize raw embeds.
+	 *
+	 * @param Document $dom Document.
+	 *
+	 * @return void
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
+		$this->unwrap_p_element_by_child_tag_name( $dom, Extension::GFYCAT );
+	}
 }
 

includes/embeds/class-amp-iframe-embed-handler.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Class for handling `amp-iframe` embeds.
+ *
+ * @package AMP
+ * @since 2.4.1
+ */
+
+use AmpProject\Html\Tag;
+use AmpProject\Extension;
+use AmpProject\Dom\Document;
+
+/**
+ * Class AMP_Iframe_Embed_Handler
+ *
+ * @since 2.4.1
+ */
+class AMP_Iframe_Embed_Handler extends AMP_Base_Embed_Handler {
+
+	/**
+	 * Register embed.
+	 */
+	public function register_embed() {
+		// Not implemented.
+	}
+
+	/**
+	 * Unregister embed.
+	 */
+	public function unregister_embed() {
+		// Not implemented.
+	}
+
+	/**
+	 * Sanitize `amp-iframe` raw embeds.
+	 *
+	 * @param Document $dom Document.
+	 *
+	 * @return void
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
+		foreach ( [ Extension::IFRAME, Tag::IFRAME ] as $tag_name ) {
+			$this->unwrap_p_element_by_child_tag_name( $dom, $tag_name );
+		}
+	}
+}

includes/embeds/class-amp-imgur-embed-handler.php

@@ -6,6 +6,9 @@
  * @since 1.0
  */
 
+use AmpProject\Extension;
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Imgur_Embed_Handler
  *
@@ -73,6 +76,18 @@
 		return $return;
 	}
 
+	/**
+	 * Sanitize raw embeds.
+	 *
+	 * @param Document $dom Document.
+	 *
+	 * @return void
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
+		$this->unwrap_p_element_by_child_tag_name( $dom, Extension::IMGUR );
+	}
+
 	/**
 	 * Get Imgur ID from URL.
 	 *

includes/embeds/class-amp-instagram-embed-handler.php

@@ -8,6 +8,7 @@
 use AmpProject\Dom\Document;
 use AmpProject\Html\Attribute;
 use AmpProject\Html\Tag;
+use AmpProject\Extension;
 
 /**
  * Class AMP_Instagram_Embed_Handler
@@ -142,6 +143,9 @@ private function get_instagram_id_from_url( $url ) {
 	 * @param Document $dom DOM.
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
+		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
+		$this->unwrap_p_element_by_child_tag_name( $dom, Extension::INSTAGRAM );
+
 		/**
 		 * Node list.
 		 *

includes/embeds/class-amp-pinterest-embed-handler.php

@@ -5,6 +5,9 @@
  * @package AMP
  */
 
+use AmpProject\Extension;
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Pinterest_Embed_Handler
  *
@@ -89,4 +92,16 @@
 			]
 		);
 	}
+
+	/**
+	 * Sanitize raw embeds.
+	 *
+	 * @param Document $dom Document.
+	 *
+	 * @return void
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
+		$this->unwrap_p_element_by_child_tag_name( $dom, Extension::PINTEREST );
+	}
 }

includes/embeds/class-amp-reddit-embed-handler.php

@@ -6,6 +6,9 @@
  * @since 0.7
  */
 
+use AmpProject\Extension;
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Reddit_Embed_Handler
  *
@@ -73,5 +76,16 @@
 			]
 		);
 	}
-}
 
+	/**
+	 * Sanitize raw embeds.
+	 *
+	 * @param Document $dom Document.
+	 *
+	 * @return void
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
+		$this->unwrap_p_element_by_child_tag_name( $dom, Extension::EMBEDLY_CARD );
+	}
+}

includes/embeds/class-amp-soundcloud-embed-handler.php

@@ -5,6 +5,9 @@
  * @package AMP
  */
 
+use AmpProject\Extension;
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_SoundCloud_Embed_Handler
  *
@@ -174,6 +177,18 @@
 		);
 	}
 
+	/**
+	 * Sanitize raw embeds.
+	 *
+	 * @param Document $dom Document.
+	 *
+	 * @return void
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
+		$this->unwrap_p_element_by_child_tag_name( $dom, Extension::SOUNDCLOUD );
+	}
+
 	/**
 	 * Get params from Soundcloud iframe src.
 	 *

includes/embeds/class-amp-tiktok-embed-handler.php

@@ -45,6 +45,7 @@ public function sanitize_raw_embeds( Document $dom ) {
 
 		foreach ( $nodes as $node ) {
 			$this->make_embed_amp_compatible( $node );
+			$this->unwrap_p_element( $node );
 		}
 	}
 

includes/embeds/class-amp-vimeo-embed-handler.php

@@ -5,6 +5,9 @@
  * @package AMP
  */
 
+use AmpProject\Extension;
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Vimeo_Embed_Handler
  *
@@ -131,6 +134,18 @@
 		);
 	}
 
+	/**
+	 * Sanitize raw embeds.
+	 *
+	 * @param Document $dom Document.
+	 *
+	 * @return void
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
+		$this->unwrap_p_element_by_child_tag_name( $dom, Extension::VIMEO );
+	}
+
 	/**
 	 * Determine the video ID from the URL.
 	 *

includes/embeds/class-amp-youtube-embed-handler.php

@@ -161,6 +161,8 @@ public function render( $html, $url, $video_id ) {
 	 * @return void
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
+		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
+		$this->unwrap_p_element_by_child_tag_name( $dom, Extension::YOUTUBE );
 
 		$query_segments = array_map(
 			static function ( $domain ) {