diff --git a/composer.json b/composer.json index 681e1a6884e4..0e48d7ef7e5c 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "symfony/mime": "^7.2.0", "symfony/polyfill-php83": "^1.31", "symfony/polyfill-php84": "^1.31", - "symfony/polyfill-php85": "^1.31", + "symfony/polyfill-php85": "^1.33", "symfony/process": "^7.2.0", "symfony/routing": "^7.2.0", "symfony/uid": "^7.2.0", diff --git a/src/Illuminate/Collections/Arr.php b/src/Illuminate/Collections/Arr.php index 66b476a18893..cfc89dc39281 100644 --- a/src/Illuminate/Collections/Arr.php +++ b/src/Illuminate/Collections/Arr.php @@ -256,6 +256,10 @@ public static function first($array, ?callable $callback = null, $default = null return value($default); } + if (is_array($array)) { + return array_first($array); + } + foreach ($array as $item) { return $item; } @@ -283,7 +287,7 @@ public static function first($array, ?callable $callback = null, $default = null public static function last($array, ?callable $callback = null, $default = null) { if (is_null($callback)) { - return empty($array) ? value($default) : end($array); + return empty($array) ? value($default) : array_last($array); } return static::first(array_reverse($array, true), $callback, $default); diff --git a/src/Illuminate/Testing/Constraints/HasInDatabase.php b/src/Illuminate/Testing/Constraints/HasInDatabase.php index cb885b133c20..090772aef591 100644 --- a/src/Illuminate/Testing/Constraints/HasInDatabase.php +++ b/src/Illuminate/Testing/Constraints/HasInDatabase.php @@ -34,6 +34,7 @@ class HasInDatabase extends Constraint * * @param \Illuminate\Database\Connection $database * @param array $data + * @return void */ public function __construct(Connection $database, array $data) { @@ -81,7 +82,7 @@ protected function getAdditionalInfo($table) $similarResults = $query->where( array_key_first($this->data), - $this->data[array_key_first($this->data)] + array_first($this->data), )->select(array_keys($this->data))->limit($this->show)->get(); if ($similarResults->isNotEmpty()) {