Merge pull request #2857 from markstory/3.0-select

3.0 select

src/View/Helper/FormHelper.php

@@ -176,6 +176,10 @@ class FormHelper extends Helper {
 		'hiddenblock' => '<div style="display:none;">{{content}}</div>',
 		'input' => '<input type="{{type}}" name="{{name}}"{{attrs}}>',
 		'label' => '<label{{attrs}}>{{text}}</label>',
+		'option' => '<option value="{{value}}"{{attrs}}>{{text}}</option>',
+		'optgroup' => '<optgroup label="{{label}}"{{attrs}}>{{content}}</optgroup>',
+		'select' => '<select name="{{name}}"{{attrs}}>{{content}}</select>',
+		'selectMultiple' => '<select name="{{name}}[]" multiple="multiple"{{attrs}}>{{content}}</select>',
 		'radio' => '<input type="radio" name="{{name}}" value="{{value}}"{{attrs}}>',
 		'radioContainer' => '{{input}}{{label}}',
 		'textarea' => '<textarea name="{{name}}"{{attrs}}>{{value}}</textarea>',
@@ -1801,15 +1805,12 @@ class FormHelper extends Helper {
  *
  * ### Attributes:
  *
- * - `showParents` - If included in the array and set to true, an additional option element
- *   will be added for the parent of each option group. You can set an option with the same name
- *   and it's key will be used for the value of the option.
  * - `multiple` - show a multiple select box. If set to 'checkbox' multiple checkboxes will be
  *   created instead.
  * - `empty` - If true, the empty select option is shown. If a string,
  *   that string is displayed as the empty element.
  * - `escape` - If true contents of options will be HTML entity encoded. Defaults to true.
- * - `value` The selected value of the input.
+ * - `val` The selected value of the input.
  * - `class` - When using multiple = checkbox the class name to apply to the divs. Defaults to 'checkbox'.
  * - `disabled` - Control the disabled attribute. When creating a select box, set to true to disable the
  *   select box. When creating checkboxes, `true` will disable all checkboxes. You can also set disabled
@@ -1836,9 +1837,6 @@ class FormHelper extends Helper {
  * $this->Form->select('Model.field', $options);
  * }}}
  *
- * In the above `2 => 'fred'` will not generate an option element. You should enable the `showParents`
- * attribute to show the fred option.
- *
  * If you have multiple options that need to have the same value attribute, you can
  * use an array of arrays to express this:
  *
