simplepie · Alkarex · Sep 14, 2025 · Sep 14, 2025 · Sep 14, 2025 · Sep 14, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -68,6 +68,10 @@ jobs:
           coverage: none
           tools: none
 
+      - name: Remove PHPStan for incompatible PHP versions
+        if: ${{ matrix.php < '8.0' }}
+        run: composer remove --dev phpstan/phpstan phpstan/phpstan-phpunit
+
       # Install dependencies and handle caching in one go.
       # @link https://github.com/marketplace/actions/install-composer-dependencies
       - name: "Install Composer dependencies"
@@ -82,7 +86,9 @@ jobs:
       - name: Run unit tests
         run: composer test
 
+      # It would be sufficient to run PHPStan with one supported PHP version
       - name: Run static analysis
+        if: ${{ matrix.php >= '8.0' }}
         run: composer phpstan -- --error-format=github
 
   test-compiled:

diff --git a/composer.json b/composer.json
@@ -33,8 +33,9 @@
         "donatj/mock-webserver": "^2.7",
         "friendsofphp/php-cs-fixer": "^2.19 || ^3.8",
         "mf2/mf2": "^0.5.0",
-        "phpstan/phpstan": "~1.12.2",
-        "phpunit/phpunit": "^8 || ^9 || ^10",
+        "phpstan/phpstan": "~2.1.25",
+        "phpstan/phpstan-phpunit": "~2.0.7",
+        "phpunit/phpunit": "^8 || ^9",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/simple-cache": "^1 || ^2 || ^3"
@@ -69,7 +70,7 @@
         "coverage": "phpunit --coverage-html=.phpunit.cache/code-coverage",
         "cs": "php-cs-fixer fix --verbose --dry-run --diff",
         "fix": "php-cs-fixer fix --verbose --diff",
-        "phpstan": "phpstan analyze --memory-limit 512M",
+        "phpstan": "phpstan analyse --memory-limit 512M",
         "test": "phpunit"
     }
 }
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
@@ -1,4 +1,8 @@
 parameters:
+    phpVersion:
+        min: 70200 # PHP 7.2
+        max: 80599 # PHP 8.5
+
     level: 8
 
     paths:
@@ -7,54 +11,15 @@ parameters:
         - tests/
         - utils/
 
-    ignoreErrors:
-        # Ignore that only one const exists atm
-        -
-            message: "#^Strict comparison using \\!\\=\\= between 'GET' and 'GET' will always evaluate to false\\.$#"
-            count: 1
-            path: src/HTTP/Psr18Client.php
-
-        # Not used since https://github.com/simplepie/simplepie/commit/b2eb0134d53921e75f0fa70b1cf901ed82b988b1 but cannot be removed due to BC.
-        - '(Constructor of class SimplePie\\Enclosure has an unused parameter \$javascript\.)'
-
-        # Testing legacy dynamic property usage.
-        - '(Access to an undefined property SimplePie.IRI::\$nonexistent_prop\.)'
-
-        -
-            message: '(^Strict comparison using === between string and false will always evaluate to false\.$)'
-            count: 1
-            path: src/HTTP/Parser.php
-            # Only occurs on PHP ≥ 8.0
-            reportUnmatched: false
-
-        -
-            message: '(^Strict comparison using === between string and false will always evaluate to false\.$)'
-            count: 1
-            path: src/IRI.php
-            # Only occurs on PHP ≥ 8.0
-            reportUnmatched: false
-
-        -
-            message: '(^Parameter #1 \$exception of method PHPUnit\\Framework\\TestCase::expectException\(\) expects class-string<Throwable>, string given\.$)'
-
-            count: 3
-            path: tests/Unit/Cache/Psr16Test.php
-            # Only occurs on PHP ≤ 7.4
-            reportUnmatched: false
-
-        -
-            message: '(^Parameter \$parser of method SimplePie\\Parser::(tag_open|cdata|tag_close)\(\) has invalid type XMLParser\.$)'
-
-            count: 3
-            path: src/Parser.php
-            # Only occurs on PHP ≤ 7.4
-            reportUnmatched: false
+    excludePaths:
+        analyseAndScan:
+            - .git/*?
+            - build/*?
+            - vendor/*
 
-        # PHPStan stubs bug https://github.com/phpstan/phpstan/issues/8629
-        -
-            message: '(^Access to an undefined property XMLReader::\$\w+\.$)'
-            # Only occurs on PHP ≥ 8.2
-            reportUnmatched: false
+    treatPhpDocTypesAsCertain: false # TODO: Fix
 
 includes:
     - utils/PHPStan/extension.neon
+    - vendor/phpstan/phpstan-phpunit/extension.neon
+    - vendor/phpstan/phpstan-phpunit/rules.neon
diff --git a/src/Cache/Psr16.php b/src/Cache/Psr16.php
@@ -83,6 +83,7 @@ public function get_data(string $key, $default = null)
      */
     public function set_data(string $key, array $value, ?int $ttl = null): bool
     {
+        // @phpstan-ignore argument.type (mixed is not supported by PHP < 8.0, used by psr/simple-cache >= 2)
         return $this->cache->set($key, $value, $ttl);
     }
 

