Convert iterators into arrays before mucking about with them.

$data['options'] might be an iterator. Convert it to an array before adding empty options or converting to option elements.
cakephp · Jan 8, 2014 · 462be3e · 462be3e
1 parent 9a8f6db
commit 462be3e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/Cake/View/Input/SelectBox.php b/Cake/View/Input/SelectBox.php
@@ -99,6 +99,10 @@ protected function _renderContent($data) {
 		$out = [];
 		$options = $data['options'];
 
+		if ($options instanceof Traversable) {
+			$options = iterator_to_array($options);
+		}
+
 		if (!empty($data['empty'])) {
 			$value = $data['empty'] === true ? '' : $data['empty'];
 			$options = ['' => $value] + $options;

diff --git a/Test/TestCase/View/Input/SelectBoxTest.php b/Test/TestCase/View/Input/SelectBoxTest.php
@@ -76,6 +76,30 @@ public function testRenderSimple() {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * test simple iterator rendering
+ *
+ * @return void
+ */
+	public function testRenderSimpleIterator() {
+		$select = new SelectBox($this->templates);
+		$options = new \ArrayObject(['a' => 'Albatross', 'b' => 'Budgie']);
+		$data = [
+			'name' => 'Birds[name]',
+			'options' => $options,
+			'empty' => true
+		];
+		$result = $select->render($data);
+		$expected = [
+			'select' => ['name' => 'Birds[name]'],
+			['option' => ['value' => '']], '/option',
+			['option' => ['value' => 'a']], 'Albatross', '/option',
+			['option' => ['value' => 'b']], 'Budgie', '/option',
+			'/select'
+		];
+		$this->assertTags($result, $expected);
+	}
+
 /**
  * test complex option rendering
  *