qa: fix psalm issues

Signed-off-by: Maximilian Bösing <[email protected]>

psalm-baseline.xml

@@ -284,19 +284,18 @@
       <code>validateKeys</code>
       <code>validateStorage</code>
     </MissingReturnType>
-    <MixedAssignment occurrences="4">
+    <MixedAssignment occurrences="3">
       <code>$cleared</code>
       <code>$key</code>
       <code>$value</code>
-      <code>$value</code>
     </MixedAssignment>
     <MixedInferredReturnType occurrences="6">
+      <code>array&lt;string,CacheItem&gt;</code>
       <code>clear</code>
       <code>deleteItems</code>
       <code>getItem</code>
       <code>getItems</code>
       <code>hasItem</code>
-      <code>save</code>
     </MixedInferredReturnType>
     <RedundantConditionGivenDocblockType occurrences="1">
       <code>null !== $this-&gt;storage-&gt;removeItems($keys)</code>
@@ -1145,8 +1144,7 @@
     <MixedArgumentTypeCoercion occurrences="1">
       <code>$capabilities ?? $this-&gt;defaultCapabilities</code>
     </MixedArgumentTypeCoercion>
-    <MixedAssignment occurrences="4">
-      <code>$counter</code>
+    <MixedAssignment occurrences="3">
       <code>$item</code>
       <code>$item</code>
       <code>$item</code>
@@ -1167,9 +1165,6 @@
       <code>isHit</code>
       <code>set</code>
     </MixedMethodCall>
-    <MixedOperand occurrences="1">
-      <code>$counter</code>
-    </MixedOperand>
     <PossiblyInvalidArgument occurrences="1">
       <code>$items</code>
     </PossiblyInvalidArgument>
@@ -1192,18 +1187,6 @@
       <code>[]</code>
     </InvalidArgument>
   </file>
-  <file src="test/Psr/CacheItemPool/TestAsset/StorageAdapter.php">
-    <InvalidReturnType occurrences="5">
-      <code>clearByNamespace</code>
-      <code>flush</code>
-      <code>internalGetItem</code>
-      <code>internalRemoveItem</code>
-      <code>internalSetItem</code>
-    </InvalidReturnType>
-    <PropertyNotSetInConstructor occurrences="1">
-      <code>StorageAdapter</code>
-    </PropertyNotSetInConstructor>
-  </file>
   <file src="test/Psr/SimpleCache/SimpleCacheDecoratorTest.php">
     <MissingReturnType occurrences="9">
       <code>testHasProxiesToStorage</code>

src/Psr/CacheItemPool/CacheItemPoolDecorator.php

@@ -20,14 +20,15 @@
 use function array_diff_key;
 use function array_flip;
 use function array_keys;
-use function array_map;
 use function array_merge;
 use function array_unique;
-use function array_walk;
+use function array_values;
+use function assert;
 use function current;
 use function get_class;
 use function gettype;
 use function in_array;
+use function is_bool;
 use function is_string;
 use function preg_match;
 use function sprintf;
@@ -46,7 +47,7 @@ class CacheItemPoolDecorator implements CacheItemPoolInterface
     /** @var StorageInterface */
     private $storage;
 