@@ -1851,114 +1849,49 @@ class FormHelper extends Helper {
  *
  * @param string $fieldName Name attribute of the SELECT
  * @param array $options Array of the OPTION elements (as 'value'=>'Text' pairs) to be used in the
- *	SELECT element
+ *   SELECT element
  * @param array $attributes The HTML attributes of the select element.
  * @return string Formatted SELECT element
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#options-for-select-checkbox-and-radio-inputs
  */
-	public function select($fieldName, $options = array(), $attributes = array()) {
-		$select = array();
-		$style = null;
-		$tag = null;
-		$attributes += array(
-			'class' => null,
+	public function select($fieldName, $options = [], $attributes = []) {
+		$attributes += [
+			'disabled' => null,
 			'escape' => true,
-			'secure' => true,
-			'empty' => '',
-			'showParents' => false,
 			'hiddenField' => true,
-			'disabled' => false
-		);
-
-		$escapeOptions = $this->_extractOption('escape', $attributes);
-		$secure = $this->_extractOption('secure', $attributes);
-		$showEmpty = $this->_extractOption('empty', $attributes);
-		$showParents = $this->_extractOption('showParents', $attributes);
-		$hiddenField = $this->_extractOption('hiddenField', $attributes);
-		unset($attributes['escape'], $attributes['secure'], $attributes['empty'], $attributes['showParents'], $attributes['hiddenField']);
-		$id = $this->_extractOption('id', $attributes);
-
-		$attributes = $this->_initInputField($fieldName, array_merge(
-			(array)$attributes, array('secure' => static::SECURE_SKIP)
-		));
-
-		if (is_string($options) && isset($this->_options[$options])) {
-			$options = $this->_generateOptions($options);
-		} elseif (!is_array($options)) {
-			$options = array();
-		}
-		if (isset($attributes['type'])) {
-			unset($attributes['type']);
-		}
-
-		if (!empty($attributes['multiple'])) {
-			$style = ($attributes['multiple'] === 'checkbox') ? 'checkbox' : null;
-			$template = ($style) ? 'checkboxmultiplestart' : 'selectmultiplestart';
-			$tag = $template;
-			if ($hiddenField) {
-				$hiddenAttributes = array(
-					'value' => '',
-					'id' => $attributes['id'] . ($style ? '' : '_'),
-					'secure' => false,
-					'name' => $attributes['name']
-				);
-				$select[] = $this->hidden(null, $hiddenAttributes);
-			}
-		} else {
-			$tag = 'selectstart';
-		}
+			'multiple' => null,
+			'secure' => true,
+			'empty' => isset($attributes['multiple']) ? false : true
+		];
 
-		if ($tag === 'checkboxmultiplestart') {
-			unset($attributes['required']);
+		// Secure the field if there are options, or its a multi select.
+		// Single selects with no options don't submit, but multiselects do.
+		if (
+			$attributes['secure'] &&
+			empty($options) &&
+			empty($attributes['empty']) &&
+			empty($attributes['multiple'])
+		) {
+			$attributes['secure'] = false;
 		}
 
-		if (!empty($tag) || isset($template)) {
-			$hasOptions = (count($options) > 0 || $showEmpty);
-			// Secure the field if there are options, or its a multi select.
-			// Single selects with no options don't submit, but multiselects do.
-			if (
-				(!isset($secure) || $secure) &&
-				empty($attributes['disabled']) &&
-				(!empty($attributes['multiple']) || $hasOptions)
-			) {
-				$this->_secure(true, $this->_secureFieldName($attributes));
-			}
-			$select[] = $this->Html->useTag($tag, $attributes['name'], array_diff_key($attributes, array('name' => null, 'value' => null)));
-		}
-		$emptyMulti = (
-			$showEmpty !== null && $showEmpty !== false && !(
-				empty($showEmpty) && (isset($attributes) &&
-				array_key_exists('multiple', $attributes))
-			)
-		);
+		$attributes = $this->_initInputField($fieldName, $attributes);
+		$attributes['options'] = $options;
 
-		if ($emptyMulti) {
-			$showEmpty = ($showEmpty === true) ? '' : $showEmpty;
-			$options = array('' => $showEmpty) + $options;
+		$hidden = '';
+		if ($attributes['multiple'] && $attributes['hiddenField']) {
+			$hiddenAttributes = array(
+				'value' => '',
+				'secure' => false,
+			);
+			$hidden = $this->hidden($fieldName, $hiddenAttributes);
 		}
+		unset($attributes['hiddenField']);
 
-		if (!$id) {
-			$attributes['id'] = Inflector::camelize($attributes['id']);
+		if ($attributes['multiple'] === 'checkbox') {
+			// TODO add multi-checkbox.
 		}
-
-		$select = array_merge($select, $this->_selectOptions(
-			array_reverse($options, true),
-			array(),
-			$showParents,
-			array(
-				'escape' => $escapeOptions,
-				'style' => $style,
-				'name' => $attributes['name'],
-				'value' => $attributes['value'],
-				'class' => $attributes['class'],
-				'id' => $attributes['id'],
-				'disabled' => $attributes['disabled'],
-			)
-		));
-
-		$template = ($style === 'checkbox') ? 'checkboxmultipleend' : 'selectend';
-		$select[] = $this->Html->useTag($template);
-		return implode("\n", $select);
+		return $hidden . $this->widget('select', $attributes);
 	}
 
 /**
@@ -2826,11 +2759,11 @@ class FormHelper extends Helper {
 		if (strpos($options['name'], '[') === false) {
 			return [$options['name']];
 		}
-		preg_match_all('/\[(.*?)\]/', $options['name'], $matches);
-		if (isset($matches[1])) {
-			return $matches[1];
-		}
-		return null;
+		$parts = explode('[', $options['name']);
+		$parts = array_map(function($el) {
+			return trim($el, ']');
+		}, $parts);
+		return $parts;
 	}
 
 /**

tests/TestCase/View/Helper/FormHelperTest.php

@@ -4331,10 +4331,9 @@ class FormHelperTest extends TestCase {
  * @return void
  */
 	public function testSelect() {
-		$this->markTestIncomplete('Need to revisit once models work again.');
 		$result = $this->Form->select('Model.field', array());
 		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
+			'select' => array('name' => 'Model[field]'),
 			array('option' => array('value' => '')),
 			'/option',
 			'/select'
@@ -4344,7 +4343,7 @@ class FormHelperTest extends TestCase {
 		$this->Form->request->data = array('Model' => array('field' => 'value'));
 		$result = $this->Form->select('Model.field', array('value' => 'good', 'other' => 'bad'));
 		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
+			'select' => array('name' => 'Model[field]'),
 			array('option' => array('value' => '')),
 			'/option',
 			array('option' => array('value' => 'value', 'selected' => 'selected')),
@@ -4360,7 +4359,7 @@ class FormHelperTest extends TestCase {
 		$this->Form->request->data = array();
 		$result = $this->Form->select('Model.field', array('value' => 'good', 'other' => 'bad'));
 		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
+			'select' => array('name' => 'Model[field]'),
 			array('option' => array('value' => '')),
 			'/option',
 			array('option' => array('value' => 'value')),
@@ -4378,7 +4377,7 @@ class FormHelperTest extends TestCase {
 			array('empty' => false)
 		);
 		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
+			'select' => array('name' => 'Model[field]'),
 			array('option' => array('value' => 'first')),
 			'first "html" <chars>',
 			'/option',
@@ -4395,7 +4394,7 @@ class FormHelperTest extends TestCase {
 			array('escape' => false, 'empty' => false)
 		);
 		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
+			'select' => array('name' => 'Model[field]'),
 			array('option' => array('value' => 'first')),
 			'first "html" <chars>',
 			'/option',
@@ -4407,8 +4406,8 @@ class FormHelperTest extends TestCase {
 		$this->assertTags($result, $expected);
 
 		$options = array(
-			array('value' => 'first', 'name' => 'First'),
-			array('value' => 'first', 'name' => 'Another First'),
+			array('value' => 'first', 'text' => 'First'),
+			array('value' => 'first', 'text' => 'Another First'),
 		);
 		$result = $this->Form->select(
 			'Model.field',
@@ -4416,7 +4415,7 @@ class FormHelperTest extends TestCase {
 			array('escape' => false, 'empty' => false)
 		);
 		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
+			'select' => array('name' => 'Model[field]'),
 			array('option' => array('value' => 'first')),
 			'First',
 			'/option',
@@ -4435,7 +4434,7 @@ class FormHelperTest extends TestCase {
 		);
 
 		$expected = array(
-			'select' => array('name' => 'Model[contact_id]', 'id' => 'ModelContactId'),
+			'select' => array('name' => 'Model[contact_id]'),
 			array('option' => array('value' => '')), 'pick something', '/option',
 			array('option' => array('value' => '228', 'selected' => 'selected')), '228 value', '/option',
 			array('option' => array('value' => '228-1')), '228-1 value', '/option',
@@ -4447,30 +4446,29 @@ class FormHelperTest extends TestCase {
 		$this->Form->request->data['Model']['field'] = 0;
 		$result = $this->Form->select('Model.field', array('0' => 'No', '1' => 'Yes'));
 		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
+			'select' => array('name' => 'Model[field]'),
 			array('option' => array('value' => '')), '/option',
 			array('option' => array('value' => '0', 'selected' => 'selected')), 'No', '/option',
 			array('option' => array('value' => '1')), 'Yes', '/option',
 			'/select'
 		);
 		$this->assertTags($result, $expected);
+	}
 
-		$this->Form->request->data['Model']['field'] = 50;
-		$result = $this->Form->select('Model.field', array('50f5c0cf' => 'Stringy', '50' => 'fifty'));
-		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
-			array('option' => array('value' => '')), '/option',
-			array('option' => array('value' => '50f5c0cf')), 'Stringy', '/option',
-			array('option' => array('value' => '50', 'selected' => 'selected')), 'fifty', '/option',
-			'/select'
-		);
-		$this->assertTags($result, $expected);
-
-		$result = $this->Form->select('Contact.required_one', array('option A'));
+/**
+ * test select() with required and disabled attributes.
+ *
+ * @return void
+ */
+	public function testSelectRequired() {
+		$this->article['required'] = [
+			'user_id' => true
+		];
+		$this->Form->create($this->article);
+		$result = $this->Form->select('user_id', array('option A'));
 		$expected = array(
 			'select' => array(
-				'name' => 'data[Contact][required_one]',
-				'id' => 'ContactRequiredOne',
+				'name' => 'user_id',
 				'required' => 'required'
 			),
 			array('option' => array('value' => '')), '/option',
@@ -4479,11 +4477,10 @@ class FormHelperTest extends TestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$result = $this->Form->select('Contact.required_one', array('option A'), array('disabled' => true));
+		$result = $this->Form->select('user_id', array('option A'), array('disabled' => true));
 		$expected = array(
 			'select' => array(
-				'name' => 'data[Contact][required_one]',
-				'id' => 'ContactRequiredOne',
+				'name' => 'user_id',
 				'disabled' => 'disabled'
 			),
 			array('option' => array('value' => '')), '/option',
@@ -4494,69 +4491,6 @@ class FormHelperTest extends TestCase {
 	}
 
 /**
- * test that select() with optiongroups listens to the escape param.
- *
- * @return void
- */
-	public function testSelectOptionGroupEscaping() {
-		$this->markTestIncomplete('Need to revisit once models work again.');
-		$options = array(
-			'>< Key' => array(
-				1 => 'One',
-				2 => 'Two'
-			)
-		);
-		$result = $this->Form->select('Model.field', $options, array('empty' => false));
-		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
-			'optgroup' => array('label' => '&gt;&lt; Key'),
-			array('option' => array('value' => '1')), 'One', '/option',
-			array('option' => array('value' => '2')), 'Two', '/option',
-			'/optgroup',
-			'/select'
-		);
-		$this->assertTags($result, $expected);
-
-		$options = array(
-			'>< Key' => array(
-				1 => 'One',
-				2 => 'Two'
-			)
-		);
-		$result = $this->Form->select('Model.field', $options, array('empty' => false, 'escape' => false));
-		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
-			'optgroup' => array('label' => '>< Key'),
-			array('option' => array('value' => '1')), 'One', '/option',
-			array('option' => array('value' => '2')), 'Two', '/option',
-			'/optgroup',
-			'/select'
-		);
-		$this->assertTags($result, $expected);
-	}
-
-/**
- * Tests that FormHelper::select() allows null to be passed in the $attributes parameter
- *
- * @return void
- */
-	public function testSelectWithNullAttributes() {
-		$this->markTestIncomplete('Need to revisit once models work again.');
-		$result = $this->Form->select('Model.field', array('first', 'second'), array('empty' => false));
-		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
-			array('option' => array('value' => '0')),
-			'first',
-			'/option',
-			array('option' => array('value' => '1')),
-			'second',
-			'/option',
-			'/select'
-		);
-		$this->assertTags($result, $expected);
-	}
-
-/**
  * testNestedSelect method
  *
  * test select element generation with optgroups
@@ -4564,7 +4498,6 @@ class FormHelperTest extends TestCase {
  * @return void
  */
 	public function testNestedSelect() {
-		$this->markTestIncomplete('Need to revisit once models work again.');
 		$result = $this->Form->select(
 			'Model.field',
 			array(1 => 'One', 2 => 'Two', 'Three' => array(
@@ -4572,48 +4505,24 @@ class FormHelperTest extends TestCase {
 			)), array('empty' => false)
 		);
 		$expected = array(
-			'select' => array('name' => 'Model[field]',
-					'id' => 'ModelField'),
-					array('option' => array('value' => 1)),
-					'One',
-					'/option',
-					array('option' => array('value' => 2)),
-					'Two',
-					'/option',
-					array('optgroup' => array('label' => 'Three')),
-						array('option' => array('value' => 4)),
-						'Four',
-						'/option',
-						array('option' => array('value' => 5)),
-						'Five',
-						'/option',
-					'/optgroup',
-					'/select'
-					);
-		$this->assertTags($result, $expected);
-
-		$result = $this->Form->select(
-			'Model.field',
-			array(1 => 'One', 2 => 'Two', 'Three' => array(3 => 'Three', 4 => 'Four')),
-			array('showParents' => true, 'empty' => false)
-		);
-
-		$expected = array(
-			'select' => array('name' => 'Model[field]', 'id' => 'ModelField'),
-				array('option' => array('value' => 1)),
-				'One',
+			'select' => array('name' => 'Model[field]'),
+			array('option' => array('value' => 1)),
+			'One',
+			'/option',
+			array('option' => array('value' => 2)),
+			'Two',
+			'/option',
+			array('optgroup' => array('label' => 'Three')),
+				array('option' => array('value' => 3)),
+				'Three',
 				'/option',
-				array('option' => array('value' => 2)),
-				'Two',
+				array('option' => array('value' => 4)),
+				'Four',
 				'/option',
-				array('optgroup' => array('label' => 'Three')),
-					array('option' => array('value' => 3)),
-					'Three',
-					'/option',
-					array('option' => array('value' => 4)),
-					'Four',
-					'/option',
-				'/optgroup',
+				array('option' => array('value' => 5)),
+				'Five',
+				'/option',
+			'/optgroup',
 			'/select'
 		);
 		$this->assertTags($result, $expected);
@@ -4627,18 +4536,19 @@ class FormHelperTest extends TestCase {
  * @return void
  */
 	public function testSelectMultiple() {
-		$this->markTestIncomplete('Need to revisit once models work again.');
 		$options = array('first', 'second', 'third');
 		$result = $this->Form->select(
-			'Model.multi_field', $options, array('multiple' => true)
+			'Model.multi_field',
+			$options,
+			array('multiple' => true)
 		);
 		$expected = array(
 			'input' => array(
-				'type' => 'hidden', 'name' => 'Model[multi_field]', 'value' => '', 'id' => 'ModelMultiField_'
+				'type' => 'hidden', 'name' => 'Model[multi_field]', 'value' => ''
 			),
 			'select' => array(
 				'name' => 'Model[multi_field][]',
-				'id' => 'ModelMultiField', 'multiple' => 'multiple'
+				'multiple' => 'multiple'
 			),
 			array('option' => array('value' => '0')),
 			'first',
@@ -4654,26 +4564,9 @@ class FormHelperTest extends TestCase {
 		$this->assertTags($result, $expected);
 
 		$result = $this->Form->select(
-			'Model.multi_field', $options, array('multiple' => 'multiple')
-		);
-		$expected = array(
-			'input' => array(
-				'type' => 'hidden', 'name' => 'Model[multi_field]', 'value' => '', 'id' => 'ModelMultiField_'
-			),
-			'select' => array(
-				'name' => 'Model[multi_field][]',
-				'id' => 'ModelMultiField', 'multiple' => 'multiple'
-			),
-			array('option' => array('value' => '0')),
-			'first',
-			'/option',
-			array('option' => array('value' => '1')),
-			'second',
-			'/option',
-			array('option' => array('value' => '2')),
-			'third',
-			'/option',
-			'/select'
+			'Model.multi_field',
+			$options,
+			array('multiple' => 'multiple')
 		);
 		$this->assertTags($result, $expected);
 	}
@@ -4709,191 +4602,6 @@ class FormHelperTest extends TestCase {
 	}
 
 /**
- * Test generating multiple select with disabled elements.
- *
- * @return void
- */
-	public function testSelectMultipleWithDisabledElements() {
-		$this->markTestIncomplete('Need to revisit once models work again.');
-		$options = array(1 => 'One', 2 => 'Two', '3' => 'Three', '3x' => 'Stringy');
-		$disabled = array(2, 3);
-		$result = $this->Form->select('Contact.multiple', $options, array('multiple' => 'multiple', 'disabled' => $disabled));
-		$expected = array(
-			'input' => array(
-				'type' => 'hidden', 'name' => 'Contact[multiple]', 'value' => '', 'id' => 'ContactMultiple_'
-			),
-			'select' => array(
-				'name' => 'Contact[multiple][]', 'multiple' => 'multiple', 'id' => 'ContactMultiple'
-			),
-			array('option' => array('value' => '1')),
-			'One',
-			'/option',
-			array('option' => array('value' => '2', 'disabled' => 'disabled')),
-			'Two',
-			'/option',
-			array('option' => array('value' => '3', 'disabled' => 'disabled')),
-			'Three',
-			'/option',
-			array('option' => array('value' => '3x')),
-			'Stringy',
-			'/option',
-			'/select'
-		);
-		$this->assertTags($result, $expected);
-
-		$options = array(1 => 'One', 2 => 'Two', '3' => 'Three', '3x' => 'Stringy');
-		$disabled = array('2', '3x');
-		$result = $this->Form->input('Contact.multiple', array('multiple' => 'multiple', 'disabled' => $disabled, 'options' => $options));
-		$expected = array(
-			array('div' => array('class' => 'input select')),
-			array('label' => array('for' => 'ContactMultiple')),
-			'Multiple',
-			'/label',
-			'input' => array(
-				'type' => 'hidden', 'name' => 'Contact[multiple]', 'value' => '', 'id' => 'ContactMultiple_'
-			),
-			'select' => array(
-				'name' => 'Contact[multiple][]', 'multiple' => 'multiple', 'id' => 'ContactMultiple'
-			),
-			array('option' => array('value' => '1')),
-			'One',
-			'/option',
-			array('option' => array('value' => '2', 'disabled' => 'disabled')),
-			'Two',
-			'/option',
-			array('option' => array('value' => '3')),
-			'Three',
-			'/option',
-			array('option' => array('value' => '3x', 'disabled' => 'disabled')),
-			'Stringy',
-			'/option',
-			'/select',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
-		$options = array(1 => 'One', 2 => 'Two', '3' => 'Three', '3x' => 'Stringy');
-		$disabled = true;
-		$result = $this->Form->input('Contact.multiple', array('multiple' => 'multiple', 'disabled' => $disabled, 'options' => $options));
-		$expected = array(
-			array('div' => array('class' => 'input select')),
-			array('label' => array('for' => 'ContactMultiple')),
-			'Multiple',
-			'/label',
-			'input' => array(
-				'type' => 'hidden', 'name' => 'data[Contact][multiple]', 'value' => '', 'id' => 'ContactMultiple_'
-			),
-			'select' => array(
-				'name' => 'data[Contact][multiple][]', 'disabled' => 'disabled', 'multiple' => 'multiple', 'id' => 'ContactMultiple'
-			),
-			array('option' => array('value' => '1')),
-			'One',
-			'/option',
-			array('option' => array('value' => '2')),
-			'Two',
-			'/option',
-			array('option' => array('value' => '3')),
-			'Three',
-			'/option',
-			array('option' => array('value' => '3x')),
-			'Stringy',
-			'/option',
-			'/select',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-	}
-
-/**
- * Test generating select with disabled elements.
- *
- * @return void
- */
-	public function testSelectWithDisabledElements() {
-		$this->markTestIncomplete('Need to revisit once models work again.');
-		$options = array(1 => 'One', 2 => 'Two', '3' => 'Three', '3x' => 'Stringy');
-		$disabled = array(2, 3);
-		$result = $this->Form->select('Model.field', $options, array('disabled' => $disabled));
-		$expected = array(
-			'select' => array(
-				'name' => 'data[Model][field]', 'id' => 'ModelField'
-			),
-			array('option' => array('value' => '')),
-			'/option',
-			array('option' => array('value' => '1')),
-			'One',
-			'/option',
-			array('option' => array('value' => '2', 'disabled' => 'disabled')),
-			'Two',
-			'/option',
-			array('option' => array('value' => '3', 'disabled' => 'disabled')),
-			'Three',
-			'/option',
-			array('option' => array('value' => '3x')),
-			'Stringy',
-			'/option',
-			'/select'
-		);
-		$this->assertTags($result, $expected);
-
-		$options = array(1 => 'One', 2 => 'Two', '3' => 'Three', '3x' => 'Stringy');
-		$disabled = array('2', '3x');
-		$result = $this->Form->input('Model.field', array('disabled' => $disabled, 'options' => $options));
-		$expected = array(
-			array('div' => array('class' => 'input select')),
-			array('label' => array('for' => 'ModelField')),
-			'Field',
-			'/label',
-			'select' => array(
-				'name' => 'data[Model][field]', 'id' => 'ModelField'
-			),
-			array('option' => array('value' => '1')),
-			'One',
-			'/option',
-			array('option' => array('value' => '2', 'disabled' => 'disabled')),
-			'Two',
-			'/option',
-			array('option' => array('value' => '3')),
-			'Three',
-			'/option',
-			array('option' => array('value' => '3x', 'disabled' => 'disabled')),
-			'Stringy',
-			'/option',
-			'/select',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
-		$options = array(1 => 'One', 2 => 'Two', '3' => 'Three', '3x' => 'Stringy');
-		$disabled = true;
-		$result = $this->Form->input('Model.field', array('disabled' => $disabled, 'options' => $options));
-		$expected = array(
-			array('div' => array('class' => 'input select')),
-			array('label' => array('for' => 'ModelField')),
-			'Field',
-			'/label',
-			'select' => array(
-				'name' => 'data[Model][field]', 'id' => 'ModelField', 'disabled' => 'disabled'
-			),
-			array('option' => array('value' => '1')),
-			'One',
-			'/option',
-			array('option' => array('value' => '2')),
-			'Two',
-			'/option',
-			array('option' => array('value' => '3')),
-			'Three',
-			'/option',
-			array('option' => array('value' => '3x')),
-			'Stringy',
-			'/option',
-			'/select',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-	}
-
-/**
  * test generation of habtm select boxes.
  *
  * @return void
@@ -5306,8 +5014,7 @@ class FormHelperTest extends TestCase {
  * @return void
  */
 	public function testSelectMultipleSecureWithNoOptions() {
-		$this->markTestIncomplete('Need to revisit once models work again.');
-		$this->Form->request->params['_csrfToken'] = 'testkey';
+		$this->Form->request->params['_Token'] = 'testkey';
 		$this->assertEquals(array(), $this->Form->fields);
 
 		$this->Form->select(

tests/TestCase/View/Widget/SelectBoxTest.php

@@ -285,6 +285,51 @@ class SelectBoxTest extends TestCase {
 	}
 
 /**
+ * test rendering with option groups and escaping
+ *
+ * @return void
+ */
+	public function testRenderOptionGroupsEscape() {
+		$select = new SelectBox($this->templates);
+		$data = [
+			'name' => 'Birds[name]',
+			'options' => [
+				'>XSS<' => [
+					'1' => 'One>',
+				],
+			]
+		];
+		$result = $select->render($data);
+		$expected = [
+			'select' => [
+				'name' => 'Birds[name]',
+			],
+			['optgroup' => ['label' => '&gt;XSS&lt;']],
+			['option' => ['value' => '1']],
+			'One&gt;',
+			'/option',
+			'/optgroup',
+			'/select'
+		];
+		$this->assertTags($result, $expected);
+
+		$data['escape'] = false;
+		$result = $select->render($data);
+		$expected = [
+			'select' => [
+				'name' => 'Birds[name]',
+			],
+			['optgroup' => ['label' => '>XSS<']],
+			['option' => ['value' => '1']],
+			'One>',
+			'/option',
+			'/optgroup',
+			'/select'
+		];
+		$this->assertTags($result, $expected);
+	}
+
+/**
  * test rendering with option groups
  *
  * @return void