Don't iterate over all collection in Collection::firstOrFail (laravel…

…#38536)
cdsistemas · Oct 12, 2021 · 8de2c34 · 8de2c34
1 parent e64ee03
commit 8de2c34
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/Illuminate/Collections/Collection.php b/src/Illuminate/Collections/Collection.php
@@ -1146,13 +1146,15 @@ public function firstOrFail($key = null, $operator = null, $value = null)
             ? $this->operatorForWhere(...func_get_args())
             : $key;
 
-        $items = $this->when($filter)->filter($filter);
+        $placeholder = new stdClass();
 
-        if ($items->isEmpty()) {
+        $item = $this->first($filter, $placeholder);
+
+        if ($item === $placeholder) {
             throw new ItemNotFoundException;
         }
 
-        return $items->first();
+        return $item;
     }
 
     /**

diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -239,6 +239,28 @@ public function testFirstOrFailDoesntThrowExceptionIfMoreThanOneItemExistsWithCa
         );
     }
 
+    /**
+     * @dataProvider collectionClassProvider
+     */
+    public function testFirstOrFailStopsIteratingAtFirstMatch($collection)
+    {
+        $data = new $collection([
+            function () {
+                return false;
+            },
+            function () {
+                return true;
+            },
+            function () {
+                throw new Exception();
+            },
+        ]);
+
+        $this->assertNotNull($data->firstOrFail(function ($callback) {
+            return $callback();
+        }));
+    }
+
     /**
      * @dataProvider collectionClassProvider
      */