Merge branch 'develop' of github.com:ampproject/amp-wp into 4380-bump…

…-phpstan-to-level-4

* 'develop' of github.com:ampproject/amp-wp:
  Update dependency @wordpress/scripts to v9.1.0
  Update dependency @wordpress/jest-puppeteer-axe to v1.8.0
  Update dependency @wordpress/url to v2.15.0
  Update dependency @wordpress/plugins to v2.16.0
  Raise PHPStan level to 4 in lib/common (#4686)
  Update dependency uuid to v8
  Update dependency webpack to v4.43.0
  Update dependency eslint-plugin-jest to v23.11.0
  Update dependency eslint-plugin-react to v7.20.0 (#4691)
  Update dependency postcss to v7.0.30 (#4649)
  Update dependency moment to v2.25.3 (#4639)
  Update dependency babel-jest to v26 (#4652)
  Update dependency uuid to v7.0.3 (#4490)
  Update dependency wp-coding-standards/wpcs to v2.3.0 (#4721)
  Update dependency @wordpress/e2e-test-utils to v4.7.0
  Suppress Site Health ICU test if site or home URL is not an IDN (#4698)
  Pin amp-experiment to v0.1 (#4690)
  Disable share icons
  Use amp-embedly-card for Tiktok embeds
  Update dependency terser-webpack-plugin to v2.3.6

composer.json

@@ -27,7 +27,7 @@
     "phpcompatibility/phpcompatibility-wp": "2.1.0",
     "roave/security-advisories": "dev-master",
     "sirbrillig/phpcs-variable-analysis": "2.8.1",
-    "wp-coding-standards/wpcs": "2.2.1",
+    "wp-coding-standards/wpcs": "2.3.0",
     "xwp/wp-dev-lib": "1.6.4"
   },
   "suggest": {

includes/amp-helper-functions.php

@@ -834,6 +834,14 @@ function amp_register_default_scripts( $wp_scripts ) {
 			null
 		);
 	}
+
+	if ( $wp_scripts->query( 'amp-experiment', 'registered' ) ) {
+		/*
+		 * Version 1.0 of amp-experiment is still experimental and requires the user to enable it.
+		 * @todo Revisit once amp-experiment is no longer experimental.
+		 */
+		$wp_scripts->registered['amp-experiment']->src = 'https://cdn.ampproject.org/v0/amp-experiment-0.1.js';
+	}
 }
 
 /**

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

@@ -50,7 +50,7 @@ public function sanitize_raw_embeds( Document $dom ) {
 	 * @return bool Whether the node is a raw embed.
 	 */
 	protected function is_raw_embed( DOMElement $node ) {
-		return ! $node->firstChild || ( $node->firstChild && 'amp-iframe' !== $node->firstChild->nodeName );
+		return ! $node->firstChild || ( $node->firstChild && 'amp-embedly-card' !== $node->firstChild->nodeName );
 	}
 
 	/**
@@ -59,34 +59,25 @@ protected function is_raw_embed( DOMElement $node ) {
 	 * @param DOMElement $blockquote_node The <blockquote> node to make AMP compatible.
 	 */
 	protected function make_embed_amp_compatible( DOMElement $blockquote_node ) {
-		$dom      = $blockquote_node->ownerDocument;
-		$video_id = $blockquote_node->getAttribute( 'data-video-id' );
+		$dom       = $blockquote_node->ownerDocument;
+		$video_url = $blockquote_node->getAttribute( 'cite' );
 
-		// If there is no video ID, stop here as its needed for the iframe `src` attribute.
-		if ( empty( $video_id ) ) {
+		// If there is no video ID, stop here as its needed for the `data-url` parameter.
+		if ( empty( $video_url ) ) {
 			return;
 		}
 
 		$this->remove_embed_script( $blockquote_node );
 
-		$amp_iframe_node = AMP_DOM_Utils::create_node(
+		$amp_node = AMP_DOM_Utils::create_node(
 			Document::fromNode( $dom ),
-			'amp-iframe',
+			'amp-embedly-card',
 			[
-				'layout'  => 'fixed-height',
-
-				/*
-				 * The iframe dimensions cannot be derived from the embed, so we default to a dimension that should
-				 * allow the embed to be fully shown.
-				 */
-				'height'  => 900,
-
-				/*
-				 * A `lang` query parameter is added to the URL via JS. This can't be determined here so it is not
-				 * added. Whether it alters the embed in any way or not has not been determined.
-				 */
-				'src'     => 'https://www.tiktok.com/embed/v2/' . $video_id,
-				'sandbox' => 'allow-scripts allow-same-origin allow-popups',
+				'layout'             => 'responsive',
+				'height'             => 700,
+				'width'              => 340,
+				'data-card-controls' => 0,
+				'data-url'           => $video_url,
 			]
 		);
 
@@ -99,23 +90,22 @@ protected function make_embed_amp_compatible( DOMElement $blockquote_node ) {
 			// Append the placeholder if it was found.
 			if ( 'section' === $child->nodeName ) {
 				/**
-				 * Placeholder to append to the iframe.
+				 * Placeholder to append to the AMP component.
 				 *
 				 * @var DOMElement $placeholder_node
 				 */
 				$placeholder_node = $blockquote_node->removeChild( $child );
 				$placeholder_node->setAttribute( 'placeholder', '' );
-				$amp_iframe_node->appendChild( $placeholder_node );
+				$amp_node->appendChild( $placeholder_node );
 				break;
 			}
 		}
 
-		// On the non-amp page the embed is wrapped with a <blockquote>, so the same is done here.
-		$blockquote_node->appendChild( $amp_iframe_node );
+		$blockquote_node->parentNode->replaceChild( $amp_node, $blockquote_node );
 	}
 
 	/**
-	 * Remove TikTok's embed script if it exists.
+	 * Remove the TikTok embed script if it exists.
 	 *
 	 * @param DOMElement $node The DOMNode to make AMP compatible.
 	 */

lib/common/phpstan.neon.dist

@@ -2,11 +2,15 @@ includes:
 	# @see https://github.com/phpstan/phpstan-src/blob/master/conf/bleedingEdge.neon
 	- phar://phpstan.phar/conf/bleedingEdge.neon
 parameters:
-	level: 3
+	level: 4
 	inferPrivatePropertyTypeFromConstructor: true
 	paths:
 		- %currentWorkingDirectory%/src/
 	autoload_files:
 		- %currentWorkingDirectory%/vendor/autoload.php
 	ignoreErrors:
 		- '#^PHPDoc tag @throws with type AmpProject\\Exception\\FailedRemoteRequest is not subtype of Throwable$#'
+		-
+			message: '#^If condition is always false\.$#'
+			path: 'src/Dom/Document.php'
+			# See https://github.com/phpstan/phpstan/issues/3291

lib/common/src/Dom/Document.php

@@ -847,26 +847,26 @@ private function restoreSelfClosingTags($html)
      */
     private function maybeReplaceNoscriptElements($html)
     {
-        if (! version_compare(LIBXML_DOTTED_VERSION, '2.8', '<')) {
-            return $html;
+        if (version_compare(LIBXML_DOTTED_VERSION, '2.8', '<')) {
+            $html = preg_replace_callback(
+                '#^.+?(?=<body)#is',
+                function ($headMatches) {
+                    return preg_replace_callback(
+                        '#<noscript[^>]*>.*?</noscript>#si',
+                        function ($noscriptMatches) {
+                            $placeholder = sprintf('<!--noscript:%s-->', (string)$this->rand());
+
+                            $this->noscriptPlaceholderComments[$placeholder] = $noscriptMatches[0];
+                            return $placeholder;
+                        },
+                        $headMatches[0]
+                    );
+                },
+                $html
+            );
         }
 
-        return preg_replace_callback(
-            '#^.+?(?=<body)#is',
-            function ($headMatches) {
-                return preg_replace_callback(
-                    '#<noscript[^>]*>.*?</noscript>#si',
-                    function ($noscriptMatches) {
-                        $placeholder = sprintf('<!--noscript:%s-->', (string)$this->rand());
-
-                        $this->noscriptPlaceholderComments[$placeholder] = $noscriptMatches[0];
-                        return $placeholder;
-                    },
-                    $headMatches[0]
-                );
-            },
-            $html
-        );
+        return $html;
     }
 
     /**
@@ -1420,7 +1420,7 @@ public function deduplicateTag($tagName)
         /**
          * Main tag to keep.
          *
-         * @var DOMElement $mainTag
+         * @var DOMElement|null $mainTag
          */
         $mainTag = $tags->item(0);
 

lib/common/src/Exception/FailedToGetFromRemoteUrl.php

@@ -18,7 +18,7 @@ final class FailedToGetFromRemoteUrl extends RuntimeException implements FailedR
      *
      * This is not always set.
      *
-     * @var int
+     * @var int|null
      */
     private $statusCode;
 

lib/common/src/RuntimeVersion.php

@@ -78,7 +78,7 @@ public function currentVersion($options = [])
         $response = $this->remoteRequest->get(self::RUNTIME_METADATA_ENDPOINT);
         $statusCode = $response->getStatusCode();
 
-        if (200 < $statusCode || $statusCode >= 300) {
+        if ($statusCode < 200 || $statusCode >= 300) {
             return '0';
         }