Merge pull request #5834 from derrabus/improvement/cache-keys

Document tuple return type of `generateCacheKeys()`
doctrine · Dec 19, 2022 · 63e513c · 63e513c
2 parents b50fbfe + 9c02717
commit 63e513c
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/Cache/QueryCacheProfile.php b/src/Cache/QueryCacheProfile.php
@@ -113,7 +113,7 @@ public function getCacheKey()
      * @param array<int, Type|int|string|null>|array<string, Type|int|string|null> $types
      * @param array<string, mixed>                                                 $connectionParams
      *
-     * @return string[]
+     * @return array{string, string}
      */
     public function generateCacheKeys($sql, $params, $types, array $connectionParams = [])
     {
@@ -127,11 +127,7 @@ public function generateCacheKeys($sql, $params, $types, array $connectionParams
             '&connectionParams=' . hash('sha256', serialize($connectionParams));
 
         // should the key be automatically generated using the inputs or is the cache key set?
-        if ($this->cacheKey === null) {
-            $cacheKey = sha1($realCacheKey);
-        } else {
-            $cacheKey = $this->cacheKey;
-        }
+        $cacheKey = $this->cacheKey ?? sha1($realCacheKey);
 
         return [$cacheKey, $realCacheKey];
     }