Rewrite logic and add exception for false positive when checking libx…

…ml version
ampproject · May 12, 2020 · ba20769 · ba20769
1 parent 0cda75a
commit ba20769
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/lib/common/phpstan.neon.dist b/lib/common/phpstan.neon.dist
@@ -10,3 +10,7 @@ parameters:
 		- %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
diff --git a/lib/common/src/Dom/Document.php b/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;
     }
 
     /**