Skip to content

Commit 44c6bbe

Browse files
author
AmirHossein Fallah
committed
fix: resolve array_last function issues after upstream merge
- Replace array_last() with Arr::last() in Container.php - Replace array_last() with end() in Arr.php - Add missing Arr import to Container.php - Fixes fatal errors in testbench processes
1 parent bb4f8cb commit 44c6bbe

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/Illuminate/Collections/Arr.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public static function first($array, ?callable $callback = null, $default = null
287287
public static function last($array, ?callable $callback = null, $default = null)
288288
{
289289
if (is_null($callback)) {
290-
return empty($array) ? value($default) : array_last($array);
290+
return empty($array) ? value($default) : end($array);
291291
}
292292

293293
return static::first(array_reverse($array, true), $callback, $default);

src/Illuminate/Container/Container.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Illuminate\Contracts\Container\Container as ContainerContract;
1414
use Illuminate\Contracts\Container\ContextualAttribute;
1515
use Illuminate\Contracts\Container\SelfBuilding;
16+
use Illuminate\Support\Arr;
1617
use Illuminate\Support\Collection;
1718
use LogicException;
1819
use ReflectionAttribute;
@@ -1320,7 +1321,7 @@ protected function getParameterOverride($dependency)
13201321
*/
13211322
protected function getLastParameterOverride()
13221323
{
1323-
return count($this->with) ? array_last($this->with) : [];
1324+
return count($this->with) ? Arr::last($this->with) : [];
13241325
}
13251326

13261327
/**
@@ -1680,7 +1681,7 @@ protected function fireCallbackArray($object, array $callbacks)
16801681
*/
16811682
public function currentlyResolving()
16821683
{
1683-
return array_last($this->buildStack) ?: null;
1684+
return Arr::last($this->buildStack) ?: null;
16841685
}
16851686

16861687
/**

0 commit comments

Comments
 (0)