Fixed incorrect metadata is being used for traversal

ibexa · Oct 23, 2023 · b46f414 · b46f414
1 parent 49df802
commit b46f414
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/lib/Gateway/ExpressionVisitor.php b/src/lib/Gateway/ExpressionVisitor.php
@@ -215,26 +215,27 @@ private function containsRelationshipDelimiter(string $column): bool
      */
     private function handleRelationshipComparison(string $column, Comparison $comparison): string
     {
+        $metadata = $this->schemaMetadata;
         do {
             [
                 $foreignProperty,
                 $column,
             ] = explode(self::RELATIONSHIP_DELIMITER, $column, 2);
 
-            $relationship = $this->schemaMetadata->getRelationshipByForeignProperty($foreignProperty);
-            $relationshipMetadata = $this->registry->getMetadata($relationship->getRelationshipClass());
+            $relationship = $metadata->getRelationshipByForeignProperty($foreignProperty);
+            $metadata = $this->registry->getMetadata($relationship->getRelationshipClass());
         } while ($this->containsRelationshipDelimiter($column));
 
-        if (!$relationshipMetadata->hasColumn($column)) {
+        if (!$metadata->hasColumn($column)) {
             throw new RuntimeMappingException(sprintf(
                 '"%s" does not exist as available column on "%s" class schema metadata. '
                 . 'Available columns: "%s". Available relationships: "%s"',
                 $column,
-                $relationshipMetadata->getClassName(),
-                implode('", "', $relationshipMetadata->getColumns()),
+                $metadata->getClassName(),
+                implode('", "', $metadata->getColumns()),
                 implode('", "', array_map(
                     static fn (DoctrineRelationshipInterface $relationship): string => $relationship->getForeignProperty(),
-                    $relationshipMetadata->getRelationships(),
+                    $metadata->getRelationships(),
                 )),
             ));
         }
@@ -244,15 +245,15 @@ private function handleRelationshipComparison(string $column, Comparison $compar
         switch ($relationshipType) {
             case DoctrineRelationship::class:
                 return $this->handleSubSelectQuery(
-                    $relationshipMetadata,
+                    $metadata,
                     $relationship->getForeignKeyColumn(),
                     $column,
                     $comparison->getValue(),
                 );
             case DoctrineOneToManyRelationship::class:
             case PreJoinedDoctrineRelationship::class:
                 return $this->handleJoinQuery(
-                    $relationshipMetadata,
+                    $metadata,
                     $column,
                     $comparison->getValue(),
                 );