Reduce the number of templates used.

By adding {{attrs}} I can re-add support for arbitrary properties on
option elements. As well as the [name => foo, value => bar] format for
option elements.

Author: markstory

Cake/View/Input/SelectBox.php

@@ -137,19 +137,19 @@ protected function _renderOptions($options, $disabled, $selected, $escape) {
 					'content' => implode('', $groupOptions)
 				]);
 			} else {
-				$template = 'option';
-				$isSelected = $this->_isSelected($key, $selected);
-				$isDisabled = $this->_isDisabled($key, $disabled);
-				if ($isSelected) {
-					$template .= 'Selected';
+				$optAttrs = [];
+				if ($this->_isSelected($key, $selected)) {
+					$optAttrs['selected'] = true;
 				}
-				if ($isDisabled) {
-					$template .= 'Disabled';
+				if ($this->_isDisabled($key, $disabled)) {
+					$optAttrs['disabled'] = true;
 				}
+				$optAttrs['escape'] = $escape;
 
-				$out[] = $this->_templates->format($template, [
+				$out[] = $this->_templates->format('option', [
 					'name' => $escape ? h($key) : $key,
 					'value' => $escape ? h($val) : $val,
+					'attrs' => $this->_templates->formatAttributes($optAttrs),
 				]);
 			}
 		}

Test/TestCase/View/Input/SelectBoxTest.php

@@ -27,10 +27,7 @@ public function setUp() {
 		parent::setUp();
 		$templates = [
 			'select' => '<select name="{{name}}"{{attrs}}>{{content}}</select>',
-			'option' => '<option value="{{name}}">{{value}}</option>',
-			'optionSelected' => '<option value="{{name}}" selected="selected">{{value}}</option>',
-			'optionDisabled' => '<option value="{{name}}" disabled="disabled">{{value}}</option>',
-			'optionSelectedDisabled' => '<option value="{{name}}" selected="selected" disabled="disabled">{{value}}</option>',
+			'option' => '<option value="{{name}}"{{attrs}}>{{value}}</option>',
 			'optgroup' => '<optgroup label="{{label}}">{{content}}</optgroup>',
 		];
 		$this->templates = new StringTemplate();