[12.x] Fix for global automaticallyEagerLoadRelationships not working in certain cases (#55443)

litvinchuk · web-flow · commit 5548f956a64f · 2025-04-18T08:55:05.000-04:00
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -854,13 +854,9 @@ public function get($columns = ['*'])
             $models = $builder->eagerLoadRelations($models);
         }
 
-        $collection = $builder->getModel()->newCollection($models);
-
-        if (Model::isAutomaticallyEagerLoadingRelationships()) {
-            $collection->withRelationshipAutoloading();
-        }
-
-        return $this->applyAfterQueryCallbacks($collection);
+        return $this->applyAfterQueryCallbacks(
+            $builder->getModel()->newCollection($models)
+        );
     }
 
     /**
diff --git a/src/Illuminate/Database/Eloquent/HasCollection.php b/src/Illuminate/Database/Eloquent/HasCollection.php
@@ -27,7 +27,13 @@ public function newCollection(array $models = [])
     {
         static::$resolvedCollectionClasses[static::class] ??= ($this->resolveCollectionFromAttribute() ?? static::$collectionClass);
 
-        return new static::$resolvedCollectionClasses[static::class]($models);
+        $collection = new static::$resolvedCollectionClasses[static::class]($models);
+
+        if (Model::isAutomaticallyEagerLoadingRelationships()) {
+            $collection->withRelationshipAutoloading();
+        }
+
+        return $collection;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,13 @@ public function newCollection(array $models = [])`
`27`	`27`	`{`
`28`	`28`	`static::$resolvedCollectionClasses[static::class] ??= ($this->resolveCollectionFromAttribute() ?? static::$collectionClass);`
`29`	`29`
`30`		`- return new static::$resolvedCollectionClasses[static::class]($models);`
	`30`	`+ $collection = new static::$resolvedCollectionClasses[static::class]($models);`
	`31`	`+`
	`32`	`+ if (Model::isAutomaticallyEagerLoadingRelationships()) {`
	`33`	`+ $collection->withRelationshipAutoloading();`
	`34`	`+ }`
	`35`	`+`
	`36`	`+ return $collection;`
`31`	`37`	`}`
`32`	`38`
`33`	`39`	`/**`