[12.x] Use array_first and array_last (#56706)

KIKOmanasijev · kikomanasijev · web-flow · commit f73517ff174d · 2025-08-22T09:07:03.000-05:00
* wip

* fix tests

* fix tests

* add more cases

* add more cases

* head and last return false on empty array

---------

Co-authored-by: kikomanasijev &lt;hristijan.manasijev@nteams.com&gt;
diff --git a/src/Illuminate/Collections/Arr.php b/src/Illuminate/Collections/Arr.php
@@ -637,7 +637,7 @@ public static function join($array, $glue, $finalGlue = '')
         }
 
         if (count($array) === 1) {
-            return end($array);
+            return array_last($array);
         }
 
         $finalItem = array_pop($array);
diff --git a/src/Illuminate/Collections/helpers.php b/src/Illuminate/Collections/helpers.php
@@ -203,7 +203,7 @@ function data_forget(&$target, $key)
      */
     function head($array)
     {
-        return reset($array);
+        return empty($array) ? false : array_first($array);
     }
 }
 
@@ -216,7 +216,7 @@ function head($array)
      */
     function last($array)
     {
-        return end($array);
+        return empty($array) ? false : array_last($array);
     }
 }
 
diff --git a/src/Illuminate/Console/Scheduling/Schedule.php b/src/Illuminate/Console/Scheduling/Schedule.php
@@ -334,7 +334,7 @@ protected function mergePendingAttributes(Event $event)
         }
 
         if (! empty($this->groupStack)) {
-            $group = end($this->groupStack);
+            $group = array_last($this->groupStack);
 
             $group->mergeAttributes($event);
         }
