Merge pull request #140 from FriendsOfCake/mistmatched-condition-aliases

Support for relationship conditions with aliases
FriendsOfCake · Sep 30, 2020 · 42edd22 · 42edd22
2 parents 1c1f379 + 42de332
commit 42edd22
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/src/Listener/JsonApiListener.php b/src/Listener/JsonApiListener.php
@@ -600,8 +600,26 @@ protected function checkValidReverseAssociation(
             return false;
         }
 
-        $reverseConditions = $reverseAssociation->getConditions();
-        $forwardConditions = $forwardAssociation->getConditions();
+        /**
+         * Strip table aliases from the association conditions to prevent cases where a different alias causes
+         * associations
+         */
+        $stripAliasedConditions = function ($conditions) {
+            if (!is_array($conditions)) {
+                return $conditions;
+            }
+
+            $strippedConditions = [];
+            foreach ($conditions as $field => $condition) {
+                $field = preg_replace('/.*\.(.*)/', '$1', $field);
+                $strippedConditions[$field] = $condition;
+            }
+
+            return $strippedConditions;
+        };
+
+        $reverseConditions = $stripAliasedConditions($reverseAssociation->getConditions());
+        $forwardConditions = $stripAliasedConditions($forwardAssociation->getConditions());
 
         if ($forwardConditions !== $reverseConditions) {
             return false;