From 8bac5a0e4df1a2ac950b2348315c7d19ddbb98c8 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Tue, 12 Mar 2024 11:30:47 +0100 Subject: [PATCH 1/6] Add Arr::mapSpread helper --- src/Illuminate/Collections/Arr.php | 17 +++++++++++++++++ tests/Support/SupportArrTest.php | 21 +++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/Illuminate/Collections/Arr.php b/src/Illuminate/Collections/Arr.php index 361808418ffa..190ea8e8e874 100644 --- a/src/Illuminate/Collections/Arr.php +++ b/src/Illuminate/Collections/Arr.php @@ -634,6 +634,23 @@ public static function mapWithKeys(array $array, callable $callback) return $result; } + /** + * Run a map over each nested chunk of items. + * + * @template TMapSpreadValue + * + * @param callable(mixed...): TMapSpreadValue $callback + * @return array + */ + public function mapSpread(callable $callback) + { + return static::map(function ($chunk, $key) use ($callback) { + $chunk[] = $key; + + return $callback(...$chunk); + }); + } + /** * Push an item onto the beginning of an array. * diff --git a/tests/Support/SupportArrTest.php b/tests/Support/SupportArrTest.php index 119dd2a3bd65..0c7eb3cb858c 100644 --- a/tests/Support/SupportArrTest.php +++ b/tests/Support/SupportArrTest.php @@ -733,6 +733,27 @@ public function testMapByReference() $this->assertEquals(['first' => 'taylor', 'last' => 'otwell'], $data); } + public function testMapSpread() + { + $c = [[1, 'a'], [2, 'b']]; + + $result = Arr::mapSpread(function ($number, $character) { + return "{$number}-{$character}"; + }); + $this->assertEquals(['1-a', '2-b'], $result); + + $result = Arr::mapSpread(function ($number, $character, $key) { + return "{$number}-{$character}-{$key}"; + }); + $this->assertEquals(['1-a-0', '2-b-1'], $result); + + $c = [[1, 'a'], [2, 'b']]; + $result = Arr::mapSpread(function ($number, $character, $key) { + return "{$number}-{$character}-{$key}"; + }); + $this->assertEquals(['1-a-0', '2-b-1'], $result); + } + public function testPrepend() { $array = Arr::prepend(['one', 'two', 'three', 'four'], 'zero'); From d1058f2220a712c94e86c3122edc21e09a54fff2 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Tue, 12 Mar 2024 11:40:54 +0100 Subject: [PATCH 2/6] Fix --- src/Illuminate/Collections/Arr.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Collections/Arr.php b/src/Illuminate/Collections/Arr.php index 190ea8e8e874..e803be7f23d5 100644 --- a/src/Illuminate/Collections/Arr.php +++ b/src/Illuminate/Collections/Arr.php @@ -638,13 +638,13 @@ public static function mapWithKeys(array $array, callable $callback) * Run a map over each nested chunk of items. * * @template TMapSpreadValue - * + * @param array $array * @param callable(mixed...): TMapSpreadValue $callback * @return array */ - public function mapSpread(callable $callback) + public function mapSpread(array $array, callable $callback) { - return static::map(function ($chunk, $key) use ($callback) { + return static::map($array, function ($chunk, $key) use ($callback) { $chunk[] = $key; return $callback(...$chunk); From 5d19573b49c047879139d9a9028f4caddc1a9a9d Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Tue, 12 Mar 2024 11:48:20 +0100 Subject: [PATCH 3/6] StyleCI --- src/Illuminate/Collections/Arr.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Illuminate/Collections/Arr.php b/src/Illuminate/Collections/Arr.php index e803be7f23d5..5c24b15ee61d 100644 --- a/src/Illuminate/Collections/Arr.php +++ b/src/Illuminate/Collections/Arr.php @@ -638,6 +638,7 @@ public static function mapWithKeys(array $array, callable $callback) * Run a map over each nested chunk of items. * * @template TMapSpreadValue + * * @param array $array * @param callable(mixed...): TMapSpreadValue $callback * @return array From 89d180446f21a55600ea4aea673fbaeaa0b9e919 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Tue, 12 Mar 2024 11:55:27 +0100 Subject: [PATCH 4/6] Mark as static --- src/Illuminate/Collections/Arr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Collections/Arr.php b/src/Illuminate/Collections/Arr.php index 5c24b15ee61d..36a7359048d0 100644 --- a/src/Illuminate/Collections/Arr.php +++ b/src/Illuminate/Collections/Arr.php @@ -643,7 +643,7 @@ public static function mapWithKeys(array $array, callable $callback) * @param callable(mixed...): TMapSpreadValue $callback * @return array */ - public function mapSpread(array $array, callable $callback) + public static function mapSpread(array $array, callable $callback) { return static::map($array, function ($chunk, $key) use ($callback) { $chunk[] = $key; From 3cb119b51bb76c999b63f82e3b813f944b7f1983 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Tue, 12 Mar 2024 12:03:15 +0100 Subject: [PATCH 5/6] Fix tests --- tests/Support/SupportArrTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Support/SupportArrTest.php b/tests/Support/SupportArrTest.php index 0c7eb3cb858c..6c9f4085ad25 100644 --- a/tests/Support/SupportArrTest.php +++ b/tests/Support/SupportArrTest.php @@ -737,18 +737,18 @@ public function testMapSpread() { $c = [[1, 'a'], [2, 'b']]; - $result = Arr::mapSpread(function ($number, $character) { + $result = Arr::mapSpread($c, function ($number, $character) { return "{$number}-{$character}"; }); $this->assertEquals(['1-a', '2-b'], $result); - $result = Arr::mapSpread(function ($number, $character, $key) { + $result = Arr::mapSpread($c, function ($number, $character, $key) { return "{$number}-{$character}-{$key}"; }); $this->assertEquals(['1-a-0', '2-b-1'], $result); $c = [[1, 'a'], [2, 'b']]; - $result = Arr::mapSpread(function ($number, $character, $key) { + $result = Arr::mapSpread($c, function ($number, $character, $key) { return "{$number}-{$character}-{$key}"; }); $this->assertEquals(['1-a-0', '2-b-1'], $result); From 69dd7f7f9616e098b862c309e71631dde26ca8ca Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Tue, 12 Mar 2024 12:18:01 +0100 Subject: [PATCH 6/6] Slim test --- tests/Support/SupportArrTest.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/Support/SupportArrTest.php b/tests/Support/SupportArrTest.php index 6c9f4085ad25..fe18a03f8577 100644 --- a/tests/Support/SupportArrTest.php +++ b/tests/Support/SupportArrTest.php @@ -746,12 +746,6 @@ public function testMapSpread() return "{$number}-{$character}-{$key}"; }); $this->assertEquals(['1-a-0', '2-b-1'], $result); - - $c = [[1, 'a'], [2, 'b']]; - $result = Arr::mapSpread($c, function ($number, $character, $key) { - return "{$number}-{$character}-{$key}"; - }); - $this->assertEquals(['1-a-0', '2-b-1'], $result); } public function testPrepend()