From e4d5d73490bc4d382f2646573d0e1edc2be8461a Mon Sep 17 00:00:00 2001
From: Christina Reichel <123160582+chriscpty@users.noreply.github.com>
Date: Sun, 27 Oct 2024 11:37:09 +0100
Subject: [PATCH] Fix #20268: Minor optimisation in
 `\yii\helpers\BaseArrayHelper::map`

---
 framework/CHANGELOG.md                      |  1 +
 framework/helpers/BaseArrayHelper.php       |  3 ++
 framework/helpers/BaseStringHelper.php      | 33 +++++++------
 tests/framework/helpers/ArrayHelperTest.php | 53 ++++++++++++++++++++-
 4 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 294810f9fc7..1935d097811 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -9,6 +9,7 @@ Yii Framework 2 Change Log
 - Enh #20247: Support for variadic console controller action methods (brandonkelly)
 - Bug #20256: Add support for dropping views in MSSQL server when running migrate/fresh (ambrozt)
 - Enh #20248: Add support for attaching behaviors in configurations with Closure (timkelty)
+- Enh #20268: Minor optimisation in `\yii\helpers\BaseArrayHelper::map` (chriscpty)
 
 2.0.51 July 18, 2024
 --------------------
diff --git a/framework/helpers/BaseArrayHelper.php b/framework/helpers/BaseArrayHelper.php
index 56411163e1e..bc770f96cb7 100644
--- a/framework/helpers/BaseArrayHelper.php
+++ b/framework/helpers/BaseArrayHelper.php
@@ -595,6 +595,9 @@ public static function getColumn($array, $name, $keepKeys = true)
      */
     public static function map($array, $from, $to, $group = null)
     {
+        if (is_string($from) && is_string($to) && $group === null && strpos($from, '.') === false && strpos($to, '.') === false) {
+            return array_column($array, $to, $from);
+        }
         $result = [];
         foreach ($array as $element) {
             $key = static::getValue($element, $from);
diff --git a/framework/helpers/BaseStringHelper.php b/framework/helpers/BaseStringHelper.php
index ec9252aa4c4..5854e29766d 100644
--- a/framework/helpers/BaseStringHelper.php
+++ b/framework/helpers/BaseStringHelper.php
@@ -313,9 +313,14 @@ public static function explode($string, $delimiter = ',', $trim = true, $skipEmp
         }
         if ($skipEmpty) {
             // Wrapped with array_values to make array keys sequential after empty values removing
-            $result = array_values(array_filter($result, function ($value) {
-                return $value !== '';
-            }));
+            $result = array_values(
+                array_filter(
+                    $result,
+                    function ($value) {
+                        return $value !== '';
+                    }
+                )
+            );
         }
 
         return $result;
@@ -343,7 +348,7 @@ public static function countWords($string)
      */
     public static function normalizeNumber($value)
     {
-        $value = (string) $value;
+        $value = (string)$value;
 
         $localeInfo = localeconv();
         $decimalSeparator = isset($localeInfo['decimal_point']) ? $localeInfo['decimal_point'] : null;
@@ -396,7 +401,7 @@ public static function floatToString($number)
     {
         // . and , are the only decimal separators known in ICU data,
         // so its safe to call str_replace here
-        return str_replace(',', '.', (string) $number);
+        return str_replace(',', '.', (string)$number);
     }
 
     /**
@@ -422,14 +427,14 @@ public static function matchWildcard($pattern, $string, $options = [])
 
         $replacements = [
             '\\\\\\\\' => '\\\\',
-            '\\\\\\*' => '[*]',
-            '\\\\\\?' => '[?]',
-            '\*' => '.*',
-            '\?' => '.',
-            '\[\!' => '[^',
-            '\[' => '[',
-            '\]' => ']',
-            '\-' => '-',
+            '\\\\\\*'  => '[*]',
+            '\\\\\\?'  => '[?]',
+            '\*'       => '.*',
+            '\?'       => '.',
+            '\[\!'     => '[^',
+            '\['       => '[',
+            '\]'       => ']',
+            '\-'       => '-',
         ];
 
         if (isset($options['escape']) && !$options['escape']) {
@@ -483,7 +488,7 @@ public static function mb_ucfirst($string, $encoding = 'UTF-8')
      */
     public static function mb_ucwords($string, $encoding = 'UTF-8')
     {
-        $string = (string) $string;
+        $string = (string)$string;
         if (empty($string)) {
             return $string;
         }
diff --git a/tests/framework/helpers/ArrayHelperTest.php b/tests/framework/helpers/ArrayHelperTest.php
index f450b281f7a..a086503006b 100644
--- a/tests/framework/helpers/ArrayHelperTest.php
+++ b/tests/framework/helpers/ArrayHelperTest.php
@@ -734,6 +734,57 @@ public function testMap()
                 '345' => 'ccc',
             ],
         ], $result);
+
+        $result = ArrayHelper::map($array,
+            static function (array $group) {
+                return $group['id'] . $group['name'];
+            },
+            static function (array $group) {
+                return $group['name'] . $group['class'];
+            }
+        );
+
+        $this->assertEquals([
+            '123aaa' => 'aaax',
+            '124bbb' => 'bbbx',
+            '345ccc' => 'cccy',
+        ], $result);
+
+        $result = ArrayHelper::map($array,
+            static function (array $group) {
+                return $group['id'] . $group['name'];
+            },
+            static function (array $group) {
+                return $group['name'] . $group['class'];
+            },
+            static function (array $group) {
+                return $group['class'] . '-' . $group['class'];
+            }
+        );
+
+        $this->assertEquals([
+            'x-x' => [
+                '123aaa' => 'aaax',
+                '124bbb' => 'bbbx',
+            ],
+            'y-y' => [
+                '345ccc' => 'cccy',
+            ],
+        ], $result);
+
+        $array = [
+            ['id' => '123', 'name' => 'aaa', 'class' => 'x', 'map' => ['a' => '11', 'b' => '22']],
+            ['id' => '124', 'name' => 'bbb', 'class' => 'x', 'map' => ['a' => '33', 'b' => '44']],
+            ['id' => '345', 'name' => 'ccc', 'class' => 'y', 'map' => ['a' => '55', 'b' => '66']],
+        ];
+
+        $result = ArrayHelper::map($array, 'map.a', 'map.b');
+
+        $this->assertEquals([
+            '11' => '22',
+            '33' => '44',
+            '55' => '66'
+        ], $result);
     }
 
     public function testKeyExists()
@@ -759,7 +810,7 @@ public function testKeyExistsWithFloat()
         if (version_compare(PHP_VERSION, '8.1.0', '>=')) {
             $this->markTestSkipped('Using floats as array key is deprecated.');
         }
-        
+
         $array = [
             1 => 3,
             2.2 => 4, // Note: Floats are cast to ints, which means that the fractional part will be truncated.