Make keys consistent with attributes.

Having the value attribute use the name key is silly. It also makes life
hard when trying to make radio + select boxes use the same data format.
Use 'value' and 'text' instead, as they match the attributes/DOM names
and don't conflict in the case of radio buttons.

Cake/View/Input/SelectBox.php

@@ -73,11 +73,11 @@ public function __construct($templates) {
  *
  * {{{
  * 'options' => [
- *   ['name' => 'elk', 'value' => 'Elk', 'data-foo' => 'bar'],
+ *   ['value' => 'elk', 'text' => 'Elk', 'data-foo' => 'bar'],
  * ]
  * }}}
  *
- * This form **requires** that both the `name` and `value` keys be defined.
+ * This form **requires** that both the `value` and `text` keys be defined.
  * If either is not set options will not be generated correctly.
  *
  * If you need to define option groups you can do those using nested arrays:
@@ -97,7 +97,7 @@ public function __construct($templates) {
  * {{{
  * 'options' => [
  *   [
- *     'name' => 'Mammals',
+ *     'text' => 'Mammals',
  *     'data-id' => 1,
  *     'options' => [
  *       'elk' => 'Elk',
@@ -184,17 +184,17 @@ protected function _renderContent($data) {
 	protected function _renderOptgroup($label, $optgroup, $disabled, $selected, $escape) {
 		$opts = $optgroup;
 		$attrs = [];
-		if (isset($optgroup['options'], $optgroup['name'])) {
+		if (isset($optgroup['options'], $optgroup['text'])) {
 			$opts = $optgroup['options'];
-			$label = $optgroup['name'];
+			$label = $optgroup['text'];
 			$attrs = $optgroup;
 		}
 		$groupOptions = $this->_renderOptions($opts, $disabled, $selected, $escape);
 
 		return $this->_templates->format('optgroup', [
 			'label' => $escape ? h($label) : $label,
 			'content' => implode('', $groupOptions),
-			'attrs' => $this->_templates->formatAttributes($attrs, ['name', 'options']),
+			'attrs' => $this->_templates->formatAttributes($attrs, ['text', 'options']),
 		]);
 	}
 
@@ -224,10 +224,10 @@ protected function _renderOptions($options, $disabled, $selected, $escape) {
 
 			// Basic options
 			$optAttrs = [
-				'name' => $key,
-				'value' => $val,
+				'value' => $key,
+				'text' => $val,
 			];
-			if (is_array($val) && isset($optAttrs['name'], $optAttrs['value'])) {
+			if (is_array($val) && isset($optAttrs['text'], $optAttrs['value'])) {
 				$optAttrs = $val;
 			}
 			if ($this->_isSelected($key, $selected)) {
@@ -239,9 +239,9 @@ protected function _renderOptions($options, $disabled, $selected, $escape) {
 			$optAttrs['escape'] = $escape;
 
 			$out[] = $this->_templates->format('option', [
-				'name' => $escape ? h($optAttrs['name']) : $optAttrs['name'],
 				'value' => $escape ? h($optAttrs['value']) : $optAttrs['value'],
-				'attrs' => $this->_templates->formatAttributes($optAttrs, ['name', 'value']),
+				'text' => $escape ? h($optAttrs['text']) : $optAttrs['text'],
+				'attrs' => $this->_templates->formatAttributes($optAttrs, ['text', 'value']),
 			]);
 		}
 		return $out;

Test/TestCase/View/Input/SelectBoxTest.php

@@ -28,7 +28,7 @@ public function setUp() {
 		$templates = [
 			'select' => '<select name="{{name}}"{{attrs}}>{{content}}</select>',
 			'selectMultiple' => '<select name="{{name}}[]" multiple="multiple"{{attrs}}>{{content}}</select>',
-			'option' => '<option value="{{name}}"{{attrs}}>{{value}}</option>',
+			'option' => '<option value="{{value}}"{{attrs}}>{{text}}</option>',
 			'optgroup' => '<optgroup label="{{label}}"{{attrs}}>{{content}}</optgroup>',
 		];
 		$this->templates = new StringTemplate();
@@ -112,8 +112,8 @@ public function testRenderComplex() {
 			'id' => 'BirdName',
 			'name' => 'Birds[name]',
 			'options' => [
-				['name' => 'a', 'value' => 'Albatross'],
-				['name' => 'b', 'value' => 'Budgie', 'data-foo' => 'bar'],
+				['value' => 'a', 'text' => 'Albatross'],
+				['value' => 'b', 'text' => 'Budgie', 'data-foo' => 'bar'],
 			]
 		];
 		$result = $select->render($data);
@@ -210,7 +210,7 @@ public function testRenderMultipleSelected() {
 		$data = [
 			'multiple' => true,
 			'id' => 'BirdName',
-			'name' => 'Birds[name][]',
+			'name' => 'Birds[name]',
 			'value' => ['1', '2', 'burp'],
 			'options' => [
 				1 => 'one',
@@ -292,7 +292,7 @@ public function testRenderOptionGroupsWithAttributes() {
 			'name' => 'Birds[name]',
 			'options' => [
 				[
-					'name' => 'Mammal',
+					'text' => 'Mammal',
 					'data-foo' => 'bar',
 					'options' => [
 						'beaver' => 'Beaver',