chore: update to phpstan major version 2

composer.json

@@ -13,10 +13,10 @@
         "sabre/uri"    : "^2.3 || ^3.0"
     },
     "require-dev" : {
-        "friendsofphp/php-cs-fixer": "^3.91",
-        "phpstan/phpstan": "^1.12",
-        "phpstan/phpstan-phpunit": "^1.4",
-        "phpstan/phpstan-strict-rules": "^1.6",
+        "friendsofphp/php-cs-fixer": "^3.95",
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-strict-rules": "^2.0",
         "phpstan/extension-installer": "^1.4",
         "phpunit/phpunit" : "^9.6"
     },

lib/Message.php

@@ -82,11 +82,8 @@ public function getBodyAsString(): string
 
             return ob_get_clean();
         }
-        /**
-         * @var string|int|null $contentLength
-         */
         $contentLength = $this->getHeader('Content-Length');
-        if (null !== $contentLength && (is_int($contentLength) || ctype_digit($contentLength))) {
+        if (null !== $contentLength && ctype_digit($contentLength)) {
             return stream_get_contents($body, (int) $contentLength);
         }
 

lib/Sapi.php

@@ -86,7 +86,7 @@ public static function sendResponse(ResponseInterface $response): void
         $contentLength = $response->getHeader('Content-Length');
         if (null !== $contentLength) {
             $output = fopen('php://output', 'wb');
-            if (is_resource($body) && 'stream' == get_resource_type($body)) {
+            if (is_resource($body) && 'stream' === get_resource_type($body)) {
                 // a workaround to make PHP more possible to use mmap based copy, see https://github.com/sabre-io/http/pull/119
                 $left = (int) $contentLength;
                 // copy with 4MiB chunks

phpstan-ignore-by-php-version.neon.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+$includes = [];
+if (PHP_VERSION_ID >= 80000) {
+    $includes[] = __DIR__.'/phpstan-ignore-php8.neon';
+} else {
+    $includes[] = __DIR__.'/phpstan-ignore-php74.neon';
+}
+
+$config = [];
+$config['includes'] = $includes;
+
+// overrides config.platform.php in composer.json
+$config['parameters']['phpVersion'] = PHP_VERSION_ID;
+
+return $config;

phpstan-ignore-php74.neon

@@ -0,0 +1,6 @@
+parameters:
+  ignoreErrors:
+  -
+    message: "#^Left side of || is always false.$#"
+    count: 10
+    path: lib/Client.php

phpstan-ignore-php8.neon

@@ -0,0 +1,6 @@
+parameters:
+  ignoreErrors:
+  -
+    message: "#^Left side of || is always false.$#"
+    count: 23
+    path: lib/Client.php

phpstan.neon

@@ -1,23 +1,9 @@
+includes:
+  - phpstan-ignore-by-php-version.neon.php
+
 parameters:
   level: 6
-  phpVersion: 70430 # PHP 7.4.30
   ignoreErrors:
-  -
-    message: "#^Negated boolean expression is always true.$#"
-    count: 1
-    path: lib/Client.php
-  -
-    message: "#^If condition is always false.$#"
-    count: 3
-    path: lib/Client.php
-  -
-    message: "#^Left side of || is always false.$#"
-    count: 6
-    path: lib/Client.php
-  -
-    message: "#^Else branch is unreachable because ternary operator condition is always true.$#"
-    count: 1
-    path: lib/Auth/Digest.php
   -
     message: "#^Strict comparison using !== between '' and non-empty-string will always evaluate to true.$#"
     count: 1

tests/HTTP/Auth/AWSTest.php

@@ -200,7 +200,7 @@ public function test401(): void
     {
         $this->auth->requireLogin();
         $test = preg_match('/^AWS$/', $this->response->getHeader('WWW-Authenticate'), $matches);
-        self::assertTrue(true == $test, 'The WWW-Authenticate response didn\'t match our pattern');
+        self::assertTrue(1 === $test, 'The WWW-Authenticate response didn\'t match our pattern');
     }
 
     /**

tests/HTTP/Auth/DigestTest.php

@@ -166,7 +166,7 @@ private function getServerTokens(int $qop = Digest::QOP_AUTH): array
         $test = preg_match('/Digest realm="'.self::REALM.'",qop="'.$qopstr.'",nonce="([0-9a-f]*)",opaque="([0-9a-f]*)"/',
             $this->response->getHeader('WWW-Authenticate'), $matches);
 
-        self::assertTrue(true == $test, 'The WWW-Authenticate response didn\'t match our pattern. We received: '.$this->response->getHeader('WWW-Authenticate'));
+        self::assertTrue(1 === $test, 'The WWW-Authenticate response didn\'t match our pattern. We received: '.$this->response->getHeader('WWW-Authenticate'));
 
         $nonce = $matches[1];
         $opaque = $matches[2];

tests/HTTP/RequestTest.php

@@ -35,7 +35,7 @@ public function testGetQueryParametersNoData(): void
     }
 
     /**
-     * @backupGlobals
+     * @backupGlobals enabled
      */
     public function testCreateFromPHPRequest(): void
     {