Merge pull request #21 from square/catch-another

More graceful fallback handling
square · Jan 18, 2023 · 0750f3a · 0750f3a
2 parents 31d75ed + 60c781d
commit 0750f3a
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Store/TaggedStore.php b/src/Store/TaggedStore.php
@@ -115,14 +115,19 @@ public function getMultiple(array $keys) : StoreResult
                 unset($r[$k]);
                 continue;
             }
-            $allTags = array_merge($allTags, array_keys($tv->tags));
+            $allTags[] = array_keys($tv->tags);
         }
+        $allTags = array_merge(...$allTags);
 
         $allCurrentTagHashes = [];
         if (!empty($allTags)) {
-            $allCurrentTagHashes = $this->cache->getMultiple($allTags);
-            if ($allCurrentTagHashes instanceof Iterator) {
-                $allCurrentTagHashes = iterator_to_array($allCurrentTagHashes);
+            try {
+                $allCurrentTagHashes = $this->cache->getMultiple($allTags);
+                if ($allCurrentTagHashes instanceof Iterator) {
+                    $allCurrentTagHashes = iterator_to_array($allCurrentTagHashes);
+                }
+            } catch (CacheException | SimpleCacheCacheException $e) {
+                return new StoreResult([], $e);
             }
         }