RadioList & CheckboxList: getControlPart() normalizes key type [Closes #76][Closes #78]

Author: dg

src/Forms/Controls/CheckboxList.php

@@ -82,6 +82,7 @@ public function getSeparatorPrototype()
 	 */
 	public function getControlPart($key)
 	{
+		$key = key(array((string) $key => NULL));
 		return parent::getControl()->addAttributes(array(
 			'id' => $this->getHtmlId() . '-' . $key,
 			'checked' => in_array($key, (array) $this->value, TRUE),

src/Forms/Controls/RadioList.php

@@ -136,6 +136,7 @@ public function getLabel($caption = NULL)
 	 */
 	public function getControlPart($key)
 	{
+		$key = key(array((string) $key => NULL));
 		return parent::getControl()->addAttributes(array(
 			'id' => $this->getHtmlId() . '-' . $key,
 			'checked' => in_array($key, (array) $this->value, TRUE),

tests/Forms/Controls.CheckboxList.render.phpt

@@ -142,3 +142,14 @@ test(function() { // disabled one
 	Assert::same('<label><input type="checkbox" name="list[]" disabled value="a">First</label><br><label><input type="checkbox" name="list[]" value="0">Second</label>', $input->getControl());
 	Assert::same('<input type="checkbox" name="list[]" id="frm-list-a" disabled value="a">', (string) $input->getControlPart('a'));
 });
+
+
+test(function() { // numeric key as string & getControlPart
+	$form = new Form;
+	$input = $form->addCheckboxList('list', 'Label', array(
+		1 => 'First',
+		2 => 'Second',
+	))->setDefaultValue(1);
+
+	Assert::same('<input type="checkbox" name="list[]" id="frm-list-1" checked value="1">', (string) $input->getControlPart('1'));
+});

tests/Forms/Controls.RadioList.render.phpt

@@ -166,3 +166,14 @@ test(function() { // forced ID
 
 	Assert::same('<label for="frm-list-a"><input type="radio" name="list" id="frm-list-a" value="a">First</label><br><label for="frm-list-0"><input type="radio" name="list" id="frm-list-0" value="0">Second</label>', (string) $input->getControl());
 });
+
+
+test(function() { // numeric key as string & getControlPart
+	$form = new Form;
+	$input = $form->addRadioList('list', 'Label', array(
+		1 => 'First',
+		2 => 'Second',
+	))->setDefaultValue(1);
+
+	Assert::same('<input type="radio" name="list" id="frm-list-1" checked value="1">', (string) $input->getControlPart('1'));
+});