-    /** @var CacheItem[] */
+    /** @var array<string,CacheItem> */
     private $deferred = [];
 
     /**
@@ -88,7 +89,7 @@ public function getItem($key)
                 // ignore
             }
 
-            return new CacheItem($key, $value, $isHit);
+            return new CacheItem($key, $value, $isHit ?? false);
         }
 
         return clone $this->deferred[$key];
@@ -122,8 +123,8 @@ public function getItems(array $keys = [])
             }
 
             foreach ($cacheItems as $key => $value) {
-                $isHit       = true;
-                $items[$key] = new CacheItem($key, $value, $isHit);
+                assert(is_string($key));
+                $items[$key] = new CacheItem($key, $value, true);
             }
 
             // Return empty items for any keys that where not found
@@ -180,6 +181,7 @@ public function clear()
             $cleared = false;
         }
 
+        assert(is_bool($cleared));
         return $cleared;
     }
 
@@ -244,16 +246,20 @@ public function saveDeferred(CacheItemInterface $item)
      */
     public function commit()
     {
-        /** @var array<string,non-empty-array<string,CacheItem>> $groupedByTtl */
         $groupedByTtl = [];
         foreach ($this->deferred as $cacheKey => $item) {
             $itemTtl                = var_export($item->getTtl(), true);
             $group                  = $groupedByTtl[$itemTtl] ?? [];
             $group[$cacheKey]       = $item;
-            $groupedByTtl[$itemTtl] = $group;
+            $groupedByTtl[$itemTtl] = array_values($group);
         }
 
         $notSavedItems = [];
+        /**
+         * NOTE: we are not using the array key for the TTL in here as TTL might be `null`.
+         *       Since we stringify the TTL by using `var_export`, the array has string and integer keys.
+         *       Converting a string `null` back to native null-type would be a huge mess.
+         */
         foreach ($groupedByTtl as $keyValuePairs) {
             $itemTtl         = current($keyValuePairs)->getTtl();
             $notSavedItems[] = $this->saveMultipleItems($keyValuePairs, $itemTtl);
@@ -359,33 +365,34 @@ private function validateKeys($keys)
     }
 
     /**
-     * @param array<int,CacheItem> $items
-     * @psalm-param list<CacheItem> $items
-     * @return array<string,CacheItem>
+     * @psalm-param non-empty-list<CacheItem> $items
+     * @psalm-return array<string,CacheItem>
      */
     private function saveMultipleItems(array $items, ?int $itemTtl): array
     {
+        $keyItemPair = [];
+        foreach ($items as $item) {
+            $keyItemPair[$item->getKey()] = $item;
+        }
+
         // delete expired item
         if ($itemTtl < 0) {
-            $this->deleteItems(array_map(static function (CacheItemInterface $item): string {
-                return $item->getKey();
-            }, $items));
-            array_walk($items, static function (CacheItem $cacheItem): void {
+            $this->deleteItems(array_keys($keyItemPair));
+            foreach ($keyItemPair as $cacheItem) {
                 $cacheItem->setIsHit(false);
-            });
+            }
 
-            return $items;
+            return $keyItemPair;
         }
 
         $options = $this->storage->getOptions();
         $ttl     = $options->getTtl();
 
         $keyValuePair = [];
-        $keyItemPair  = [];
         foreach ($items as $item) {
-            $key                = $item->getKey();
+            $key = $item->getKey();
+            /** @psalm-suppress MixedAssignment */
             $keyValuePair[$key] = $item->get();
-            $keyItemPair[$key]  = $item;
         }
 
         $options->setTtl($itemTtl ?? 0);
@@ -396,17 +403,15 @@ private function saveMultipleItems(array $items, ?int $itemTtl): array
         } catch (Exception\InvalidArgumentException $e) {
             throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
         } catch (Exception\ExceptionInterface $e) {
-            foreach (array_keys($keyValuePair) as $key) {
-                $notSavedKeys[] = $key;
-            }
+            $notSavedKeys = array_keys($keyValuePair);
         } finally {
             $options->setTtl($ttl);
         }
 
         $notSavedItems = [];
         foreach ($keyItemPair as $key => $item) {
             if (in_array($key, $notSavedKeys, true)) {
-                $notSavedItems[] = $item;
+                $notSavedItems[$key] = $item;
                 continue;
             }
 

test/Psr/CacheItemPool/CacheItemPoolDecoratorTest.php

@@ -615,6 +615,11 @@ public function testClearDeferred(): void
 
         $item = $adapter->getItem('foo');
         $adapter->saveDeferred($item);
+        $this->storage
+            ->expects(self::once())
+            ->method('clearByNamespace')
+            ->willReturn(true);
+
         $adapter->clear();
         self::assertFalse($adapter->hasItem('foo'));
     }
@@ -906,6 +911,11 @@ protected function tearDown(): void
         } catch (Throwable $throwable) {
             /** Cleanup deferred items as {@see CacheItemPoolDecorator::__destruct} is gonna try to store them. */
         } finally {
+            /**
+             * Suppress this as we are safe in tear down
+             *
+             * @psalm-suppress PossiblyNullPropertyAssignmentValue
+             */
             $this->adapter = null;
         }
         parent::tearDown();