Raise PHPStan level to 4 in lib/common (#4686)

* Bump level to 4 * Add additional null typehint * Add additional null typehint * Fix bug with status code comparison * Rewrite logic and add exception for false positive when checking libxml version
ampproject · May 15, 2020 · 83d7964 · 83d7964
1 parent 69b78da
commit 83d7964
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 22 deletions.
diff --git a/lib/common/phpstan.neon.dist b/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
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;
     }
 
     /**
@@ -1420,7 +1420,7 @@ public function deduplicateTag($tagName)
         /**
          * Main tag to keep.
          *
-         * @var DOMElement $mainTag
+         * @var DOMElement|null $mainTag
          */
         $mainTag = $tags->item(0);
 

diff --git a/lib/common/src/Exception/FailedToGetFromRemoteUrl.php b/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;
 

diff --git a/lib/common/src/RuntimeVersion.php b/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';
         }