[13.x] Fix eager loaded oneOfMany relationship constraints in closures

Author: sadique-cws

src/Illuminate/Database/Eloquent/Builder.php

@@ -945,36 +945,7 @@ protected function eagerLoadRelation(array $models, $name, Closure $constraints)
 
         $relation->addEagerConstraints($models);
 
-        // For one-of-many relationships, we need to also apply the user's eager
-        // load constraints to the inner subquery that determines which record
-        // is the "latest" / "oldest". We snapshot the outer query's wheres
-        // before and after applying constraints, then copy only the new ones.
-        $subQuery = method_exists($relation, 'getOneOfManySubQuery')
-            ? $relation->getOneOfManySubQuery()
-            : null;
-
-        if ($subQuery) {
-            $whereCountBefore = count($relation->getQuery()->getQuery()->wheres);
-            $bindingCountBefore = count($relation->getQuery()->getQuery()->bindings['where']);
-        }
-
-        $constraints($relation);
-
-        if ($subQuery) {
-            $outerWheres = $relation->getQuery()->getQuery()->wheres;
-            $outerBindings = $relation->getQuery()->getQuery()->bindings['where'];
-
-            $newWheres = array_slice($outerWheres, $whereCountBefore);
-            $newBindings = array_slice($outerBindings, $bindingCountBefore);
-
-            foreach ($newWheres as $where) {
-                $subQuery->getQuery()->wheres[] = $where;
-            }
-
-            foreach ($newBindings as $binding) {
-                $subQuery->getQuery()->addBinding($binding, 'where');
-            }
-        }
+        $relation->applyEagerLoadingConstraints($constraints);
 
         // Once we have the results, we just match those back up to their parent models
         // using the relationship instance. Then we just return the finished arrays

src/Illuminate/Database/Eloquent/Relations/Concerns/CanBeOneOfMany.php

@@ -329,4 +329,35 @@ public function getRelationName()
     {
         return $this->relationName;
     }
+
+    /**
+     * Apply the given constraints to the relationship.
+     *
+     * @param  \Closure  $constraints
+     * @return void
+     */
+    public function applyEagerLoadingConstraints(Closure $constraints)
+    {
+        $subQuery = $this->getOneOfManySubQuery();
+
+        if ($subQuery) {
+            $whereCountBefore = count($this->query->getQuery()->wheres);
+            $bindingCountBefore = count($this->query->getQuery()->bindings['where']);
+        }
+
+        $constraints($this);
+
+        if ($subQuery) {
+            $newWheres = array_slice($this->query->getQuery()->wheres, $whereCountBefore);
+            $newBindings = array_slice($this->query->getQuery()->bindings['where'], $bindingCountBefore);
+
+            foreach ($newWheres as $where) {
+                $subQuery->getQuery()->wheres[] = $where;
+            }
+
+            foreach ($newBindings as $binding) {
+                $subQuery->getQuery()->addBinding($binding, 'where');
+            }
+        }
+    }
 }

src/Illuminate/Database/Eloquent/Relations/Relation.php

@@ -522,6 +522,17 @@ public static function getMorphAlias(string $className)
         return array_search($className, static::$morphMap, strict: true) ?: $className;
     }
 
+    /**
+     * Apply the given constraints to the relationship.
+     *
+     * @param  \Closure  $constraints
+     * @return void
+     */
+    public function applyEagerLoadingConstraints(Closure $constraints)
+    {
+        $constraints($this);
+    }
+
     /**
      * Handle dynamic method calls to the relationship.
      *