Fix #44: Fix error in Html::renderSelectOptions when use "encode" as key in items array

vjik · web-flow · commit fbbe2cf30a9e · 2020-12-01T02:38:50.000+03:00
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.4",
-        "roave/infection-static-analysis-plugin": "^1.5",
+        "roave/infection-static-analysis-plugin": "^1.6",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.2"
     },
diff --git a/src/Html.php b/src/Html.php
@@ -1417,8 +1417,6 @@ public static function renderSelectOptions($selection, array $items, array &$tag
         $options = $tagOptions['options'] ?? [];
         $groups = $tagOptions['groups'] ?? [];
         unset($tagOptions['prompt'], $tagOptions['options'], $tagOptions['groups']);
-        $options['encodeSpaces'] = ArrayHelper::getValue($options, 'encodeSpaces', $encodeSpaces);
-        $options['encode'] = ArrayHelper::getValue($options, 'encode', $encode);
 
         foreach ($items as $key => $value) {
             if (is_array($value)) {
diff --git a/tests/HtmlTest.php b/tests/HtmlTest.php
@@ -1015,6 +1015,17 @@ public function testRenderSelectOptions(): void
             ],
         ];
         $this->assertSameWithoutLE($expected, Html::renderSelectOptions(1, $data, $attributes));
+
+        $expected = <<<'EOD'
+<option value="encode">1</option>
+<option value="encodeSpaces">2</option>
+EOD;
+        $data = ['encode' => 1, 'encodeSpaces' => 2];
+        $attributes = [
+            'encode' => true,
+            'encodeSpaces' => false,
+        ];
+        $this->assertSameWithoutLE($expected, Html::renderSelectOptions(null, $data, $attributes));
     }
 
     public function testRenderAttributes(): void
