phpstan level 4

Author: dbu

.github/workflows/static.yml

@@ -8,15 +8,15 @@ on:
 
 jobs:
   phpstan-src:
-    name: PHPStan src
+    name: PHPStan
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Pull in optional dependencies
-        run: composer require --no-update phpunit/phpunit toflar/psr6-symfony-http-cache-store:^4.2 symfony/process phpstan/phpstan-mockery
+        run: composer require --no-update phpunit/phpunit toflar/psr6-symfony-http-cache-store:^4.2 symfony/process mockery/mockery phpstan/phpstan-mockery guzzlehttp/guzzle php-http/mock-client
 
       - name: Cache Vendor
         id: cache-vendor

phpstan.neon.dist

@@ -4,5 +4,4 @@ parameters:
         - src
         - tests
 
-includes:
-    - vendor/phpstan/phpstan-mockery/extension.neon
+    treatPhpDocTypesAsCertain: false

src/ProxyClient/MultiplexerClient.php

@@ -133,7 +133,7 @@ public function clear(): static
      * Invoke the given $method on all available ProxyClients implementing the
      * given $interface.
      *
-     * @param string       $interface The FQN of the interface
+     * @param class-string $interface The FQN of the interface
      * @param string       $method    The method to invoke
      * @param array<mixed> $arguments The arguments to be passed to the method
      */
@@ -155,7 +155,9 @@ private function getProxyClients(string $interface): array
     {
         return array_filter(
             $this->proxyClients,
-            static function ($proxyClient) use ($interface) {
+            static function (ProxyClient $proxyClient) use ($interface) {
+                // https://github.com/phpstan/phpstan/issues/8464
+                // @phpstan-ignore-next-line
                 return is_subclass_of($proxyClient, $interface);
             }
         );

src/Test/WebServerSubscriber.php

@@ -11,7 +11,6 @@
 
 namespace FOS\HttpCache\Test;
 
-use PHPUnit\Event\Code\TestMethod;
 use PHPUnit\Event\TestRunner\ExecutionStarted;
 use PHPUnit\Event\TestRunner\ExecutionStartedSubscriber;
 use PHPUnit\Event\TestSuite\TestSuite;
@@ -52,8 +51,6 @@ private function hasTestsWithGroup(TestSuite $testSuite, string $group): bool
                 continue;
             }
 
-            assert($test instanceof TestMethod);
-
             foreach ($test->metadata()->isGroup() as $testGroup) {
                 assert($testGroup instanceof Group);
 

tests/Functional/ProxyClient/NginxProxyClientTest.php

@@ -35,7 +35,7 @@ public function testPurgeContentType(): void
     {
         $this->markTestSkipped('Not working with nginx, it can only purge one type');
 
-        $this->assertPurgeContentType($this->getProxyClient());
+        // $this->assertPurgeContentType($this->getProxyClient());
     }
 
     public function testPurgeSeparateLocationHost(): void
@@ -57,6 +57,6 @@ public function testRefreshContentType(): void
     {
         $this->markTestSkipped('TODO: is nginx mixing up variants?');
 
-        $this->assertRefreshContentType($this->getProxyClient());
+        // $this->assertRefreshContentType($this->getProxyClient());
     }
 }

tests/Unit/SymfonyCache/CacheAwareTest.php

@@ -14,7 +14,7 @@
 use FOS\HttpCache\SymfonyCache\HttpCacheAware;
 use FOS\HttpCache\SymfonyCache\HttpCacheProvider;
 use PHPUnit\Framework\TestCase;
-    use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class CacheAwareTest extends TestCase
 {

tests/Unit/SymfonyCache/KernelDispatcherTest.php

@@ -33,8 +33,7 @@ public function testFlush(): void
             ->with($this->callback(function (Request $request) {
                 // Test if the Symfony request contains the relevant information
                 // from the PSR-7 request
-                $valid = true;
-                $valid = $valid && 'PURGETAGS' === $request->getMethod();
+                $valid = 'PURGETAGS' === $request->getMethod();
                 $valid = $valid && 'foobar' === $request->headers->get('content-type');
                 $valid = $valid && 'foo,bar,stuff' === $request->headers->get('x-cache-tags');
                 $valid = $valid && ['query' => 'string', 'more' => 'stuff'] === $request->query->all();

tests/Unit/SymfonyCache/PurgeListenerTest.php

@@ -188,7 +188,7 @@ public function testInvalidConfiguration(): void
     private function getKernelMock(StoreInterface $store): MockInterface&CacheInvalidation
     {
         // https://github.com/phpstan/phpstan-mockery/issues/8
-        /** @phpstan-ignore-next-line */
+        /* @phpstan-ignore-next-line */
         return \Mockery::mock(CacheInvalidation::class)
             ->shouldReceive('getStore')
             ->once()
@@ -199,7 +199,7 @@ private function getKernelMock(StoreInterface $store): MockInterface&CacheInvali
     private function getUnusedKernelMock(): CacheInvalidation&MockInterface
     {
         // https://github.com/phpstan/phpstan-mockery/issues/8
-        /** @phpstan-ignore-next-line */
+        /* @phpstan-ignore-next-line */
         return \Mockery::mock(CacheInvalidation::class)
             ->shouldNotReceive('getStore')
             ->getMock();

tests/Unit/SymfonyCache/PurgeTagsListenerTest.php

@@ -181,7 +181,7 @@ public function testInvalidConfiguration(): void
     private function getKernelMock(StoreInterface $store): CacheInvalidation&MockInterface
     {
         // https://github.com/phpstan/phpstan-mockery/issues/8
-        /** @phpstan-ignore-next-line */
+        /* @phpstan-ignore-next-line */
         return \Mockery::mock(CacheInvalidation::class)
             ->shouldReceive('getStore')
             ->once()
@@ -192,7 +192,7 @@ private function getKernelMock(StoreInterface $store): CacheInvalidation&MockInt
     private function getUnusedKernelMock(): CacheInvalidation&MockInterface
     {
         // https://github.com/phpstan/phpstan-mockery/issues/8
-        /** @phpstan-ignore-next-line */
+        /* @phpstan-ignore-next-line */
         return \Mockery::mock(CacheInvalidation::class)
             ->shouldNotReceive('getStore')
             ->getMock();