fixed RecordingQueryReflector (#240)

Co-authored-by: Markus Staab <m.staab@complex-it.de>
staabm · Feb 4, 2022 · ac7802e · ac7802e
1 parent ffaadc3
commit ac7802e
Show file tree

Hide file tree

Showing 5 changed files with 378 additions and 8,702 deletions.
diff --git a/src/QueryReflection/ReflectionCache.php b/src/QueryReflection/ReflectionCache.php
@@ -12,7 +12,7 @@
 
 final class ReflectionCache
 {
-    public const SCHEMA_VERSION = 'v4-runtime-config';
+    public const SCHEMA_VERSION = 'v5-runtime-config-bugfix';
 
     /**
      * @var string
@@ -78,9 +78,9 @@ private function lazyReadRecords()
             return $this->records;
         }
 
-        $cache = $this->readCache(true);
-        if (null !== $cache) {
-            $this->records = $cache['records'];
+        $cachedRecords = $this->readCachedRecords(true);
+        if (null !== $cachedRecords) {
+            $this->records = $cachedRecords;
         } else {
             $this->records = [];
         }
@@ -90,13 +90,9 @@ private function lazyReadRecords()
     }
 
     /**
-     * @return array{
-     *     records: array<string, array{error?: ?Error, result?: array<QueryReflector::FETCH_TYPE*, ?Type>}>,
-     *     runtimeConfig: array<string, scalar>,
-     *     schemaVersion: string
-     * }|null
+     * @return array<string, array{error?: ?Error, result?: array<QueryReflector::FETCH_TYPE*, ?Type>}>|null
      */
-    private function readCache(bool $useReadLock): ?array
+    private function readCachedRecords(bool $useReadLock): ?array
     {
         if (!is_file($this->cacheFile)) {
             if (false === file_put_contents($this->cacheFile, '')) {
@@ -127,8 +123,7 @@ private function readCache(bool $useReadLock): ?array
             throw new ShouldNotHappenException();
         }
 
-        // @phpstan-ignore-next-line
-        return $cache;
+        return $cache['records'];
     }
 
     public function persist(): void
@@ -141,7 +136,7 @@ public function persist(): void
             flock(self::$lockHandle, LOCK_EX);
 
             // freshly read the cache as it might have changed in the meantime
-            $cachedRecords = $this->readCache(false);
+            $cachedRecords = $this->readCachedRecords(false);
 
             // re-apply all changes to the current cache-state
             if (null === $cachedRecords) {