ci: run PHPStan across supported PHP and OS versions

Match PHPUnit's 20-job PHP and operating system matrix. Require PHPStan
from the root Composer development dependencies with ^1.4.10 || ^2.1,
and remove the separate tools project.

Keep maximum-level analysis compatible with PHPStan 1.4, 1.12 and 2 by
making parser and queue invariants explicit and handling the
version-dependent crypto bitmask signature in configuration.

Author: shuvroroy

.gitattributes

@@ -6,4 +6,3 @@
 /phpunit.xml.legacy export-ignore
 /phpstan.neon.dist export-ignore
 /tests/ export-ignore
-/tools/ export-ignore

.github/workflows/ci.yml

@@ -6,17 +6,31 @@ on:
 
 jobs:
   PHPStan:
-    name: PHPStan
-    runs-on: ubuntu-24.04
+    name: PHPStan (PHP ${{ matrix.php }} on ${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-24.04
+        php:
+          - 8.5
+          - 8.4
+          - 8.3
+          - 8.2
+          - 8.1
+          - 8.0
+          - 7.4
+          - 7.3
+          - 7.2
+          - 7.1
     steps:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.5'
+          php-version: ${{ matrix.php }}
           coverage: none
       - run: composer install
-      - run: composer install --working-dir=tools/phpstan
-      - run: tools/phpstan/vendor/bin/phpstan analyse --no-progress
+      - run: vendor/bin/phpstan analyse --no-progress
 
   PHPUnit:
     name: PHPUnit (PHP ${{ matrix.php }} on ${{ matrix.os }})

.gitignore

@@ -1,4 +1,2 @@
 /composer.lock
 /vendor/
-/tools/phpstan/composer.lock
-/tools/phpstan/vendor/

README.md

@@ -1533,15 +1533,16 @@ If you do not want to run these, they can simply be skipped like this:
 vendor/bin/phpunit --exclude-group internet
 ```
 
-To check the source code with PHPStan at its maximum level, use PHP 7.4+ and run:
+To check the source code with PHPStan at its maximum level, run:
 
 ```bash
-composer install --working-dir=tools/phpstan
-tools/phpstan/vendor/bin/phpstan analyse
+vendor/bin/phpstan analyse
 ```
 
-PHPStan is installed separately so the library and its test suite continue to
-support PHP 7.1. The analysis targets this minimum supported PHP version.
+Composer installs a PHPStan release compatible with your PHP version:
+PHPStan 1.4 on PHP 7.1, PHPStan 1.12 on PHP 7.2–7.3, and PHPStan 2
+on PHP 7.4+. Each runs at its maximum level and analyses compatibility with PHP 7.1.
+CI runs this check on the same PHP and operating system matrix as PHPUnit.
 
 ## License
 

composer.json

@@ -34,6 +34,7 @@
         "react/stream": "^1.4"
     },
     "require-dev": {
+        "phpstan/phpstan": "^1.4.10 || ^2.1",
         "phpunit/phpunit": "^9.6 || ^8.5 || ^7.5",
         "react/async": "^4.3 || ^3",
         "react/promise-stream": "^1.4",

phpstan.neon.dist

@@ -5,3 +5,10 @@ parameters:
     phpVersion: 70100
     # Retain runtime guards for older supported Promise implementations.
     treatPhpDocTypesAsCertain: false
+    # The crypto bitmask signature is already correct in older PHPStan releases.
+    reportUnmatchedIgnoredErrors: false
+    ignoreErrors:
+        # PHP accepts combined crypto flags; some PHPStan versions only list individual constants.
+        -
+            message: '#^Parameter \#3 \$crypto_method of function stream_socket_enable_crypto expects .+, int given\.$#'
+            path: src/StreamEncryption.php

src/DnsConnector.php

@@ -26,7 +26,7 @@ public function connect(string $uri): PromiseInterface
         if (\strpos($uri, '://') === false) {
             $uri = 'tcp://' . $uri;
             $parts = \parse_url($uri);
-            if (isset($parts['scheme'])) {
+            if ($parts !== false && isset($parts['scheme'])) {
                 unset($parts['scheme']);
             }
         } else {

src/HappyEyeBallsConnectionBuilder.php

@@ -276,14 +276,14 @@ public function cleanUp(): void
 
         // cancel pending connection attempts
         foreach ($this->connectionPromises as $connectionPromise) {
-            if ($connectionPromise instanceof PromiseInterface && \is_callable([$connectionPromise, 'cancel'])) {
+            if (\is_callable([$connectionPromise, 'cancel'])) {
                 $connectionPromise->cancel();
             }
         }
 
         // cancel pending DNS resolution (cancel IPv4 first in case it is awaiting IPv6 resolution delay)
         foreach (\array_reverse($this->resolverPromises) as $resolverPromise) {
-            if ($resolverPromise instanceof PromiseInterface && \is_callable([$resolverPromise, 'cancel'])) {
+            if (\is_callable([$resolverPromise, 'cancel'])) {
                 $resolverPromise->cancel();
             }
         }
@@ -324,12 +324,16 @@ public function mixIpsIntoConnectQueue(array $ips): void
         $this->ipsCount += \count($ips);
         $connectQueueStash = $this->connectQueue;
         $this->connectQueue = [];
-        while (\count($connectQueueStash) > 0 || \count($ips) > 0) {
-            if (\count($ips) > 0) {
-                $this->connectQueue[] = \array_shift($ips);
+        while ($connectQueueStash || $ips) {
+            if ($ips) {
+                $ip = \array_shift($ips);
+                assert($ip !== null);
+                $this->connectQueue[] = $ip;
             }
-            if (\count($connectQueueStash) > 0) {
-                $this->connectQueue[] = \array_shift($connectQueueStash);
+            if ($connectQueueStash) {
+                $ip = \array_shift($connectQueueStash);
+                assert($ip !== null);
+                $this->connectQueue[] = $ip;
             }
         }
     }

src/HappyEyeBallsConnector.php

@@ -30,7 +30,7 @@ public function connect(string $uri): PromiseInterface
         if (\strpos($uri, '://') === false) {
             $uri = 'tcp://' . $uri;
             $parts = \parse_url($uri);
-            if (isset($parts['scheme'])) {
+            if ($parts !== false && isset($parts['scheme'])) {
                 unset($parts['scheme']);
             }
         } else {

src/StreamEncryption.php

@@ -125,8 +125,7 @@ public function toggleCrypto($socket, Deferred $deferred, bool $toggle, int $met
             return true;
         });
 
-        // PHP accepts bitwise combinations of crypto methods; PHPStan only lists individual constants and a few masks.
-        $result = \stream_socket_enable_crypto($socket, $toggle, $method); // @phpstan-ignore argument.type
+        $result = \stream_socket_enable_crypto($socket, $toggle, $method);
 
         \restore_error_handler();