Rename nested to nesting.

cakephp · Oct 20, 2014 · e9f4489 · e9f4489
1 parent b66577f
commit e9f4489
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 39 deletions.
diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
@@ -96,7 +96,7 @@ class FormHelper extends Helper {
 			'inputContainer' => '<div class="input {{type}}{{required}}">{{content}}</div>',
 			'inputContainerError' => '<div class="input {{type}}{{required}} error">{{content}}{{error}}</div>',
 			'label' => '<label{{attrs}}>{{text}}</label>',
-			'nestedLabel' => '<label{{attrs}}>{{input}}{{text}}</label>',
+			'nestingLabel' => '<label{{attrs}}>{{input}}{{text}}</label>',
 			'legend' => '<legend>{{text}}</legend>',
 			'option' => '<option value="{{value}}"{{attrs}}>{{text}}</option>',
 			'optgroup' => '<optgroup label="{{label}}"{{attrs}}>{{content}}</optgroup>',
@@ -744,7 +744,7 @@ public function label($fieldName, $text = null, array $options = []) {
 			'text' => $text,
 		];
 		if (isset($options['input'])) {
-			return $this->widget('nestedLabel', $attrs);
+			return $this->widget('nestingLabel', $attrs);
 		}
 		return $this->widget('label', $attrs);
 	}

diff --git a/src/View/Widget/NestedLabel.php b/src/View/Widget/NestedLabel.php
diff --git a/src/View/Widget/WidgetRegistry.php b/src/View/Widget/WidgetRegistry.php
@@ -48,9 +48,9 @@ class WidgetRegistry {
 		'checkbox' => ['Cake\View\Widget\Checkbox'],
 		'file' => ['Cake\View\Widget\File'],
 		'label' => ['Cake\View\Widget\Label'],
-		'nestedLabel' => ['Cake\View\Widget\NestedLabel'],
-		'multicheckbox' => ['Cake\View\Widget\MultiCheckbox', 'nestedLabel'],
-		'radio' => ['Cake\View\Widget\Radio', 'nestedLabel'],
+		'nestingLabel' => ['Cake\View\Widget\NestingLabel'],
+		'multicheckbox' => ['Cake\View\Widget\MultiCheckbox', 'nestingLabel'],
+		'radio' => ['Cake\View\Widget\Radio', 'nestingLabel'],
 		'select' => ['Cake\View\Widget\SelectBox'],
 		'textarea' => ['Cake\View\Widget\Textarea'],
 		'datetime' => ['Cake\View\Widget\DateTime', 'select'],