@@ -476,7 +476,7 @@ public function __call($method, $parameters)
         }
 
         if (method_exists(PendingEventAttributes::class, $method)) {
-            $this->attributes ??= end($this->groupStack) ?: new PendingEventAttributes($this);
+            $this->attributes ??= array_last($this->groupStack) ?: new PendingEventAttributes($this);
 
             return $this->attributes->$method(...$parameters);
         }
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -1286,7 +1286,7 @@ protected function getParameterOverride($dependency)
      */
     protected function getLastParameterOverride()
     {
-        return count($this->with) ? end($this->with) : [];
+        return count($this->with) ? array_last($this->with) : [];
     }
 
     /**
@@ -1646,7 +1646,7 @@ protected function fireCallbackArray($object, array $callbacks)
      */
     public function currentlyResolving()
     {
-        return end($this->buildStack) ?: null;
+        return array_last($this->buildStack) ?: null;
     }
 
     /**
diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
@@ -369,7 +369,7 @@ public function scalar($query, $bindings = [], $useReadPdo = true)
             throw new MultipleColumnsSelectedException;
         }
 
-        return reset($record);
+        return array_last($record);
     }
 
     /**
diff --git a/src/Illuminate/Database/Eloquent/Builder.php b/src/Illuminate/Database/Eloquent/Builder.php
@@ -507,7 +507,7 @@ public function fillForInsert(array $values)
             return [];
         }
 
-        if (! is_array(reset($values))) {
+        if (! is_array(array_first($values))) {
             $values = [$values];
         }
 
@@ -1265,12 +1265,12 @@ public function upsert(array $values, $uniqueBy, $update = null)
             return 0;
         }
 
-        if (! is_array(reset($values))) {
+        if (! is_array(array_first($values))) {
             $values = [$values];
         }
 
         if (is_null($update)) {
-            $update = array_keys(reset($values));
+            $update = array_keys(array_first($values));
         }
 
         return $this->toBase()->upsert(
@@ -1366,7 +1366,7 @@ protected function addUpdatedAtColumn(array $values)
 
         $segments = preg_split('/\s+as\s+/i', $this->query->from);
 
-        $qualifiedColumn = end($segments).'.'.$column;
+        $qualifiedColumn = array_last($segments).'.'.$column;
 
         $values[$qualifiedColumn] = Arr::get($values, $qualifiedColumn, $values[$column]);
 
diff --git a/src/Illuminate/Database/Eloquent/Collection.php b/src/Illuminate/Database/Eloquent/Collection.php
@@ -240,7 +240,7 @@ public function loadMissing($relations)
             }
 
             if (is_callable($value)) {
-                $path[count($segments) - 1][end($segments)] = $value;
+                $path[count($segments) - 1][array_last($segments)] = $value;
             }
 
             $this->loadMissingRelation($this, $path);
diff --git a/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php b/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
@@ -291,7 +291,7 @@ public function updateOrCreate(array $attributes, array $values = [])
      */
     public function upsert(array $values, $uniqueBy, $update = null)
     {
-        if (! empty($values) && ! is_array(reset($values))) {
+        if (! empty($values) && ! is_array(array_first($values))) {
             $values = [$values];
         }
 
@@ -581,7 +581,7 @@ public function getForeignKeyName()
     {
         $segments = explode('.', $this->getQualifiedForeignKeyName());
 
-        return end($segments);
+        return array_last($segments);
     }
 
     /**
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php b/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php
@@ -116,7 +116,7 @@ protected function setForeignAttributesForCreate(Model $model)
      */
     public function upsert(array $values, $uniqueBy, $update = null)
     {
-        if (! empty($values) && ! is_array(reset($values))) {
+        if (! empty($values) && ! is_array(array_last($values))) {
             $values = [$values];
         }
 
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
@@ -3130,7 +3130,7 @@ public function value($column)
     {
         $result = (array) $this->first([$column]);
 
-        return count($result) > 0 ? reset($result) : null;
+        return count($result) > 0 ? array_first($result) : null;
     }
 
     /**
@@ -3142,7 +3142,7 @@ public function rawValue(string $expression, array $bindings = [])
     {
         $result = (array) $this->selectRaw($expression, $bindings)->first();
 
-        return count($result) > 0 ? reset($result) : null;
+        return count($result) > 0 ? array_first($result) : null;
     }
 
     /**
@@ -3158,7 +3158,7 @@ public function soleValue($column)
     {
         $result = (array) $this->sole([$column]);
 
-        return reset($result);
+        return array_last($result);
     }
 
     /**
@@ -3781,7 +3781,7 @@ public function insert(array $values)
             return true;
         }
 
-        if (! is_array(reset($values))) {
+        if (! is_array(array_last($values))) {
             $values = [$values];
         }
 
@@ -3818,7 +3818,7 @@ public function insertOrIgnore(array $values)
             return 0;
         }
 
-        if (! is_array(reset($values))) {
+        if (! is_array(array_last($values))) {
             $values = [$values];
         } else {
             foreach ($values as $key => $value) {
@@ -3976,7 +3976,7 @@ public function upsert(array $values, array|string $uniqueBy, ?array $update = n
             return (int) $this->insert($values);
         }
 
-        if (! is_array(reset($values))) {
+        if (! is_array(array_last($values))) {
             $values = [$values];
         } else {
             foreach ($values as $key => $value) {
@@ -3987,7 +3987,7 @@ public function upsert(array $values, array|string $uniqueBy, ?array $update = n
         }
 
         if (is_null($update)) {
-            $update = array_keys(reset($values));
+            $update = array_keys(array_last($values));
         }
 
         $this->applyBeforeQueryCallbacks();
diff --git a/src/Illuminate/Database/Query/Grammars/Grammar.php b/src/Illuminate/Database/Query/Grammars/Grammar.php
@@ -430,9 +430,9 @@ protected function whereBetween(Builder $query, $where)
     {
         $between = $where['not'] ? 'not between' : 'between';
 
-        $min = $this->parameter(is_array($where['values']) ? reset($where['values']) : $where['values'][0]);
+        $min = $this->parameter(is_array($where['values']) ? array_first($where['values']) : $where['values'][0]);
 
-        $max = $this->parameter(is_array($where['values']) ? end($where['values']) : $where['values'][1]);
+        $max = $this->parameter(is_array($where['values']) ? array_last($where['values']) : $where['values'][1]);
 
         return $this->wrap($where['column']).' '.$between.' '.$min.' and '.$max;
     }
@@ -448,9 +448,9 @@ protected function whereBetweenColumns(Builder $query, $where)
     {
         $between = $where['not'] ? 'not between' : 'between';
 
-        $min = $this->wrap(is_array($where['values']) ? reset($where['values']) : $where['values'][0]);
+        $min = $this->wrap(is_array($where['values']) ? array_first($where['values']) : $where['values'][0]);
 
-        $max = $this->wrap(is_array($where['values']) ? end($where['values']) : $where['values'][1]);
+        $max = $this->wrap(is_array($where['values']) ? array_last($where['values']) : $where['values'][1]);
 
         return $this->wrap($where['column']).' '.$between.' '.$min.' and '.$max;
     }
@@ -466,9 +466,9 @@ protected function whereValueBetween(Builder $query, $where)
     {
         $between = $where['not'] ? 'not between' : 'between';
 
-        $min = $this->wrap(is_array($where['columns']) ? reset($where['columns']) : $where['columns'][0]);
+        $min = $this->wrap(is_array($where['columns']) ? array_first($where['columns']) : $where['columns'][0]);
 
-        $max = $this->wrap(is_array($where['columns']) ? end($where['columns']) : $where['columns'][1]);
+        $max = $this->wrap(is_array($where['columns']) ? array_last($where['columns']) : $where['columns'][1]);
 
         return $this->parameter($where['value']).' '.$between.' '.$min.' and '.$max;
     }
@@ -1186,11 +1186,11 @@ public function compileInsert(Builder $query, array $values)
             return "insert into {$table} default values";
         }
 
-        if (! is_array(reset($values))) {
+        if (! is_array(array_last($values))) {
             $values = [$values];
         }
 
-        $columns = $this->columnize(array_keys(reset($values)));
+        $columns = $this->columnize(array_keys(array_last($values)));
 
         // We need to build a list of parameter place-holders of values that are bound
         // to the query. Each insert should have the exact same number of parameter
diff --git a/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php b/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
@@ -415,7 +415,7 @@ protected function compileUpdateWithJoins(Builder $query, $table, $columns, $whe
      */
     public function compileUpsert(Builder $query, array $values, array $uniqueBy, array $update)
     {
-        $columns = $this->columnize(array_keys(reset($values)));
+        $columns = $this->columnize(array_keys(array_last($values)));
 
         $sql = 'merge '.$this->wrapTable($query->from).' ';
 
diff --git a/src/Illuminate/Database/Schema/Grammars/Grammar.php b/src/Illuminate/Database/Schema/Grammars/Grammar.php
@@ -387,7 +387,7 @@ protected function getCommandByName(Blueprint $blueprint, $name)
         $commands = $this->getCommandsByName($blueprint, $name);
 
         if (count($commands) > 0) {
-            return reset($commands);
+            return array_last($commands);
         }
     }
 
diff --git a/src/Illuminate/Foundation/Console/BroadcastingInstallCommand.php b/src/Illuminate/Foundation/Console/BroadcastingInstallCommand.php
@@ -341,7 +341,7 @@ protected function injectFrameworkSpecificConfiguration()
             file_put_contents($filePath, $newContents);
         } else {
             // Add Echo configuration after the last import...
-            $lastImport = end($matches[0]);
+            $lastImport = array_last($matches[0]);
 
             $positionOfLastImport = strrpos($contents, $lastImport);
 
diff --git a/src/Illuminate/Foundation/helpers.php b/src/Illuminate/Foundation/helpers.php
@@ -294,7 +294,7 @@ function cache($key = null, $default = null)
             );
         }
 
-        return app('cache')->put(key($key), reset($key), ttl: $default);
+        return app('cache')->put(key($key), array_first($key), ttl: $default);
     }
 }
 
