Fix types

staabm · Nov 15, 2024 · 5815d5e · 5815d5e
1 parent 1a8c8fb
commit 5815d5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/QueryReflection/ReflectionCache.php b/src/QueryReflection/ReflectionCache.php
@@ -157,6 +157,9 @@ private function readCachedRecords(bool $useReadLock): ?array
 
         // the schemaHash is only available in replay-and-record mode.
         if (null === $this->schemaHash) {
+            if (! is_string($cache['schemaHash'])) {
+                throw new ShouldNotHappenException();
+            }
             $this->schemaHash = $cache['schemaHash'];
         } elseif ($this->schemaHash !== $cache['schemaHash']) {
             return null;

diff --git a/src/SqlAst/ParserInference.php b/src/SqlAst/ParserInference.php
@@ -74,6 +74,10 @@ public function narrowResultType(string $queryString, ConstantArrayType $resultT
                     $fromTable = $this->schemaReflection->getTable($fromName);
                 } elseif ($from instanceof Join) {
                     while (1) {
+                        if (!$from instanceof Join || !method_exists($from, 'getCondition')) {
+                            return $resultType;
+                        }
+
                         if ($from->getCondition() === null) {
                             if (QueryReflection::getRuntimeConfiguration()->isDebugEnabled()) {
                                 throw new UnresolvableAstInQueryException('Cannot narrow down types null join conditions: ' . $queryString);