Skip to content

Commit 46bd07c

Browse files
authored
[12.x] Fixup PHP 8.5 deprecations in SupportArrTest (#57822)
* Do not use null as array key (deprecated in PHP 8.5) * Do not use null as default value in Arr::prepend
1 parent 4a0a51f commit 46bd07c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/Illuminate/Collections/Arr.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -844,10 +844,10 @@ public static function mapSpread(array $array, callable $callback)
844844
*
845845
* @param array $array
846846
* @param mixed $value
847-
* @param mixed $key
847+
* @param array-key $key
848848
* @return array
849849
*/
850-
public static function prepend($array, $value, $key = null)
850+
public static function prepend($array, $value, $key = '')
851851
{
852852
if (func_num_args() == 2) {
853853
array_unshift($array, $value);

tests/Support/SupportArrTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public function testDivide(): void
187187
$this->assertEquals(['first', 'second'], $values);
188188

189189
// Test dividing an array with null key
190-
[$keys, $values] = Arr::divide([null => 'Null', 1 => 'one']);
190+
[$keys, $values] = Arr::divide(['' => 'Null', 1 => 'one']);
191191
$this->assertEquals([null, 1], $keys);
192192
$this->assertEquals(['Null', 'one'], $values);
193193

@@ -197,7 +197,7 @@ public function testDivide(): void
197197
$this->assertEquals([['one' => 1, 2 => 'second'], 'one'], $values);
198198

199199
// Test dividing an array where the values are arrays
200-
[$keys, $values] = Arr::divide([null => ['one' => 1, 2 => 'second'], 1 => 'one']);
200+
[$keys, $values] = Arr::divide(['' => ['one' => 1, 2 => 'second'], 1 => 'one']);
201201
$this->assertEquals([null, 1], $keys);
202202
$this->assertEquals([['one' => 1, 2 => 'second'], 'one'], $values);
203203
}
@@ -1044,8 +1044,8 @@ public function testPrepend()
10441044
$array = Arr::prepend(['one' => 1, 'two' => 2], 0, 'zero');
10451045
$this->assertEquals(['zero' => 0, 'one' => 1, 'two' => 2], $array);
10461046

1047-
$array = Arr::prepend(['one' => 1, 'two' => 2], 0, null);
1048-
$this->assertEquals([null => 0, 'one' => 1, 'two' => 2], $array);
1047+
$array = Arr::prepend(['one' => 1, 'two' => 2], 0, '');
1048+
$this->assertEquals(['' => 0, 'one' => 1, 'two' => 2], $array);
10491049

10501050
$array = Arr::prepend(['one', 'two'], null, '');
10511051
$this->assertEquals(['' => null, 'one', 'two'], $array);
@@ -1547,9 +1547,9 @@ public function testForget()
15471547
Arr::forget($array, 'products.desk.final.taxes');
15481548
$this->assertEquals(['products' => ['desk' => ['price' => ['original' => 50, 'taxes' => 60]]]], $array);
15491549

1550-
$array = ['products' => ['desk' => ['price' => 50], null => 'something']];
1550+
$array = ['products' => ['desk' => ['price' => 50], '' => 'something']];
15511551
Arr::forget($array, ['products.amount.all', 'products.desk.price']);
1552-
$this->assertEquals(['products' => ['desk' => [], null => 'something']], $array);
1552+
$this->assertEquals(['products' => ['desk' => [], '' => 'something']], $array);
15531553

15541554
// Only works on first level keys
15551555
$array = ['[email protected]' => 'Joe', '[email protected]' => 'Jane'];

0 commit comments

Comments
 (0)