diff --git a/src/Illuminate/Routing/Router.php b/src/Illuminate/Routing/Router.php
@@ -509,7 +509,7 @@ protected function updateGroupStack(array $attributes)
      */
     public function mergeWithLastGroup($new, $prependExistingPrefix = true)
     {
-        return RouteGroup::merge($new, end($this->groupStack), $prependExistingPrefix);
+        return RouteGroup::merge($new, array_last($this->groupStack), $prependExistingPrefix);
     }
 
     /**
@@ -535,7 +535,7 @@ protected function loadRoutes($routes)
     public function getLastGroupPrefix()
     {
         if ($this->hasGroupStack()) {
-            $last = end($this->groupStack);
+            $last = array_last($this->groupStack);
 
             return $last['prefix'] ?? '';
         }
@@ -640,7 +640,7 @@ protected function convertToControllerAction($action)
      */
     protected function prependGroupNamespace($class)
     {
-        $group = end($this->groupStack);
+        $group = array_last($this->groupStack);
 
         return isset($group['namespace']) && ! str_starts_with($class, '\\') && ! str_starts_with($class, $group['namespace'])
             ? $group['namespace'].'\\'.$class
@@ -655,7 +655,7 @@ protected function prependGroupNamespace($class)
      */
     protected function prependGroupController($class)
     {
-        $group = end($this->groupStack);
+        $group = array_last($this->groupStack);
 
         if (! isset($group['controller'])) {
             return $class;
diff --git a/src/Illuminate/Support/Fluent.php b/src/Illuminate/Support/Fluent.php
@@ -301,7 +301,7 @@ public function __call($method, $parameters)
             return $this->macroCall($method, $parameters);
         }
 
-        $this->attributes[$method] = count($parameters) > 0 ? reset($parameters) : true;
+        $this->attributes[$method] = count($parameters) > 0 ? array_last($parameters) : true;
 
         return $this;
     }
diff --git a/src/Illuminate/Support/Reflector.php b/src/Illuminate/Support/Reflector.php
@@ -94,7 +94,7 @@ public static function getClassAttributes($objectOrClass, $attribute, $includePa
             ));
         } while ($includeParents && false !== $reflectionClass = $reflectionClass->getParentClass());
 
