Add "Widget" suffix to widget classes.

src/View/Widget/Basic.php → src/View/Widget/BasicWidget.php

@@ -24,7 +24,7 @@
  * input elements like hidden, text, email, tel and other
  * types.
  */
-class Basic implements WidgetInterface {
+class BasicWidget implements WidgetInterface {
 
 /**
  * StringTemplate instance.

src/View/Widget/Button.php → src/View/Widget/ButtonWidget.php

@@ -24,7 +24,7 @@
  * If you need to make basic submit inputs with type=submit,
  * use the Basic input widget.
  */
-class Button implements WidgetInterface {
+class ButtonWidget implements WidgetInterface {
 
 /**
  * StringTemplate instance.

src/View/Widget/Checkbox.php → src/View/Widget/CheckboxWidget.php

@@ -20,7 +20,7 @@
 /**
  * Input widget for creating checkbox widgets.
  */
-class Checkbox implements WidgetInterface {
+class CheckboxWidget implements WidgetInterface {
 
 /**
  * Template instance.

src/View/Widget/DateTime.php → src/View/Widget/DateTimeWidget.php

@@ -16,7 +16,7 @@
 
 use Cake\View\Form\ContextInterface;
 use Cake\View\StringTemplate;
-use Cake\View\Widget\SelectBox;
+use Cake\View\Widget\SelectBoxWidget;
 use Cake\View\Widget\WidgetInterface;
 
 /**
@@ -25,7 +25,7 @@
  * This class is intended as an internal implementation detail
  * of Cake\View\Helper\FormHelper and is not intended for direct use.
  */
-class DateTime implements WidgetInterface {
+class DateTimeWidget implements WidgetInterface {
 
 /**
  * Select box widget.
@@ -60,9 +60,9 @@ class DateTime implements WidgetInterface {
  * Constructor
  *
  * @param \Cake\View\StringTemplate $templates Templates list.
- * @param \Cake\View\Widget\SelectBox $selectBox Selectbox widget instance.
+ * @param \Cake\View\Widget\SelectBoxWidget $selectBox Selectbox widget instance.
  */
-	public function __construct(StringTemplate $templates, SelectBox $selectBox) {
+	public function __construct(StringTemplate $templates, SelectBoxWidget $selectBox) {
 		$this->_select = $selectBox;
 		$this->_templates = $templates;
 	}

src/View/Widget/File.php → src/View/Widget/FileWidget.php

@@ -23,7 +23,7 @@
  * This class is intended as an internal implementation detail
  * of Cake\View\Helper\FormHelper and is not intended for direct use.
  */
-class File implements WidgetInterface {
+class FileWidget implements WidgetInterface {
 
 /**
  * Constructor

src/View/Widget/Label.php → src/View/Widget/LabelWidget.php

@@ -23,7 +23,7 @@
  * Generally this element is used by other widgets,
  * and FormHelper itself.
  */
-class Label implements WidgetInterface {
+class LabelWidget implements WidgetInterface {
 
 /**
  * Templates

src/View/Widget/MultiCheckbox.php → src/View/Widget/MultiCheckboxWidget.php

@@ -22,7 +22,7 @@
  * Input widget class for generating multiple checkboxes.
  *
  */
-class MultiCheckbox implements WidgetInterface {
+class MultiCheckboxWidget implements WidgetInterface {
 
 	use IdGeneratorTrait;
 

src/View/Widget/NestingLabel.php → src/View/Widget/NestingLabelWidget.php

@@ -14,15 +14,15 @@
  */
 namespace Cake\View\Widget;
 
-use Cake\View\Widget\Label;
+use Cake\View\Widget\LabelWidget;
 
 /**
  * Form 'widget' for creating labels that contain their input.
  *
  * Generally this element is used by other widgets,
  * and FormHelper itself.
  */
-class NestingLabel extends Label {
+class NestingLabelWidget extends LabelWidget {
 
 /**
  * The template to use.

src/View/Widget/Radio.php → src/View/Widget/RadioWidget.php

@@ -25,7 +25,7 @@
  * This class is intended as an internal implementation detail
  * of Cake\View\Helper\FormHelper and is not intended for direct use.
  */
-class Radio implements WidgetInterface {
+class RadioWidget implements WidgetInterface {
 
 	use IdGeneratorTrait;
 

src/View/Widget/SelectBox.php → src/View/Widget/SelectBoxWidget.php

@@ -24,7 +24,7 @@
  * This class is intended as an internal implementation detail
  * of Cake\View\Helper\FormHelper and is not intended for direct use.
  */
-class SelectBox implements WidgetInterface {
+class SelectBoxWidget implements WidgetInterface {
 
 /**
  * Template instance.

src/View/Widget/Textarea.php → src/View/Widget/TextareaWidget.php

@@ -23,7 +23,7 @@
  * This class is intended as an internal implementation detail
  * of Cake\View\Helper\FormHelper and is not intended for direct use.
  */
-class Textarea implements WidgetInterface {
+class TextareaWidget implements WidgetInterface {
 
 /**
  * Constructor

src/View/Widget/WidgetRegistry.php

@@ -44,17 +44,17 @@ class WidgetRegistry {
  * @var array
  */
 	protected $_widgets = [
-		'button' => ['Cake\View\Widget\Button'],
-		'checkbox' => ['Cake\View\Widget\Checkbox'],
-		'file' => ['Cake\View\Widget\File'],
-		'label' => ['Cake\View\Widget\Label'],
-		'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'],
-		'_default' => ['Cake\View\Widget\Basic'],
+		'button' => ['Cake\View\Widget\ButtonWidget'],
+		'checkbox' => ['Cake\View\Widget\CheckboxWidget'],
+		'file' => ['Cake\View\Widget\FileWidget'],
+		'label' => ['Cake\View\Widget\LabelWidget'],
+		'nestingLabel' => ['Cake\View\Widget\NestingLabelWidget'],
+		'multicheckbox' => ['Cake\View\Widget\MultiCheckboxWidget', 'nestingLabel'],
+		'radio' => ['Cake\View\Widget\RadioWidget', 'nestingLabel'],
+		'select' => ['Cake\View\Widget\SelectBoxWidget'],
+		'textarea' => ['Cake\View\Widget\TextareaWidget'],
+		'datetime' => ['Cake\View\Widget\DateTimeWidget', 'select'],
+		'_default' => ['Cake\View\Widget\BasicWidget'],
 	];
 
 /**
@@ -179,7 +179,7 @@ protected function _resolveWidget($widget) {
 		}
 
 		$class = array_shift($widget);
-		$className = App::className($class, 'View/Widget');
+		$className = App::className($class, 'View/Widget', 'Widget');
 		if ($className === false || !class_exists($className)) {
 			throw new \RuntimeException(sprintf('Unable to locate widget class "%s"', $class));
 		}

tests/TestCase/View/Widget/BasicTest.php → tests/TestCase/View/Widget/BasicWidgetTest.php

@@ -16,12 +16,12 @@
 
 use Cake\TestSuite\TestCase;
 use Cake\View\StringTemplate;
-use Cake\View\Widget\Basic;
+use Cake\View\Widget\BasicWidget;
 
 /**
  * Basic input test.
  */
-class BasicTest extends TestCase {
+class BasicWidgetTest extends TestCase {
 
 	public function setUp() {
 		parent::setUp();
@@ -38,7 +38,7 @@ public function setUp() {
  * @return void
  */
 	public function testRenderSimple() {
-		$text = new Basic($this->templates);
+		$text = new BasicWidget($this->templates);
 		$result = $text->render(['name' => 'my_input'], $this->context);
 		$expected = [
 			'input' => ['type' => 'text', 'name' => 'my_input']
@@ -52,7 +52,7 @@ public function testRenderSimple() {
  * @return void
  */
 	public function testRenderType() {
-		$text = new Basic($this->templates);
+		$text = new BasicWidget($this->templates);
 		$data = [
 			'name' => 'my_input',
 			'type' => 'email',
@@ -70,7 +70,7 @@ public function testRenderType() {
  * @return void
  */
 	public function testRenderWithValue() {
-		$text = new Basic($this->templates);
+		$text = new BasicWidget($this->templates);
 		$data = [
 			'name' => 'my_input',
 			'type' => 'email',
@@ -93,7 +93,7 @@ public function testRenderWithValue() {
  * @return void
  */
 	public function testRenderAttributes() {
-		$text = new Basic($this->templates);
+		$text = new BasicWidget($this->templates);
 		$data = [
 			'name' => 'my_input',
 			'type' => 'email',

tests/TestCase/View/Widget/ButtonTest.php → tests/TestCase/View/Widget/ButtonWidgetTest.php

@@ -16,12 +16,12 @@
 
 use Cake\TestSuite\TestCase;
 use Cake\View\StringTemplate;
-use Cake\View\Widget\Button;
+use Cake\View\Widget\ButtonWidget;
 
 /**
  * Basic input test.
  */
-class ButtonTest extends TestCase {
+class ButtonWidgetTest extends TestCase {
 
 	public function setUp() {
 		parent::setUp();
@@ -38,7 +38,7 @@ public function setUp() {
  * @return void
  */
 	public function testRenderSimple() {
-		$button = new Button($this->templates);
+		$button = new ButtonWidget($this->templates);
 		$result = $button->render(['name' => 'my_input'], $this->context);
 		$expected = [
 			'button' => ['type' => 'submit', 'name' => 'my_input'],
@@ -53,7 +53,7 @@ public function testRenderSimple() {
  * @return void
  */
 	public function testRenderType() {
-		$button = new Button($this->templates);
+		$button = new ButtonWidget($this->templates);
 		$data = [
 			'name' => 'my_input',
 			'type' => 'button',
@@ -74,7 +74,7 @@ public function testRenderType() {
  * @return void
  */
 	public function testRenderWithText() {
-		$button = new Button($this->templates);
+		$button = new ButtonWidget($this->templates);
 		$data = [
 			'text' => 'Some <value>'
 		];
@@ -102,7 +102,7 @@ public function testRenderWithText() {
  * @return void
  */
 	public function testRenderAttributes() {
-		$button = new Button($this->templates);
+		$button = new ButtonWidget($this->templates);
 		$data = [
 			'name' => 'my_input',
 			'text' => 'Go',

tests/TestCase/View/Widget/CheckboxTest.php → tests/TestCase/View/Widget/CheckboxWidgetTest.php

@@ -16,12 +16,12 @@
 
 use Cake\TestSuite\TestCase;
 use Cake\View\StringTemplate;
-use Cake\View\Widget\Checkbox;
+use Cake\View\Widget\CheckboxWidget;
 
 /**
  * Checkbox test case
  */
-class CheckboxTest extends TestCase {
+class CheckboxWidgetTest extends TestCase {
 
 /**
  * setup method.
@@ -43,7 +43,7 @@ public function setUp() {
  * @return void
  */
 	public function testRenderSimple() {
-		$checkbox = new Checkbox($this->templates);
+		$checkbox = new CheckboxWidget($this->templates);
 		$data = [
 			'name' => 'Comment[spam]',
 		];
@@ -78,7 +78,7 @@ public function testRenderSimple() {
  * @return void
  */
 	public function testRenderDisabled() {
-		$checkbox = new Checkbox($this->templates);
+		$checkbox = new CheckboxWidget($this->templates);
 		$data = [
 			'name' => 'Comment[spam]',
 			'disabled' => true,
@@ -101,7 +101,7 @@ public function testRenderDisabled() {
  * @return void
  */
 	public function testRenderChecked() {
-		$checkbox = new Checkbox($this->templates);
+		$checkbox = new CheckboxWidget($this->templates);
 		$data = [
 			'name' => 'Comment[spam]',
 			'value' => 1,
@@ -167,7 +167,7 @@ public static function checkedProvider() {
  * @return void
  */
 	public function testRenderCheckedValue($checked) {
-		$checkbox = new Checkbox($this->templates);
+		$checkbox = new CheckboxWidget($this->templates);
 		$data = [
 			'name' => 'Comment[spam]',
 			'value' => 1,
@@ -207,7 +207,7 @@ public static function uncheckedProvider() {
  * @return void
  */
 	public function testRenderUnCheckedValue($checked) {
-		$checkbox = new Checkbox($this->templates);
+		$checkbox = new CheckboxWidget($this->templates);
 		$data = [
 			'name' => 'Comment[spam]',
 			'value' => 1,

tests/TestCase/View/Widget/DateTimeTest.php → tests/TestCase/View/Widget/DateTimeWidgetTest.php

@@ -16,13 +16,13 @@
 
 use Cake\TestSuite\TestCase;
 use Cake\View\StringTemplate;
-use Cake\View\Widget\DateTime;
-use Cake\View\Widget\SelectBox;
+use Cake\View\Widget\DateTimeWidget;
+use Cake\View\Widget\SelectBoxWidget;
 
 /**
  * DateTime input test case
  */
-class DateTimeTest extends TestCase {
+class DateTimeWidgetTest extends TestCase {
 
 /**
  * @setUp
@@ -39,8 +39,8 @@ public function setUp() {
 		];
 		$this->templates = new StringTemplate($templates);
 		$this->context = $this->getMock('Cake\View\Form\ContextInterface');
-		$this->selectBox = new SelectBox($this->templates);
-		$this->DateTime = new DateTime($this->templates, $this->selectBox);
+		$this->selectBox = new SelectBoxWidget($this->templates);
+		$this->DateTime = new DateTimeWidget($this->templates, $this->selectBox);
 	}
 
 /**

tests/TestCase/View/Widget/FileTest.php → tests/TestCase/View/Widget/FileWidgetTest.php

@@ -16,12 +16,12 @@
 
 use Cake\TestSuite\TestCase;
 use Cake\View\StringTemplate;
-use Cake\View\Widget\File;
+use Cake\View\Widget\FileWidget;
 
 /**
  * File input test.
  */
-class FileTest extends TestCase {
+class FileWidgetTest extends TestCase {
 
 /**
  * setup
@@ -43,7 +43,7 @@ public function setUp() {
  * @return void
  */
 	public function testRenderSimple() {
-		$input = new File($this->templates);
+		$input = new FileWidget($this->templates);
 		$result = $input->render(['name' => 'image'], $this->context);
 		$expected = [
 			'input' => ['type' => 'file', 'name' => 'image'],
@@ -57,7 +57,7 @@ public function testRenderSimple() {
  * @return void
  */
 	public function testRenderAttributes() {
-		$input = new File($this->templates);
+		$input = new FileWidget($this->templates);
 		$data = ['name' => 'image', 'required' => true, 'val' => 'nope'];
 		$result = $input->render($data, $this->context);
 		$expected = [