relax the lazy loading restrictions (#37503)

laravel · May 27, 2021 · f26816d · f26816d
1 parent e0402fc
commit f26816d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -351,10 +351,12 @@ public function hydrate(array $items)
     {
         $instance = $this->newModelInstance();
 
-        return $instance->newCollection(array_map(function ($item) use ($instance) {
+        return $instance->newCollection(array_map(function ($item) use ($items, $instance) {
             $model = $instance->newFromBuilder($item);
 
-            $model->preventsLazyLoading = Model::preventsLazyLoading();
+            if (count($items) > 1) {
+                $model->preventsLazyLoading = Model::preventsLazyLoading();
+            }
 
             return $model;
         }, $items));

diff --git a/tests/Integration/Database/EloquentStrictLoadingTest.php b/tests/Integration/Database/EloquentStrictLoadingTest.php
@@ -48,6 +48,15 @@ public function testStrictModeThrowsAnExceptionOnLazyLoading()
         $models[0]->modelTwos;
     }
 
+    public function testStrictModeDoesntThrowAnExceptionOnLazyLoadingWithSingleModel()
+    {
+        EloquentStrictLoadingTestModel1::create();
+
+        $models = EloquentStrictLoadingTestModel1::get();
+
+        $this->assertInstanceOf(Collection::class, $models);
+    }
+
     public function testStrictModeDoesntThrowAnExceptionOnAttributes()
     {
         EloquentStrictLoadingTestModel1::create();
@@ -85,6 +94,8 @@ public function testStrictModeDoesntThrowAnExceptionOnSingleModelLoading()
     {
         $model = EloquentStrictLoadingTestModel1::create();
 
+        $model = EloquentStrictLoadingTestModel1::find($model->id);
+
         $this->assertInstanceOf(Collection::class, $model->modelTwos);
     }
 
@@ -95,6 +106,7 @@ public function testStrictModeThrowsAnExceptionOnLazyLoadingInRelations()
 
         $model1 = EloquentStrictLoadingTestModel1::create();
         EloquentStrictLoadingTestModel2::create(['model_1_id' => $model1->id]);
+        EloquentStrictLoadingTestModel2::create(['model_1_id' => $model1->id]);
 
         $models = EloquentStrictLoadingTestModel1::with('modelTwos')->get();