Merge pull request #2758 from ADmad/3.0-widget

3.0 widget

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

@@ -12,9 +12,9 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
-use Cake\View\Input\InputInterface;
+use Cake\View\Widget\WidgetInterface;
 
 /**
  * Basic input class.
@@ -23,7 +23,7 @@
  * input elements like hidden, text, email, tel and other
  * types.
  */
-class Basic implements InputInterface {
+class Basic implements WidgetInterface {
 
 /**
  * StringTemplate instance.

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

@@ -12,9 +12,9 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
-use Cake\View\Input\InputInterface;
+use Cake\View\Widget\WidgetInterface;
 
 /**
  * Button input class
@@ -23,7 +23,7 @@
  * If you need to make basic submit inputs with type=submit,
  * use the Basic input widget.
  */
-class Button implements InputInterface {
+class Button implements WidgetInterface {
 
 /**
  * StringTemplate instance.

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

@@ -12,14 +12,14 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
-use Cake\View\Input\InputInterface;
+use Cake\View\Widget\WidgetInterface;
 
 /**
  * Input widget for creating checkbox widgets.
  */
-class Checkbox implements InputInterface {
+class Checkbox implements WidgetInterface {
 
 /**
  * Template instance.

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

@@ -12,24 +12,24 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
 use Cake\Utility\Time;
-use Cake\View\Input\InputInterface;
 use Cake\View\StringTemplate;
+use Cake\View\Widget\WidgetInterface;
 
 /**
  * Input widget class for generating a date time input widget.
  *
  * This class is intended as an internal implementation detail
  * of Cake\View\Helper\FormHelper and is not intended for direct use.
  */
-class DateTime implements InputInterface {
+class DateTime implements WidgetInterface {
 
 /**
  * Select box widget.
  *
- * @var Cake\View\Input\Select
+ * @var Cake\View\Widget\Select
  */
 	protected $_select;
 
@@ -59,7 +59,7 @@ class DateTime implements InputInterface {
  * Constructor
  *
  * @param Cake\View\StringTemplate $templates
- * @param Cake\View\Input\SelectBox $selectBox
+ * @param Cake\View\Widget\SelectBox $selectBox
  */
 	public function __construct($templates, $selectBox) {
 		$this->_select = $selectBox;
@@ -98,7 +98,7 @@ public function __construct($templates, $selectBox) {
  *
  * The `hour` option allows you to set the following options:
  *
- * - `format` option which accepts 12 or 24, allowing 
+ * - `format` option which accepts 12 or 24, allowing
  *   you to indicate which hour format you want.
  * - `start` The hour to start the options at.
  * - `end` The hour to stop the options at.

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

@@ -12,17 +12,17 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
-use Cake\View\Input\InputInterface;
+use Cake\View\Widget\WidgetInterface;
 
 /**
  * Input widget class for generating a file upload control.
  *
  * This class is intended as an internal implementation detail
  * of Cake\View\Helper\FormHelper and is not intended for direct use.
  */
-class File implements InputInterface {
+class File implements WidgetInterface {
 
 /**
  * Constructor

src/View/Input/InputRegistry.php → src/View/Widget/InputRegistry.php

@@ -12,11 +12,11 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
 use Cake\Core\App;
-use Cake\View\Input\InputInterface;
 use Cake\View\StringTemplate;
+use Cake\View\Widget\WidgetInterface;
 use \ReflectionClass;
 
 /**
@@ -40,16 +40,16 @@ class InputRegistry {
  * @var array
  */
 	protected $_widgets = [
-		'button' => ['Cake\View\Input\Button'],
-		'checkbox' => ['Cake\View\Input\Checkbox'],
-		'file' => ['Cake\View\Input\File'],
-		'label' => ['Cake\View\Input\Label'],
-		'multicheckbox' => ['Cake\View\Input\MultiCheckbox', 'label'],
-		'radio' => ['Cake\View\Input\Radio', 'label'],
-		'select' => ['Cake\View\Input\SelectBox'],
-		'textarea' => ['Cake\View\Input\Textarea'],
-		'datetime' => ['Cake\View\Input\DateTime', 'select'],
-		'_default' => ['Cake\View\Input\Basic'],
+		'button' => ['Cake\View\Widget\Button'],
+		'checkbox' => ['Cake\View\Widget\Checkbox'],
+		'file' => ['Cake\View\Widget\File'],
+		'label' => ['Cake\View\Widget\Label'],
+		'multicheckbox' => ['Cake\View\Widget\MultiCheckbox', 'label'],
+		'radio' => ['Cake\View\Widget\Radio', 'label'],
+		'select' => ['Cake\View\Widget\SelectBox'],
+		'textarea' => ['Cake\View\Widget\Textarea'],
+		'datetime' => ['Cake\View\Widget\DateTime', 'select'],
+		'_default' => ['Cake\View\Widget\Basic'],
 	];
 
 /**
@@ -104,7 +104,7 @@ public function add(array $widgets) {
  * the `_default` widget is undefined.
  *
  * @param string $name The widget name to get.
- * @return mixed InputInterface widget interface class.
+ * @return mixed WidgetInterface widget interface class.
  * @throws \RuntimeException when widget is undefined.
  */
 	public function get($name) {
@@ -131,9 +131,9 @@ public function clear() {
  * Resolves a widget spec into an instance.
  *
  * @param mixed $widget The widget to get
- * @return InputInterface
+ * @return WidgetInterface
  * @throws \RuntimeException when class cannot be loaded or does not
- *   implement InputInterface.
+ *   implement WidgetInterface.
  */
 	protected function _resolveWidget($widget) {
 		if (is_object($widget)) {
@@ -154,8 +154,8 @@ protected function _resolveWidget($widget) {
 		} else {
 			$instance = new $className($this->_templates);
 		}
-		if (!($instance instanceof InputInterface)) {
-			throw new \RuntimeException(sprintf('"%s" does not implement the InputInterface', $className));
+		if (!($instance instanceof WidgetInterface)) {
+			throw new \RuntimeException(sprintf('"%s" does not implement the WidgetInterface', $className));
 		}
 		return $instance;
 	}

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

@@ -12,17 +12,17 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
-use Cake\View\Input\InputInterface;
+use Cake\View\Widget\WidgetInterface;
 
 /**
  * Form 'widget' for creating labels.
  *
  * Generally this element is used by other widgets,
  * and FormHelper itself.
  */
-class Label implements InputInterface {
+class Label implements WidgetInterface {
 
 /**
  * Templates

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

@@ -12,16 +12,16 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
 use Cake\Utility\Inflector;
-use Cake\View\Input\InputInterface;
+use Cake\View\Widget\WidgetInterface;
 
 /**
  * Input widget class for generating multiple checkboxes.
  *
  */
-class MultiCheckbox implements InputInterface {
+class MultiCheckbox implements WidgetInterface {
 
 /**
  * Template instance to use.
@@ -33,7 +33,7 @@ class MultiCheckbox implements InputInterface {
 /**
  * Label widget instance.
  *
- * @var Cake\View\Input\Label
+ * @var Cake\View\Widget\Label
  */
 	protected $_label;
 
@@ -49,7 +49,7 @@ class MultiCheckbox implements InputInterface {
  *   variables.
  *
  * @param Cake\View\StringTemplate $templates
- * @param Cake\View\Input\Label $label
+ * @param Cake\View\Widget\Label $label
  */
 	public function __construct($templates, $label) {
 		$this->_templates = $templates;

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

@@ -12,10 +12,10 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
 use Cake\Utility\Inflector;
-use Cake\View\Input\InputInterface;
+use Cake\View\Widget\WidgetInterface;
 use Traversable;
 
 /**
@@ -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 Radio implements InputInterface {
+class Radio implements WidgetInterface {
 
 /**
  * Template instance.
@@ -35,8 +35,8 @@ class Radio implements InputInterface {
 
 /**
  * Label instance.
- * 
- * @var Cake\View\Input\Label
+ *
+ * @var Cake\View\Widget\Label
  */
 	protected $_label;
 
@@ -52,7 +52,7 @@ class Radio implements InputInterface {
  *   variables.
  *
  * @param Cake\View\StringTemplate $templates
- * @param Cake\View\Input\Label $label
+ * @param Cake\View\Widget\Label $label
  */
 	public function __construct($templates, $label) {
 		$this->_templates = $templates;

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

@@ -12,9 +12,9 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
-use Cake\View\Input\InputInterface;
+use Cake\View\Widget\WidgetInterface;
 use Traversable;
 
 /**
@@ -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 SelectBox implements InputInterface {
+class SelectBox implements WidgetInterface {
 
 /**
  * Template instance.

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

@@ -12,17 +12,17 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
-use Cake\View\Input\InputInterface;
+use Cake\View\Widget\WidgetInterface;
 
 /**
  * Input widget class for generating a textarea control.
  *
  * This class is intended as an internal implementation detail
  * of Cake\View\Helper\FormHelper and is not intended for direct use.
  */
-class Textarea implements InputInterface {
+class Textarea implements WidgetInterface {
 
 /**
  * Constructor

src/View/Input/InputInterface.php → src/View/Widget/WidgetInterface.php

@@ -12,12 +12,12 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\View\Input;
+namespace Cake\View\Widget;
 
 /**
  * Interface for input widgets.
  */
-interface InputInterface {
+interface WidgetInterface {
 
 /**
  * Converts the $data into one or many HTML elements.

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

@@ -12,11 +12,11 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\View\Input;
+namespace Cake\Test\TestCase\View\Widget;
 
 use Cake\TestSuite\TestCase;
-use Cake\View\Input\Basic;
 use Cake\View\StringTemplate;
+use Cake\View\Widget\Basic;
 
 /**
  * Basic input test.

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

@@ -12,11 +12,11 @@
  * @since         CakePHP(tm) v3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\View\Input;
+namespace Cake\Test\TestCase\View\Widget;
 
 use Cake\TestSuite\TestCase;
-use Cake\View\Input\Button;
 use Cake\View\StringTemplate;
+use Cake\View\Widget\Button;
 
 /**
  * Basic input test.