Merge pull request FriendsOfCake#175 from FriendsOfCake/master-fix-control

Fix new 3.4 control() to work properly.

Author: ADmad

src/View/Helper/FormHelper.php

@@ -20,6 +20,13 @@ class FormHelper extends Helper
      */
     protected $_align;
 
+    /**
+     * The method to use when creating a control element for a form
+     *
+     * @var string
+     */
+    protected $_controlMethod = 'input';
+
     /**
      * Default Bootstrap string templates.
      *
@@ -102,6 +109,10 @@ public function __construct(View $View, array $config = [])
 
         $this->_defaultWidgets = $this->_widgets + $this->_defaultWidgets;
 
+        if (method_exists('Cake\View\Helper\FormHelper', 'control')) {
+            $this->_controlMethod = 'control';
+        }
+
         parent::__construct($View, $config);
     }
 
@@ -169,8 +180,27 @@ public function submit($caption = null, array $options = [])
      * @param string $fieldName This should be "Modelname.fieldname".
      * @param array $options Each type of input takes different options.
      * @return string Completed form widget.
+     * @deprecated Use control() instead.
      */
     public function input($fieldName, array $options = [])
+    {
+        return $this->control($fieldName, $options);
+    }
+
+    /**
+     * Generates a form input element complete with label and wrapper div.
+     *
+     * Adds extra option besides the ones supported by parent class method:
+     * - `append` - Append addon to input.
+     * - `prepend` - Prepend addon to input.
+     * - `inline` - Boolean for generating inline checkbox/radio.
+     * - `help` - Help text of include in the input container.
+     *
+     * @param string $fieldName This should be "Modelname.fieldname".
+     * @param array $options Each type of input takes different options.
+     * @return string Completed form widget.
+     */
+    public function control($fieldName, array $options = [])
     {
         $options += [
             'prepend' => null,
@@ -246,7 +276,9 @@ public function input($fieldName, array $options = [])
             );
         }
 
-        $result = parent::input($fieldName, $options);
+        $controlMethod = $this->_controlMethod;
+        $result = parent::$controlMethod($fieldName, $options);
+
         if ($newTemplates) {
             $this->templater()->pop();
         }

tests/TestCase/View/Helper/FormHelperTest.php

@@ -96,6 +96,28 @@ public function testBasicTextInput()
         $this->assertHtml($expected, $result);
     }
 
+    public function testBasicTextControl()
+    {
+        unset($this->article['required']['title']);
+        $this->Form->create($this->article);
+
+        $result = $this->Form->control('title');
+        $expected = [
+            'div' => ['class' => 'form-group text'],
+            'label' => ['class' => 'control-label', 'for' => 'title'],
+            'Title',
+            '/label',
+            'input' => [
+                'type' => 'text',
+                'name' => 'title',
+                'id' => 'title',
+                'class' => 'form-control',
+            ],
+            '/div'
+        ];
+        $this->assertHtml($expected, $result);
+    }
+
     public function testSelectInput()
     {
         $this->Form->create($this->article);