Helpers::prepareAttrs() fixed

nette · May 13, 2020 · 5297f35 · 5297f35
1 parent 9810d26
commit 5297f35
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Forms/Helpers.php b/src/Forms/Helpers.php
@@ -207,15 +207,15 @@ private static function prepareAttrs(?array $attrs, string $name): array
 	{
 		$dynamic = [];
 		foreach ((array) $attrs as $k => $v) {
-			$p = str_split($k, strlen($k) - 1);
-			if ($p[1] === '?' || $p[1] === ':') {
-				unset($attrs[$k], $attrs[$p[0]]);
-				if ($p[1] === '?') {
-					$dynamic[$p[0]] = array_fill_keys((array) $v, true);
+			if ($k[-1] === '?' || $k[-1] === ':') {
+				$p = substr($k, 0, -1);
+				unset($attrs[$k], $attrs[$p]);
+				if ($k[-1] === '?') {
+					$dynamic[$p] = array_fill_keys((array) $v, true);
 				} elseif (is_array($v) && $v) {
-					$dynamic[$p[0]] = $v;
+					$dynamic[$p] = $v;
 				} else {
-					$attrs[$p[0]] = $v;
+					$attrs[$p] = $v;
 				}
 			}
 		}

diff --git a/tests/Forms/Helpers.createSelectBox.phpt b/tests/Forms/Helpers.createSelectBox.phpt
@@ -58,14 +58,15 @@ test(function () {
 	);
 
 	Assert::same(
-		'<select><option title="Hello" style="color:blue" value="a" selected>First</option><option title="Hello" style="color:blue" value="b" disabled>Second</option></select>',
+		'<select><option title="Hello" style="color:blue" a="b" value="a" selected>First</option><option title="Hello" style="color:blue" a="b" value="b" disabled>Second</option></select>',
 		(string) Helpers::createSelectBox(
 			['a' => 'First', 'b' => 'Second'],
 			[
 				'disabled:' => ['b' => true],
 				'selected?' => ['a'],
 				'title' => 'Hello',
 				'style' => ['color' => 'blue'],
+				'a' => 'b',
 			]
 		)
 	);