diff --git a/src/Enclosure.php b/src/Enclosure.php
@@ -195,6 +195,7 @@ class Enclosure
      * @param Rating[]|null $ratings
      * @param Restriction[]|null $restrictions
      * @param string[]|null $thumbnails
+     * @phpstan-ignore constructor.unusedParameter
      */
     public function __construct(
         ?string $link = null,

diff --git a/src/HTTP/FileClient.php b/src/HTTP/FileClient.php
@@ -45,7 +45,6 @@ public function __construct(Registry $registry, array $options = [])
      */
     public function request(string $method, string $url, array $headers = []): Response
     {
-        // @phpstan-ignore-next-line Enforce PHPDoc type.
         if ($method !== self::METHOD_GET) {
             throw new InvalidArgumentException(sprintf(
                 '%s(): Argument #1 ($method) only supports method "%s".',

diff --git a/src/Parser.php b/src/Parser.php
@@ -89,28 +89,34 @@ public function parse(string &$data, string $encoding, string $url = '')
         // Strip BOM:
         // UTF-32 Big Endian BOM
         if (substr($data, 0, 4) === "\x00\x00\xFE\xFF") {
+            /** @phpstan-ignore parameterByRef.type (for PHP < 8.0) */
             $data = substr($data, 4);
         }
         // UTF-32 Little Endian BOM
         elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00") {
+            /** @phpstan-ignore parameterByRef.type (for PHP < 8.0) */
             $data = substr($data, 4);
         }
         // UTF-16 Big Endian BOM
         elseif (substr($data, 0, 2) === "\xFE\xFF") {
+            /** @phpstan-ignore parameterByRef.type (for PHP < 8.0) */
             $data = substr($data, 2);
         }
         // UTF-16 Little Endian BOM
         elseif (substr($data, 0, 2) === "\xFF\xFE") {
+            /** @phpstan-ignore parameterByRef.type (for PHP < 8.0) */
             $data = substr($data, 2);
         }
         // UTF-8 BOM
         elseif (substr($data, 0, 3) === "\xEF\xBB\xBF") {
+            /** @phpstan-ignore parameterByRef.type (for PHP < 8.0) */
             $data = substr($data, 3);
         }
 
         if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false) {
             $declaration = $this->registry->create(DeclarationParser::class, [substr($data, 5, $pos - 5)]);
             if ($declaration->parse()) {
+                /** @phpstan-ignore parameterByRef.type (for PHP < 8.0) */
                 $data = substr($data, $pos + 2);
                 $data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . "\n" .
                     self::set_doctype($data);
@@ -276,6 +282,7 @@ public function get_data()
      * @param XMLParser|resource|null $parser
      * @param array<string, string> $attributes
      * @return void
+     * @phpstan-ignore class.notFound (XMLParser requires PHP >= 8.0)
      */
     public function tag_open($parser, string $tag, array $attributes)
     {
@@ -332,6 +339,7 @@ public function tag_open($parser, string $tag, array $attributes)
     /**
      * @param XMLParser|resource|null $parser
      * @return void
+     * @phpstan-ignore class.notFound (XMLParser requires PHP >= 8.0)
      */
     public function cdata($parser, string $cdata)
     {
@@ -345,6 +353,7 @@ public function cdata($parser, string $cdata)
     /**
      * @param XMLParser|resource|null $parser
      * @return void
+     * @phpstan-ignore class.notFound (XMLParser requires PHP >= 8.0)
      */
     public function tag_close($parser, string $tag)
     {

diff --git a/src/Registry.php b/src/Registry.php
@@ -206,6 +206,7 @@ public function &create($type, array $parameters = [])
             $instance->set_registry($this);
         } elseif (method_exists($instance, 'set_registry')) {
             trigger_error(sprintf('Using the method "set_registry()" without implementing "%s" is deprecated since SimplePie 1.8.0, implement "%s" in "%s".', RegistryAware::class, RegistryAware::class, $class), \E_USER_DEPRECATED);
+            // @phpstan-ignore method.nonObject
             $instance->set_registry($this);
         }
 

diff --git a/src/Sanitize.php b/src/Sanitize.php
@@ -156,7 +156,6 @@ public function pass_cache_data(bool $enable_cache = true, string $cache_locatio
             $this->cache_location = $cache_location;
         }
 
-        // @phpstan-ignore-next-line Enforce PHPDoc type.
         if (!is_string($cache_name_function) && !$cache_name_function instanceof NameFilter) {
             throw new InvalidArgumentException(sprintf(
                 '%s(): Argument #3 ($cache_name_function) must be of type %s',

diff --git a/src/SimplePie.php b/src/SimplePie.php
@@ -1864,7 +1864,6 @@ protected function fetch_data(&$cache)
             $cache = new BaseDataCache($cache);
         }
 
-        // @phpstan-ignore-next-line Enforce PHPDoc type.
         if ($cache !== false && !$cache instanceof DataCache) {
             throw new InvalidArgumentException(sprintf(
                 '%s(): Argument #1 ($cache) must be of type %s|false',
@@ -3374,8 +3373,6 @@ public static function merge_items(array $urls, int $start = 0, int $end = 0, in
             foreach ($urls as $arg) {
                 if ($arg instanceof SimplePie) {
                     $items = array_merge($items, $arg->get_items(0, $limit));
-
-                    // @phpstan-ignore-next-line Enforce PHPDoc type.
                 } else {
                     trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
                 }

diff --git a/tests/Integration/HTTP/ClientsTest.php b/tests/Integration/HTTP/ClientsTest.php
@@ -47,6 +47,7 @@ private function runTestsWithClientGetContentOfLocalFile(Client $client): void
 
         $response = $client->request(Client::METHOD_GET, $filepath);
 
+        // @phpstan-ignore staticMethod.alreadyNarrowedType
         self::assertInstanceOf(Response::class, $response);
         self::assertSame($filepath, $response->get_permanent_uri());
         self::assertSame($filepath, $response->get_final_requested_uri());

diff --git a/tests/Integration/SimplePieTest.php b/tests/Integration/SimplePieTest.php
@@ -330,6 +330,7 @@ public function testMicroformatItems(string $path, string $feedTitle, array $tit
 
         self::assertSame($feedTitle, $feed->get_title());
         $items = $feed->get_items();
+        // @phpstan-ignore phpunit.assertCount
         self::assertSame(count($titles), count($items), 'Number of items does not match');
         foreach (array_map(null, $titles, $items) as $i => [$expectedTitle, $item]) {
             assert($item !== null); // For PHPStan

diff --git a/tests/Unit/FileTest.php b/tests/Unit/FileTest.php
@@ -26,6 +26,7 @@ public function testClassExists(): void
 
     public function testFileExtendsResponse(): void
     {
+        // @phpstan-ignore staticMethod.alreadyNarrowedType
         self::assertInstanceOf(Response::class, new FileMock(''));
     }
 

diff --git a/tests/Unit/HTTP/Psr18ClientTest.php b/tests/Unit/HTTP/Psr18ClientTest.php
@@ -27,6 +27,7 @@ public function testRequestReturnsResponse(): void
             $this->createMock(UriFactoryInterface::class)
         );
 
+        // @phpstan-ignore staticMethod.alreadyNarrowedType
         self::assertInstanceOf(Response::class, $client->request(Client::METHOD_GET, 'https://example.com/feed.xml'));
     }
 

diff --git a/tests/Unit/HTTP/Psr7ResponseTest.php b/tests/Unit/HTTP/Psr7ResponseTest.php
@@ -17,6 +17,7 @@ class Psr7ResponseTest extends TestCase
 {
     public function testPsr7ResponseExtendsResponse(): void
     {
+        // @phpstan-ignore staticMethod.alreadyNarrowedType
         self::assertInstanceOf(Response::class, new Psr7Response($this->createMock(ResponseInterface::class), '', ''));
     }
 

diff --git a/tests/Unit/IRITest.php b/tests/Unit/IRITest.php
@@ -483,6 +483,7 @@ function ($errno, $errstr): bool {
             E_USER_NOTICE
         );
 
+        // @phpstan-ignore property.notFound (we want to test that it fails)
         $should_fail = $iri->nonexistent_prop;
     }
 

diff --git a/utils/PHPStan/RegistryCallMethodReturnTypeExtension.php b/utils/PHPStan/RegistryCallMethodReturnTypeExtension.php
@@ -59,7 +59,10 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
         $classType = $scope->getType($classNameArg);
         $methodType = $scope->getType($methodNameArg);
 
-        if (!$classType  instanceof ConstantStringType || !$methodType instanceof ConstantStringType) {
+        if (
+            !$classType  instanceof ConstantStringType || // @phpstan-ignore phpstanApi.instanceofType
+            !$methodType instanceof ConstantStringType // @phpstan-ignore phpstanApi.instanceofType
+        ) {
             return new MixedType();
         }
 
@@ -81,9 +84,9 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
         if ($argumentsArg !== null) {
             $argumentsType = $scope->getType($argumentsArg);
 
-            if ($argumentsType instanceof ConstantArrayType) {
+            if ($argumentsType instanceof ConstantArrayType) { // @phpstan-ignore phpstanApi.instanceofType
                 $argumentTypes = $argumentsType->getValueTypes();
-            } elseif ($argumentsType instanceof ArrayType) {
+            } elseif ($argumentsType instanceof ArrayType) { // @phpstan-ignore phpstanApi.instanceofType
                 $argumentTypes = [$argumentsType->getItemType()];
             } else {
                 return new MixedType();
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,6 +83,7 @@ public function get_data(string $key, $default = null) @@
          */
         public function set_data(string $key, array $value, ?int $ttl = null): bool
         {
+            // @phpstan-ignore argument.type (mixed is not supported by PHP < 8.0, used by psr/simple-cache >= 2)
             return $this->cache->set($key, $value, $ttl);
         }
@@ Expand Down @@