Add a test for using an Collection for options.

Traversable/Collection instances should work for options.
cakephp · Jan 11, 2014 · aa30d4b · aa30d4b
1 parent 3a14f83
commit aa30d4b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/View/Input/Radio.php b/src/View/Input/Radio.php
@@ -68,7 +68,12 @@ public function render($data) {
 			'label' => true,
 			'empty' => false,
 		];
-		$options = (array)$data['options'];
+		if ($data['options'] instanceof Traversable) {
+			$options = iterator_to_array($data['options']);
+		} else {
+			$options = (array)$data['options'];
+		}
+
 		$escape = $data['escape'];
 		if (!empty($data['empty'])) {
 			$empty = $data['empty'] === true ? 'empty' : $data['empty'];

diff --git a/tests/TestCase/View/Input/RadioTest.php b/tests/TestCase/View/Input/RadioTest.php
@@ -14,6 +14,7 @@
  */
 namespace Cake\Test\TestCase\View\Input;
 
+use Cake\Collection\Collection;
 use Cake\TestSuite\TestCase;
 use Cake\View\Input\Radio;
 use Cake\View\StringTemplate;
@@ -67,6 +68,13 @@ public function testRenderSimple() {
 			'/label',
 		];
 		$this->assertTags($result, $expected);
+
+		$data = [
+			'name' => 'Crayons[color]',
+			'options' => new Collection(['r' => 'Red', 'b' => 'Black'])
+		];
+		$result = $radio->render($data);
+		$this->assertTags($result, $expected);
 	}
 
 /**