Soothe phpstan

Author: koriym

dump.rdb

@@ -23,12 +23,12 @@ public function depends(ResourceObject $from, ResourceObject $to): void
     {
         assert(! isset($from->headers[Header::SURROGATE_KEY]));
 
-        $cacheDepedencyTags = ($this->uriTag)($to->uri);
+        $cacheDependencyTags = ($this->uriTag)($to->uri);
         if (isset($to->headers[Header::SURROGATE_KEY])) {
-            $cacheDepedencyTags .= sprintf(' %s', $to->headers[Header::SURROGATE_KEY]);
+            $cacheDependencyTags .= sprintf(' %s', $to->headers[Header::SURROGATE_KEY]);
             unset($to->headers[Header::SURROGATE_KEY]);
         }
 
-        $from->headers[Header::SURROGATE_KEY] = $cacheDepedencyTags;
+        $from->headers[Header::SURROGATE_KEY] = $cacheDependencyTags;
     }
 }

src/CacheDependency.php

@@ -74,14 +74,19 @@ private function getServerKey(string $key): string
      */
     private function getEtag(array $server): ?string
     {
-        $hasRequestHeaderInCli = isset($server['argc']) && $server['argc'] === 4 && isset($server['argv'][3]);
+        /** @psalm-suppress MixedAssignment */
+        $arg3 = $server['argv'][3] ?? ''; // @phpstan-ignore-line
+        assert(is_string($arg3));
+        $hasRequestHeaderInCli = isset($server['argc']) && $server['argc'] === 4 && $arg3;
         if ($hasRequestHeaderInCli) {
             /** @psalm-suppress MixedArrayAccess */
-            $server = $this->getServer((string) $server['argv'][3]);
+            $server = $this->getServer($arg3);
         }
 
-        $hasValidEtag = isset($server[Header::HTTP_IF_NONE_MATCH]) && is_string($server[Header::HTTP_IF_NONE_MATCH]);
+        if (isset($server[Header::HTTP_IF_NONE_MATCH]) && is_string($server[Header::HTTP_IF_NONE_MATCH])) {
+            return $server[Header::HTTP_IF_NONE_MATCH];
+        }
 
-        return $hasValidEtag ? $server[Header::HTTP_IF_NONE_MATCH] : null;
+        return null;
     }
 }

src/CliHttpCache.php

@@ -12,7 +12,6 @@
 use Doctrine\Common\Annotations\Reader;
 use ReflectionClass;
 
-use function assert;
 use function get_class;
 use function is_array;
 use function sprintf;
@@ -126,14 +125,14 @@ private function getExpiryTime(ResourceObject $ro, ?Cacheable $cacheable = null)
 
     private function getExpiryAtSec(ResourceObject $ro, Cacheable $cacheable): int
     {
-        if (! isset($ro->body[$cacheable->expiryAt])) {
+        if (! is_array($ro->body) || ! isset($ro->body[$cacheable->expiryAt])) {
             $msg = sprintf('%s::%s', get_class($ro), $cacheable->expiryAt);
 
             throw new ExpireAtKeyNotExists($msg);
         }
 
-        assert(is_array($ro->body));
-        $expiryAt = (string) $ro->body[$cacheable->expiryAt];
+        /** @var string $expiryAt */
+        $expiryAt = $ro->body[$cacheable->expiryAt];
 
         return strtotime($expiryAt) - time();
     }

src/QueryRepository.php

@@ -28,7 +28,7 @@ public function log(string $template, ...$values): void
         }
 
         unset($value);
-        /** @psalm-suppress MixedArgument */
+        /** @var list<string> $values */
         $msg = sprintf($template, ...$values);
 
         $this->logs[] = $msg;

src/RepositoryLogger.php

@@ -9,6 +9,8 @@
 use BEAR\Resource\ResourceObject;
 
 use function array_key_exists;
+use function assert;
+use function is_iterable;
 use function preg_replace_callback;
 
 /**
@@ -72,6 +74,7 @@ public function render(ResourceObject $ro, DonutRenderer $storage): ResourceObje
 
     public static function create(ResourceObject $ro, DonutRenderer $storage, SurrogateKeys $etags, ?int $ttl, bool $isCacheble): self
     {
+        assert(is_iterable($ro->body));
         /** @var mixed $maybeRequest */
         foreach ($ro->body as &$maybeRequest) {
             if ($maybeRequest instanceof AbstractRequest) {

src/ResourceDonut.php

@@ -29,11 +29,6 @@
 
 final class ResourceStorage implements ResourceStorageInterface
 {
-    /**
-     * ETag URI table prefix
-     */
-    private const KEY_ETAG_TABLE = 'etag-t';
-
     /**
      * Resource object cache prefix
      */

src/ResourceStorage.php

@@ -42,6 +42,6 @@ public function serialize()
      */
     public function unserialize($data)
     {
-        call_user_func_array([$this, '__construct'], unserialize($data));
+        call_user_func_array([$this, '__construct'], unserialize($data)); // @phpstan-ignore-line
     }
 }

src/SerializableTagAwareAdapter.php

@@ -18,7 +18,7 @@ class CacheDependencyTest extends TestCase
     /** @var ResourceInterface */
     private $resource;
 
-    /** @var QueryRepository */
+    /** @var QueryRepositoryInterface */
     private $repository;
 
     /** @var ResourceStorageInterface */

tests/CacheDependencyTest.php

@@ -15,7 +15,7 @@ public function testNew(): void
         $version = '1';
         $module = new CacheVersionModule($version);
         $injector = new Injector($module, $_ENV['TMP_DIR']);
-        $ns = $injector->getInstance('', CacheNamespace::class);
+        $ns = $injector->getInstance('', CacheNamespace::class); // @phpstan-ignore-line
         $this->assertSame($version, $ns);
     }
 }