Use new array helpers in Support Collection functions

laravel · Nov 6, 2024 · 66e1f23 · 66e1f23
1 parent a8488ec
commit 66e1f23
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/Illuminate/Collections/Collection.php b/src/Illuminate/Collections/Collection.php
@@ -175,6 +175,10 @@ public function contains($key, $operator = null, $value = null)
     {
         if (func_num_args() === 1) {
             if ($this->useAsCallable($key)) {
+                if (function_exists('array_any')) {
+                    return array_any($this->items, $key);
+                }
+
                 $placeholder = new stdClass;
 
                 return $this->first($key, $placeholder) !== $placeholder;
@@ -573,6 +577,10 @@ public function has($key)
     {
         $keys = is_array($key) ? $key : func_get_args();
 
+        if (function_exists('array_all')) {
+            return array_all($keys, fn ($key) => array_key_exists($key, $this->items));
+        }
+
         foreach ($keys as $value) {
             if (! array_key_exists($value, $this->items)) {
                 return false;
@@ -596,6 +604,10 @@ public function hasAny($key)
 
         $keys = is_array($key) ? $key : func_get_args();
 
+        if (function_exists('array_any')) {
+            return array_any($keys, fn ($key) => array_key_exists($key, $this->items));
+        }
+
         foreach ($keys as $value) {
             if ($this->has($value)) {
                 return true;
@@ -1154,6 +1166,10 @@ public function search($value, $strict = false)
             return array_search($value, $this->items, $strict);
         }
 
+        if (function_exists('array_find_key')) {
+            return array_find_key($this->items, $value) ?? false;
+        }
+
         foreach ($this->items as $key => $item) {
             if ($value($item, $key)) {
                 return $key;