phpstan level 4, merge src and tests phpstan

Author: dbu

.github/workflows/static.yml

@@ -16,7 +16,7 @@ jobs:
         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
+        run: composer require --no-update phpunit/phpunit toflar/psr6-symfony-http-cache-store:^4.2 symfony/process phpstan/phpstan-mockery
 
       - name: Cache Vendor
         id: cache-vendor
@@ -30,32 +30,6 @@ jobs:
         with:
           args: analyze --no-progress
 
-  phpstan-tests:
-    name: PHPStan tests
-    runs-on: ubuntu-latest
-    env:
-      REQUIRE_DEV: "true"
-
-    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 phpstan/phpstan-mockery
-
-
-      - name: Cache Vendor
-        id: cache-vendor
-        uses: actions/cache@v4
-        with:
-          path: vendor
-          key: ${{ runner.os }}-vendor
-
-      - name: PHPStan
-        uses: docker://oskarstark/phpstan-ga
-        with:
-          args: analyze --no-progress -c phpstan.tests.neon.dist
-
   php-cs-fixer:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest

phpstan.neon.dist

@@ -1,5 +1,8 @@
 parameters:
-    level: 3
+    level: 4
     paths:
         - src
+        - tests
 
+includes:
+    - vendor/phpstan/phpstan-mockery/extension.neon

phpstan.tests.neon.dist

@@ -81,7 +81,7 @@ public function invalidateTags(array $tags): static
             sprintf(self::API_ENDPOINT.'/zones/%s/purge_cache', $this->options['zone_identifier']),
             [],
             false,
-            $this->json_encode(['tags' => $tags])
+            json_encode(['tags' => $tags], JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES)
         );
 
         return $this;
@@ -115,7 +115,7 @@ public function clear(): static
             sprintf(self::API_ENDPOINT.'/zones/%s/purge_cache', $this->options['zone_identifier']),
             ['Accept' => 'application/json'],
             false,
-            $this->json_encode(['purge_everything' => true])
+            json_encode(['purge_everything' => true], JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES)
         );
 
         return $this;
@@ -130,7 +130,7 @@ public function flush(): int
                 sprintf(self::API_ENDPOINT.'/zones/%s/purge_cache', $this->options['zone_identifier']),
                 [],
                 false,
-                $this->json_encode(['files' => $urlChunk])
+                json_encode(['files' => $urlChunk], JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES)
             );
         }
         $this->purgeByUrlsData = [];
@@ -165,14 +165,4 @@ protected function configureOptions(): OptionsResolver
 
         return $resolver;
     }
-
-    private function json_encode(array $data): string
-    {
-        $json = json_encode($data, JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES);
-        if (false === $json) {
-            throw new \InvalidArgumentException(sprintf('Cannot encode "$data": %s', json_last_error_msg()));
-        }
-
-        return $json;
-    }
 }

src/ProxyClient/Cloudflare.php

@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the FOSHttpCache package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\HttpCache\Tests\Unit\SymfonyCache;
+
+use FOS\HttpCache\SymfonyCache\HttpCacheAware;
+use FOS\HttpCache\SymfonyCache\HttpCacheProvider;
+use PHPUnit\Framework\TestCase;
+    use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class CacheAwareTest extends TestCase
+{
+    private HttpKernelInterface $cacheKernel;
+
+    protected function setUp(): void
+    {
+        $this->cacheKernel = $this->createMock(HttpKernelInterface::class);
+    }
+
+    public function testCacheGetterSetter(): void
+    {
+        $aware = new AppHttpCacheAware();
+        $aware->setHttpCache($this->cacheKernel);
+        $this->assertSame($this->cacheKernel, $aware->getHttpCache());
+    }
+}
+
+class AppHttpCacheAware implements HttpCacheProvider
+{
+    use HttpCacheAware;
+}