-        return $includeParents ? new Collection($attributes) : reset($attributes);
+        return $includeParents ? new Collection($attributes) : array_first($attributes);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,7 @@ public static function join($array, $glue, $finalGlue = '')`
`637`	`637`	`}`
`638`	`638`
`639`	`639`	`if (count($array) === 1) {`
`640`		`- return end($array);`
	`640`	`+ return array_last($array);`
`641`	`641`	`}`
`642`	`642`
`643`	`643`	`$finalItem = array_pop($array);`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ function data_forget(&$target, $key)`
`203`	`203`	`*/`
`204`	`204`	`function head($array)`
`205`	`205`	`{`
`206`		`- return reset($array);`
	`206`	`+ return empty($array) ? false : array_first($array);`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`
`@@ -216,7 +216,7 @@ function head($array)`
`216`	`216`	`*/`
`217`	`217`	`function last($array)`
`218`	`218`	`{`
`219`		`- return end($array);`
	`219`	`+ return empty($array) ? false : array_last($array);`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ protected function mergePendingAttributes(Event $event)`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`if (! empty($this->groupStack)) {`
`337`		`- $group = end($this->groupStack);`
	`337`	`+ $group = array_last($this->groupStack);`
`338`	`338`
`339`	`339`	`$group->mergeAttributes($event);`
`340`	`340`	`}`
`@@ -476,7 +476,7 @@ public function __call($method, $parameters)`
`476`	`476`	`}`
`477`	`477`
`478`	`478`	`if (method_exists(PendingEventAttributes::class, $method)) {`
`479`		`- $this->attributes ??= end($this->groupStack) ?: new PendingEventAttributes($this);`
	`479`	`+ $this->attributes ??= array_last($this->groupStack) ?: new PendingEventAttributes($this);`
`480`	`480`
`481`	`481`	`return $this->attributes->$method(...$parameters);`
`482`	`482`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1286,7 +1286,7 @@ protected function getParameterOverride($dependency)`
`1286`	`1286`	`*/`
`1287`	`1287`	`protected function getLastParameterOverride()`
`1288`	`1288`	`{`
`1289`		`- return count($this->with) ? end($this->with) : [];`
	`1289`	`+ return count($this->with) ? array_last($this->with) : [];`
`1290`	`1290`	`}`
`1291`	`1291`
`1292`	`1292`	`/**`
`@@ -1646,7 +1646,7 @@ protected function fireCallbackArray($object, array $callbacks)`
`1646`	`1646`	`*/`
`1647`	`1647`	`public function currentlyResolving()`
`1648`	`1648`	`{`
`1649`		`- return end($this->buildStack) ?: null;`
	`1649`	`+ return array_last($this->buildStack) ?: null;`
`1650`	`1650`	`}`
`1651`	`1651`
`1652`	`1652`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ public function scalar($query, $bindings = [], $useReadPdo = true)`
`369`	`369`	`throw new MultipleColumnsSelectedException;`
`370`	`370`	`}`
`371`	`371`
`372`		`- return reset($record);`
	`372`	`+ return array_last($record);`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ public function fillForInsert(array $values)`
`507`	`507`	`return [];`
`508`	`508`	`}`
`509`	`509`
`510`		`- if (! is_array(reset($values))) {`
	`510`	`+ if (! is_array(array_first($values))) {`
`511`	`511`	`$values = [$values];`
`512`	`512`	`}`
`513`	`513`
`@@ -1265,12 +1265,12 @@ public function upsert(array $values, $uniqueBy, $update = null)`
`1265`	`1265`	`return 0;`
`1266`	`1266`	`}`
`1267`	`1267`
`1268`		`- if (! is_array(reset($values))) {`
	`1268`	`+ if (! is_array(array_first($values))) {`
`1269`	`1269`	`$values = [$values];`
`1270`	`1270`	`}`
`1271`	`1271`
`1272`	`1272`	`if (is_null($update)) {`
`1273`		`- $update = array_keys(reset($values));`
	`1273`	`+ $update = array_keys(array_first($values));`
`1274`	`1274`	`}`
`1275`	`1275`
`1276`	`1276`	`return $this->toBase()->upsert(`
`@@ -1366,7 +1366,7 @@ protected function addUpdatedAtColumn(array $values)`
`1366`	`1366`
`1367`	`1367`	`$segments = preg_split('/\s+as\s+/i', $this->query->from);`
`1368`	`1368`
`1369`		`- $qualifiedColumn = end($segments).'.'.$column;`
	`1369`	`+ $qualifiedColumn = array_last($segments).'.'.$column;`
`1370`	`1370`
`1371`	`1371`	`$values[$qualifiedColumn] = Arr::get($values, $qualifiedColumn, $values[$column]);`
`1372`	`1372`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ public function loadMissing($relations)`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`if (is_callable($value)) {`
`243`		`- $path[count($segments) - 1][end($segments)] = $value;`
	`243`	`+ $path[count($segments) - 1][array_last($segments)] = $value;`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`$this->loadMissingRelation($this, $path);`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ public function updateOrCreate(array $attributes, array $values = [])`
`291`	`291`	`*/`
`292`	`292`	`public function upsert(array $values, $uniqueBy, $update = null)`
`293`	`293`	`{`
`294`		`- if (! empty($values) && ! is_array(reset($values))) {`
	`294`	`+ if (! empty($values) && ! is_array(array_first($values))) {`
`295`	`295`	`$values = [$values];`
`296`	`296`	`}`
`297`	`297`
`@@ -581,7 +581,7 @@ public function getForeignKeyName()`
`581`	`581`	`{`
`582`	`582`	`$segments = explode('.', $this->getQualifiedForeignKeyName());`
`583`	`583`
`584`		`- return end($segments);`
	`584`	`+ return array_last($segments);`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ protected function setForeignAttributesForCreate(Model $model)`
`116`	`116`	`*/`
`117`	`117`	`public function upsert(array $values, $uniqueBy, $update = null)`
`118`	`118`	`{`
`119`		`- if (! empty($values) && ! is_array(reset($values))) {`
	`119`	`+ if (! empty($values) && ! is_array(array_last($values))) {`
`120`	`120`	`$values = [$values];`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -3130,7 +3130,7 @@ public function value($column)`
`3130`	`3130`	`{`
`3131`	`3131`	`$result = (array) $this->first([$column]);`
`3132`	`3132`
`3133`		`- return count($result) > 0 ? reset($result) : null;`
	`3133`	`+ return count($result) > 0 ? array_first($result) : null;`
`3134`	`3134`	`}`
`3135`	`3135`
`3136`	`3136`	`/**`
`@@ -3142,7 +3142,7 @@ public function rawValue(string $expression, array $bindings = [])`
`3142`	`3142`	`{`
`3143`	`3143`	`$result = (array) $this->selectRaw($expression, $bindings)->first();`
`3144`	`3144`
`3145`		`- return count($result) > 0 ? reset($result) : null;`
	`3145`	`+ return count($result) > 0 ? array_first($result) : null;`
`3146`	`3146`	`}`
`3147`	`3147`
`3148`	`3148`	`/**`
`@@ -3158,7 +3158,7 @@ public function soleValue($column)`
`3158`	`3158`	`{`
`3159`	`3159`	`$result = (array) $this->sole([$column]);`
`3160`	`3160`
`3161`		`- return reset($result);`
	`3161`	`+ return array_last($result);`
`3162`	`3162`	`}`
`3163`	`3163`
`3164`	`3164`	`/**`
`@@ -3781,7 +3781,7 @@ public function insert(array $values)`
`3781`	`3781`	`return true;`
`3782`	`3782`	`}`
`3783`	`3783`
`3784`		`- if (! is_array(reset($values))) {`
	`3784`	`+ if (! is_array(array_last($values))) {`
`3785`	`3785`	`$values = [$values];`
`3786`	`3786`	`}`
`3787`	`3787`
`@@ -3818,7 +3818,7 @@ public function insertOrIgnore(array $values)`
`3818`	`3818`	`return 0;`
`3819`	`3819`	`}`
`3820`	`3820`
`3821`		`- if (! is_array(reset($values))) {`
	`3821`	`+ if (! is_array(array_last($values))) {`
`3822`	`3822`	`$values = [$values];`
`3823`	`3823`	`} else {`
`3824`	`3824`	`foreach ($values as $key => $value) {`
`@@ -3976,7 +3976,7 @@ public function upsert(array $values, array\|string $uniqueBy, ?array $update = n`
`3976`	`3976`	`return (int) $this->insert($values);`
`3977`	`3977`	`}`
`3978`	`3978`
`3979`		`- if (! is_array(reset($values))) {`
	`3979`	`+ if (! is_array(array_last($values))) {`
`3980`	`3980`	`$values = [$values];`
`3981`	`3981`	`} else {`
`3982`	`3982`	`foreach ($values as $key => $value) {`
`@@ -3987,7 +3987,7 @@ public function upsert(array $values, array\|string $uniqueBy, ?array $update = n`
`3987`	`3987`	`}`
`3988`	`3988`
`3989`	`3989`	`if (is_null($update)) {`
`3990`		`- $update = array_keys(reset($values));`
	`3990`	`+ $update = array_keys(array_last($values));`
`3991`	`3991`	`}`
`3992`	`3992`
`3993`	`3993`	`$this->applyBeforeQueryCallbacks();`