Fixed bug in ArrayHelper::searchColumn() when using assoc arrays. closes

#1911
luyadev · Mar 27, 2019 · e99684e · e99684e
1 parent 366ae9c
commit e99684e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -6,8 +6,9 @@ All notable changes to this project will be documented in this file. This projec
 
 ### Fixed
 
++ [#1911](https://github.com/luyadev/luya/issues/1911) Fixed bug in ArrayHelper::searchColumn() when using assoc arrays.
 + [#1910](https://github.com/luyadev/luya/issues/1910) Fixed resized callback in lazyload js
-+ [#1909](https://github.com/luyadev/luya/issues/1909) Fix issued with wrong delimiter defintion in StringHelper::highlightWord() function.
++ [#1909](https://github.com/luyadev/luya/issues/1909) Fixed issued with wrong delimiter defintion in StringHelper::highlightWord() function.
 
 ## 1.0.15 (19. February 2019)
 

diff --git a/core/helpers/ArrayHelper.php b/core/helpers/ArrayHelper.php
@@ -187,6 +187,7 @@ public static function search(array $array, $searchText, $sensitive = false)
      */
     public static function searchColumn(array $array, $column, $search)
     {
+        $array = array_values($array); // align array keys
         $columns = array_column($array, $column);
         $key = array_search($search, $columns);
         return ($key !== false) ?  $array[$key] : false;

diff --git a/tests/core/helpers/ArrayHelperTest.php b/tests/core/helpers/ArrayHelperTest.php
@@ -149,6 +149,31 @@ public function testSearchColumns()
 
         $this->assertSame([], ArrayHelper::searchColumns($array, 'foo', 'NOTFOUNDATALL'));
     }
+
+    public function testSearchColumnsAndColumnWithAssocKeys()
+    {
+        $numbers = [
+            10 => ['column' => 'a'],
+            20 => ['column' => 'b'],
+        ];
+
+        $assoc = [
+            "one" => ['column' => 'c'],
+            "two" => ['column' => 'd'],
+        ];
+
+        $this->assertSame([
+            20 => ['column' => 'b'],
+        ], ArrayHelper::searchColumns($numbers, 'column', 'b'));
+
+        $this->assertSame([
+            "two" => ['column' => 'd'],
+        ], ArrayHelper::searchColumns($assoc, 'column', 'd'));
+
+        $this->assertSame(['column' => 'b'], ArrayHelper::searchColumn($numbers, 'column', 'b'));
+
+        $this->assertSame(['column' => 'd'], ArrayHelper::searchColumn($assoc, 'column', 'd'));
+    }
 
     public function testGenerateRange()
     {