Fix code style errors

Author: bancer

.github/workflows/pull-request.yml

@@ -77,4 +77,4 @@ jobs:
           composer require cakephp/cakephp-codesniffer
           vendor/bin/phpcs --config-set installed_paths /home/runner/work/cakephp-filter-plugin/cakephp-filter-plugin/vendor/cakephp/cakephp-codesniffer
       - name: Run PHPCS
-        run: vendor/bin/phpcs --colors --parallel=16 -p --standard=CakePHP src/ tests/
+        run: vendor/bin/phpcs --colors --parallel=16 -p --standard=CakePHP --extensions=php,ctp src/ tests/

src/View/Elements/filter_form_begin.ctp

@@ -9,26 +9,30 @@
         MPL <http://www.mozilla.org/MPL/MPL-1.1.html>
         LGPL <http://www.gnu.org/licenses/lgpl.html>
         GPL <http://www.gnu.org/licenses/gpl.html>
-*/
+
+ @var mixed[] $options
+ @var string $modelName
+ @var \Cake\View\View $this
+ */
+
 ?>
 <div class="filterForm">
     <?php echo $this->Form->create(
         false,
         array(
             'url' => array(
-                'plugin' => $this->request->params['plugin'],
-                'controller' => $this->request->params['controller'],
-                'action' => $this->request->params['action'],
+                'plugin' => $this->getRequest()->getParam('plugin'),
+            	'controller' => $this->getRequest()->getParam('controller'),
+            	'action' => $this->getRequest()->getParam('action'),
             ),
             'id' => $modelName.'Filter',
         ) + $options
     ); ?>
-        <?php $this->Form->inputDefaults(array('required' => false)); ?>
         <fieldset>
             <?php
             if (isset($options['legend']))
             {
                 ?><legend><?php echo $options['legend']; ?></legend><?php
             }
             ?>
-            <?php echo $this->Form->input('Filter.filterFormId', array('type' => 'hidden', 'value' => $modelName)); ?>
+            <?php echo $this->Form->control('Filter.filterFormId', array('type' => 'hidden', 'value' => $modelName)); ?>

src/View/Elements/filter_form_end.ctp

@@ -9,6 +9,8 @@
         MPL <http://www.mozilla.org/MPL/MPL-1.1.html>
         LGPL <http://www.gnu.org/licenses/lgpl.html>
         GPL <http://www.gnu.org/licenses/gpl.html>
+
+ @var \Cake\View\View $this
 */
 ?>
         </fieldset>

src/View/Elements/filter_form_fields.ctp

@@ -9,6 +9,8 @@
         MPL <http://www.mozilla.org/MPL/MPL-1.1.html>
         LGPL <http://www.gnu.org/licenses/lgpl.html>
         GPL <http://www.gnu.org/licenses/gpl.html>
+
+ @var \Cake\View\View $this
 */
 
 if (isset($viewFilterParams))
@@ -21,7 +23,10 @@ if (isset($viewFilterParams))
             if (count($fieldName) === 2) {
                 $field['options']['name'] = sprintf('data[%s][%s]', $fieldName[0], $fieldName[1]);
             }
-            echo $this->Form->input($field['name'], $field['options']);
+            if (!isset($field['required'])) {
+                $field['required'] = false;
+            }
+            echo $this->Form->control($field['name'], $field['options']);
         }
     }
 }