iriven / PhpFormGenerator

Elements/Range.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     public function __construct($label, $attributes)
     {
         parent::__construct($label, $attributes);
-        $this->Attributes()->set('type','range');
+        $this->Attributes()->set('type', 'range');
     }
 
 }
\ No newline at end of file

Elements/Url.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     public function __construct($label, $attributes = [])
     {
         parent::__construct($label, $attributes);
-        $this->Attributes()->set('type','url');
+        $this->Attributes()->set('type', 'url');
     }
 
 }
\ No newline at end of file

FormGenerator.php

Indentation +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
         {
             $item = new Captcha($label,$attributes);
             //$this->Request->getSession()->set(md5($item->Attributes()->get('name')), $item->Attributes()->get('capresponse'));
-           // $this->Request->Session->set(md5($item->Attributes()->get('name')),$item->Attributes()->get('capresponse'));
+            // $this->Request->Session->set(md5($item->Attributes()->get('name')),$item->Attributes()->get('capresponse'));
             $this->Form->append($item);
         }
         return $this;

Braces +18 added lines, -12 removed lines

@@ -267,8 +267,9 @@ 
     {
         if($this->Form instanceof form)
         {
-            if($this->Fieldset instanceof fieldsetGenerator)
-                $this->Form->append($this->Fieldset->Close());
+            if($this->Fieldset instanceof fieldsetGenerator) {
+                            $this->Form->append($this->Fieldset->Close());
+            }
             $this->Fieldset = new fieldsetGenerator($attributes);
             $this->Fieldset->Attributes()->set('name', $this->Form->Attributes()->get('name'));
             $this->Form->append($this->Fieldset->Open());
@@ -316,8 +317,9 @@ 
     {
         if($this->Form instanceof form)
         {
-            if(gettype($html) === 'string')
-            $this->Form->append($html);
+            if(gettype($html) === 'string') {
+                        $this->Form->append($html);
+            }
         }
         return $this;
     }
@@ -617,12 +619,14 @@ 
         $html = null;
         if ($this->Form instanceof form)
         {
-            if($this->Fieldset instanceof fieldsetGenerator)
-                $this->Form->append($this->Fieldset->Close());
+            if($this->Fieldset instanceof fieldsetGenerator) {
+                            $this->Form->append($this->Fieldset->Close());
+            }
             $html = $this->Form->RenderHtml();
             $this->Form = null;
-            if($print)
-                print_r($html);
+            if($print) {
+                            print_r($html);
+            }
         }
         return $html;
     }
@@ -653,8 +657,9 @@ 
                 $Request = $this->Request->query; 
             break;
         }
-        if(!$value = $Request->get($name, $default))
-        $value = $element->Attributes()->get('value', $default);
+        if(!$value = $Request->get($name, $default)) {
+                $value = $element->Attributes()->get('value', $default);
+        }
         return $value;
     }
     /**
@@ -663,8 +668,9 @@ 
      */
     public function Open($attributes = [])
     {
-        if($this->Form instanceof form)
-            $this->Close();
+        if($this->Form instanceof form) {
+                    $this->Close();
+        }
         $this->Form = new form($attributes);
         return $this;
     }

Spacing +112 added lines, -112 removed lines

@@ -62,7 +62,7 @@ 
     public function __construct($App)
     {
         $this->Request = $App->Request();
-        $formErrors = $App->get('errors',[]);
+        $formErrors = $App->get('errors', []);
         is_array($formErrors) OR $formErrors = [$formErrors];
         $this->Errors = new Collection($formErrors);
     }
@@ -72,14 +72,14 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addAudio($label,$attributes=[])
+    public function addAudio($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Audio($label,$attributes);
-            $item->Attributes()->set('accept','audio/*');
+            $item = new Audio($label, $attributes);
+            $item->Attributes()->set('accept', 'audio/*');
             $item->Attributes()->set('value', $this->getDefaultValue($item));
-            $this->Form->Attributes()->set('enctype','multipart/form-data');
+            $this->Form->Attributes()->set('enctype', 'multipart/form-data');
             $this->Form->append($item);
         }
         return $this;
@@ -90,11 +90,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addButton($label,$attributes=[])
+    public function addButton($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Button($label,$attributes);
+            $item = new Button($label, $attributes);
             $this->Form->append($item);
         }
         return $this;
@@ -105,11 +105,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addCaptcha($label,$attributes=[])
+    public function addCaptcha($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Captcha($label,$attributes);
+            $item = new Captcha($label, $attributes);
             //$this->Request->getSession()->set(md5($item->Attributes()->get('name')), $item->Attributes()->get('capresponse'));
            // $this->Request->Session->set(md5($item->Attributes()->get('name')),$item->Attributes()->get('capresponse'));
             $this->Form->append($item);
@@ -123,11 +123,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addCheckbox($label,$options = [],$attributes=[])
+    public function addCheckbox($label, $options = [], $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Checkbox($label,$options ,$attributes);
+            $item = new Checkbox($label, $options, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -139,11 +139,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addColor($label,$attributes=[])
+    public function addColor($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Color($label,$attributes);
+            $item = new Color($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -155,11 +155,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addCountries($label,$attributes=[])
+    public function addCountries($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Country($label,$attributes);
+            $item = new Country($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -170,7 +170,7 @@ 
      * @param array $attributes
      * @return $this
      */   
-    public function addDatalist($label, $options=[], $attributes = [])
+    public function addDatalist($label, $options = [], $attributes = [])
     {
         if ($this->Form instanceof form) {
                 $item = new Datalist($label, $options, $attributes);
@@ -185,11 +185,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addDate($label,$attributes=[])
+    public function addDate($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Date($label,$attributes);
+            $item = new Date($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -201,11 +201,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addDatetime($label,$attributes=[])
+    public function addDatetime($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Datetime($label,$attributes);
+            $item = new Datetime($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -217,11 +217,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addDatetimeLocal($label,$attributes=[])
+    public function addDatetimeLocal($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new DatetimeLocal($label,$attributes);
+            $item = new DatetimeLocal($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -232,11 +232,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addEditor($label,$attributes=[])
+    public function addEditor($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Editor($label,$attributes);
+            $item = new Editor($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -247,11 +247,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addEmail($label,$attributes=[])
+    public function addEmail($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Email($label,$attributes);
+            $item = new Email($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -261,11 +261,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addFieldset($attributes=[])
+    public function addFieldset($attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            if($this->Fieldset instanceof fieldsetGenerator)
+            if ($this->Fieldset instanceof fieldsetGenerator)
                 $this->Form->append($this->Fieldset->Close());
             $this->Fieldset = new fieldsetGenerator($attributes);
             $this->Fieldset->Attributes()->set('name', $this->Form->Attributes()->get('name'));
@@ -278,12 +278,12 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addFile($label,$attributes=[])
+    public function addFile($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new File($label,$attributes);
-            $this->Form->Attributes()->set('enctype','multipart/form-data');
+            $item = new File($label, $attributes);
+            $this->Form->Attributes()->set('enctype', 'multipart/form-data');
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -295,11 +295,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addHidden($label,$attributes=[])
+    public function addHidden($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Hidden($label,$attributes);
+            $item = new Hidden($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -312,9 +312,9 @@ 
      */
     public function addHtml($html)
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            if(gettype($html) === 'string')
+            if (gettype($html) === 'string')
             $this->Form->append($html);
         }
         return $this;
@@ -325,12 +325,12 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addImage($label,$attributes=[])
+    public function addImage($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Image($label,$attributes);
-            $this->Form->Attributes()->set('enctype','multipart/form-data');
+            $item = new Image($label, $attributes);
+            $this->Form->Attributes()->set('enctype', 'multipart/form-data');
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -342,11 +342,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addMonth($label,$attributes=[])
+    public function addMonth($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Month($label,$attributes);
+            $item = new Month($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -358,11 +358,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addNumber($label,$attributes=[])
+    public function addNumber($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Number($label,$attributes);
+            $item = new Number($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -373,11 +373,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addPassword($label,$attributes=[])
+    public function addPassword($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Password($label,$attributes);
+            $item = new Password($label, $attributes);
             $item->Attributes()->set('value', '');
             $this->Form->append($item);
         }
@@ -389,11 +389,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addPhone($label,$attributes=[])
+    public function addPhone($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Phone($label,$attributes);
+            $item = new Phone($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -406,11 +406,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addRadio($label,$options=[],$attributes=[])
+    public function addRadio($label, $options = [], $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Radio($label,$options,$attributes);
+            $item = new Radio($label, $options, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -422,11 +422,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addRange($label,$attributes=[])
+    public function addRange($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Range($label,$attributes);
+            $item = new Range($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -438,11 +438,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addReset($label,$attributes=[])
+    public function addReset($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Reset($label,$attributes);
+            $item = new Reset($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -454,11 +454,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addSearch($label,$attributes=[])
+    public function addSearch($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Search($label,$attributes);
+            $item = new Search($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -470,11 +470,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addSelect($label,array $options = [],$attributes=[])
+    public function addSelect($label, array $options = [], $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Select($label,$options,$attributes);
+            $item = new Select($label, $options, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -485,11 +485,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addSubmit($label,$attributes=[])
+    public function addSubmit($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Submit($label,$attributes);
+            $item = new Submit($label, $attributes);
             $this->Form->append($item);
         }
         return $this;
@@ -500,11 +500,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addText($label,$attributes=[])
+    public function addText($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Text($label,$attributes);
+            $item = new Text($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -516,11 +516,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addTextarea($label,$attributes=[])
+    public function addTextarea($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Textarea($label,$attributes);
+            $item = new Textarea($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -532,11 +532,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addTime($label,$attributes=[])
+    public function addTime($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Time($label,$attributes);
+            $item = new Time($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -548,11 +548,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addUrl($label,$attributes=[])
+    public function addUrl($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Url($label,$attributes);
+            $item = new Url($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -564,12 +564,12 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addVideo($label,$attributes=[])
+    public function addVideo($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Video($label,$attributes);
-            $this->Form->Attributes()->set('enctype','multipart/form-data');
+            $item = new Video($label, $attributes);
+            $this->Form->Attributes()->set('enctype', 'multipart/form-data');
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -580,11 +580,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addWeek($label,$attributes=[])
+    public function addWeek($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new Week($label,$attributes);
+            $item = new Week($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -596,11 +596,11 @@ 
      * @param array $attributes
      * @return $this
      */
-    public function addYesNo($label,$attributes=[])
+    public function addYesNo($label, $attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
         {
-            $item = new YesNo($label,$attributes);
+            $item = new YesNo($label, $attributes);
             $item->Attributes()->set('value', $this->getDefaultValue($item));
             $this->Form->append($item);
         }
@@ -610,16 +610,16 @@ 
      * @param bool $print
      * @return null|string
      */
-    public function Close($print=true)
+    public function Close($print = true)
     {
         $html = null;
         if ($this->Form instanceof form)
         {
-            if($this->Fieldset instanceof fieldsetGenerator)
+            if ($this->Fieldset instanceof fieldsetGenerator)
                 $this->Form->append($this->Fieldset->Close());
             $html = $this->Form->RenderHtml();
             $this->Form = null;
-            if($print)
+            if ($print)
                 print_r($html);
         }
         return $html;
@@ -636,11 +636,11 @@ 
      * @param null $default
      * @return mixed
      */
-    private function getDefaultValue(FormElement $element,$default=null)
+    private function getDefaultValue(FormElement $element, $default = null)
     {
         $name = $element->Attributes()->get('name');
         $method = strtoupper($this->Request->getMethod());
-        switch($method){
+        switch ($method) {
             case 'POST':
             case 'PUT':
             case 'DELETE':
@@ -651,7 +651,7 @@ 
                 $Request = $this->Request->query; 
             break;
         }
-        if(!$value = $Request->get($name, $default))
+        if (!$value = $Request->get($name, $default))
         $value = $element->Attributes()->get('value', $default);
         return $value;
     }
@@ -661,7 +661,7 @@ 
      */
     public function Open($attributes = [])
     {
-        if($this->Form instanceof form)
+        if ($this->Form instanceof form)
             $this->Close();
         $this->Form = new form($attributes);
         return $this;

Core/FieldsetGenerator.php

Spacing +8 added lines, -8 removed lines

@@ -25,14 +25,14 @@ 
      */
     public function __construct($attributes)
     {
-        if(!$attributes instanceof AttributesBuilder)
-            $attributes  = new AttributesBuilder($attributes);
+        if (!$attributes instanceof AttributesBuilder)
+            $attributes = new AttributesBuilder($attributes);
         $this->attributes = $attributes;
-        if($this->attributes->has('legend'))
+        if ($this->attributes->has('legend'))
         {
             $this->attributes->Ignore('legend');
             $this->legend = $this->attributes->get('legend');
-            if($this->attributes->has('legend-attributes'))
+            if ($this->attributes->has('legend-attributes'))
             {
                 $this->attributes->Ignore('legend-attributes');
                 $this->legendAttributes = new AttributesBuilder($this->attributes->get('legend-attributes'));
@@ -55,10 +55,10 @@ 
         $html  = '<fieldset';
         $html .= $this->attributes->RenderHtml();
         $html .= '>';
-        if($this->legend)
+        if ($this->legend)
         {
             $html .= '<legend';
-            if($this->legendAttributes instanceof AttributesBuilder)
+            if ($this->legendAttributes instanceof AttributesBuilder)
             $html .= $this->legendAttributes->RenderHtml();
             $html .= '>';
             $html .= $this->legend;
@@ -73,8 +73,8 @@ 
      */
     public function Close()
     {
-        $html  = '';
-        if($this->isOpened)
+        $html = '';
+        if ($this->isOpened)
             $html .= '</fieldset>';
         return $html;
     }

Braces +9 added lines, -6 removed lines

@@ -25,8 +25,9 @@ 
      */
     public function __construct($attributes)
     {
-        if(!$attributes instanceof AttributesBuilder)
-            $attributes  = new AttributesBuilder($attributes);
+        if(!$attributes instanceof AttributesBuilder) {
+                    $attributes  = new AttributesBuilder($attributes);
+        }
         $this->attributes = $attributes;
         if($this->attributes->has('legend'))
         {
@@ -58,8 +59,9 @@ 
         if($this->legend)
         {
             $html .= '<legend';
-            if($this->legendAttributes instanceof AttributesBuilder)
-            $html .= $this->legendAttributes->RenderHtml();
+            if($this->legendAttributes instanceof AttributesBuilder) {
+                        $html .= $this->legendAttributes->RenderHtml();
+            }
             $html .= '>';
             $html .= $this->legend;
             $html .= '</legend>';
@@ -74,8 +76,9 @@ 
     public function Close()
     {
         $html  = '';
-        if($this->isOpened)
-            $html .= '</fieldset>';
+        if($this->isOpened) {
+                    $html .= '</fieldset>';
+        }
         return $html;
     }
 

Core/Libs/AttributesBuilder.php

Spacing +24 added lines, -24 removed lines

@@ -16,7 +16,7 @@ 
     use KeyNormalizer;
 
     private $attributes;
-    private $ignore ;
+    private $ignore;
 
     /**
      * AttributesBuilder constructor.
@@ -28,17 +28,17 @@ 
     {
         $this->attributes    = new Collection();
         $this->ignore        = new Collection();
-        if($attributes)
+        if ($attributes)
         {
             is_array($attributes) or $attributes = array($attributes);
-            $attributes = array_change_key_case($attributes,CASE_LOWER);
-            $attributes = $this->array_map_keys([$this,'normalize'],$attributes);
+            $attributes = array_change_key_case($attributes, CASE_LOWER);
+            $attributes = $this->array_map_keys([$this, 'normalize'], $attributes);
             $this->attributes->add($attributes);
         }
-        if($ignore)
+        if ($ignore)
         {
             is_array($ignore) or $ignore = array($ignore);
-            $ignore = array_map([$this,'normalize'],$ignore);
+            $ignore = array_map([$this, 'normalize'], $ignore);
             $this->ignore->add($ignore);
         }
         return $this;
@@ -51,9 +51,9 @@ 
     public function createElementID($key)
     {
         $key = ucfirst($this->normalize($key));
-        if(strpos($key,'input')!==0)
+        if (strpos($key, 'input') !== 0)
             $key = 'input'.$key;
-        $this->set('id',$key);
+        $this->set('id', $key);
         return  $this;
     }
 
@@ -65,9 +65,9 @@ 
     {
         $token or $token = microtime(true);
         $token = $this->normalize($token);
-        if(strpos($token,'form-')!==0)
+        if (strpos($token, 'form-') !== 0)
             $token = 'form-'.$token;
-        $this->set('name',md5($token));
+        $this->set('name', md5($token));
         return  $this;
     }
 
@@ -78,7 +78,7 @@ 
     public function add(array $attributes)
     {
         is_array($attributes) or $attributes = array($attributes);
-        $attributes = $this->array_map_keys([$this,'normalize'],$attributes);
+        $attributes = $this->array_map_keys([$this, 'normalize'], $attributes);
         $this->attributes->add($attributes);
         return $this;
     }
@@ -88,10 +88,10 @@ 
      * @param null $default
      * @return mixed
      */
-    public function get($key,$default=null)
+    public function get($key, $default = null)
     {
         $key = $this->normalize($key);
-        return $this->attributes->get($key,$default);
+        return $this->attributes->get($key, $default);
     }
 
     /**
@@ -110,7 +110,7 @@ 
     public function Ignore($ignore)
     {
         is_array($ignore) or $ignore = array($ignore);
-        $ignore = array_merge($this->ignore->all(), array_map([$this,'normalize'],$ignore));
+        $ignore = array_merge($this->ignore->all(), array_map([$this, 'normalize'], $ignore));
         $this->ignore->replace($ignore);
         return $this;
     }
@@ -131,10 +131,10 @@ 
      * @param $value
      * @return $this
      */
-    public function set($key,$value)
+    public function set($key, $value)
     {
         $key = $this->normalize($key);
-        $this->attributes->set($key,$value);
+        $this->attributes->set($key, $value);
         return $this;
     }
 
@@ -152,23 +152,23 @@ 
     public function RenderHtml()
     {
         $output = [];
-        if($attributes = $this->attributes->all())
+        if ($attributes = $this->attributes->all())
         {
             AttributesMapper::filter($this);
             $filtered = array_keys($attributes);
-            if($ignore = $this->ignore->all())
+            if ($ignore = $this->ignore->all())
                 $filtered = array_diff($filtered, $ignore);
             $attributes = array_intersect_key($attributes, array_flip($filtered));
-            foreach($attributes as $key=>$value)
+            foreach ($attributes as $key=>$value)
             {
-                if(is_array($value)):
-                    $output[]= $key.'="'.implode(' ',array_values($value)).'"';
+                if (is_array($value)):
+                    $output[] = $key.'="'.implode(' ', array_values($value)).'"';
                 else:
-                    if(is_numeric($key)) $output[]= $value;
-                    else $output[]= $key.'="'.$value.'"';
+                    if (is_numeric($key)) $output[] = $value;
+                    else $output[] = $key.'="'.$value.'"';
                 endif;
             }
         }
-        return count($output) ? ' ' . implode(' ', $output) : '';
+        return count($output) ? ' '.implode(' ', $output) : '';
     }
 }
\ No newline at end of file

Braces +15 added lines, -8 removed lines

@@ -51,8 +51,9 @@ 
     public function createElementID($key)
     {
         $key = ucfirst($this->normalize($key));
-        if(strpos($key,'input')!==0)
-            $key = 'input'.$key;
+        if(strpos($key,'input')!==0) {
+                    $key = 'input'.$key;
+        }
         $this->set('id',$key);
         return  $this;
     }
@@ -65,8 +66,9 @@ 
     {
         $token or $token = microtime(true);
         $token = $this->normalize($token);
-        if(strpos($token,'form-')!==0)
-            $token = 'form-'.$token;
+        if(strpos($token,'form-')!==0) {
+                    $token = 'form-'.$token;
+        }
         $this->set('name',md5($token));
         return  $this;
     }
@@ -156,16 +158,21 @@ 
         {
             AttributesMapper::filter($this);
             $filtered = array_keys($attributes);
-            if($ignore = $this->ignore->all())
-                $filtered = array_diff($filtered, $ignore);
+            if($ignore = $this->ignore->all()) {
+                            $filtered = array_diff($filtered, $ignore);
+            }
             $attributes = array_intersect_key($attributes, array_flip($filtered));
             foreach($attributes as $key=>$value)
             {
                 if(is_array($value)):
                     $output[]= $key.'="'.implode(' ',array_values($value)).'"';
-                else:
+                else {
+                  :
                     if(is_numeric($key)) $output[]= $value;
-                    else $output[]= $key.'="'.$value.'"';
+                }
+                    else {
+                      $output[]= $key.'="'.$value.'"';
+                    }
                 endif;
             }
         }

Core/Libs/LabelGenerator.php

Spacing +10 added lines, -10 removed lines

@@ -24,13 +24,13 @@ 
      * @param string                      $item
      * @param AttributesBuilder|array $attributes
      */
-    public function __construct(string $item, $attributes=[])
+    public function __construct(string $item, $attributes = [])
     {
         $this->item = $item;
-        if(!$attributes instanceof AttributesBuilder)
-            $attributes  = new AttributesBuilder($attributes);
+        if (!$attributes instanceof AttributesBuilder)
+            $attributes = new AttributesBuilder($attributes);
         $this->attributes = $attributes;
-        $this->attributes->set('type','label');
+        $this->attributes->set('type', 'label');
             return $this;
     }
 
@@ -56,11 +56,11 @@ 
     public function getItemID()
     {
 
-        if(!$this->attributes->has('for'))
+        if (!$this->attributes->has('for'))
         {
             $this->attributes->createElementID($this->item);
             $id = $this->attributes->get('id');
-            $this->attributes->set('for',$id);
+            $this->attributes->set('for', $id);
             return $id;
         }
         return $this->attributes->get('for');
@@ -70,10 +70,10 @@ 
      */
     public function RenderHtml()
     {
-        $this->attributes->Ignore(['id','label','type']);
-        $label =  null;
+        $this->attributes->Ignore(['id', 'label', 'type']);
+        $label = null;
         $type = $this->attributes->get('fieldtype');
-        $this->attributes->set('for',$this->attributes->get('for',$this->attributes->get('id')));
+        $this->attributes->set('for', $this->attributes->get('for', $this->attributes->get('id')));
         switch ($type):
             case 'hidden':
             case 'submit':
@@ -82,7 +82,7 @@ 
                 break;
             default:
                 $label .= '<label'.$this->attributes->RenderHtml().'>';
-                $label .= htmlspecialchars(trim($this->item,': '),ENT_COMPAT,'UTF-8');
+                $label .= htmlspecialchars(trim($this->item, ': '), ENT_COMPAT, 'UTF-8');
                 // $label .= $this->RenderErrors($label);
                 $label .= ': </label>';
                 break;

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
     public function __construct(string $item, $attributes=[])
     {
         $this->item = $item;
-        if(!$attributes instanceof AttributesBuilder)
-            $attributes  = new AttributesBuilder($attributes);
+        if(!$attributes instanceof AttributesBuilder) {
+                    $attributes  = new AttributesBuilder($attributes);
+        }
         $this->attributes = $attributes;
         $this->attributes->set('type','label');
             return $this;

Core/Libs/AttributesMapper.php

Spacing +47 added lines, -47 removed lines

@@ -11,25 +11,25 @@ 
 
 class AttributesMapper
 {
-    const COMMON = ['accesskey','class','contenteditable', 'contextmenu','dir','draggable','dropzone','hidden','id','lang','spellcheck','style','tabindex','title','translate'];
-    const EVENTS = ['onblur','onchange','oncontextmenu','onfocus','oninput','oninvalid','onreset','onsearch','onselect','onsubmit','onkeydown','onkeypress','onkeyup','onclick','ondblclick','ondrag','ondragend','ondragenter','ondragleave','ondragover','ondragstart','ondrop','onmousedown','onmousemove','onmouseout','onmouseover','onmouseup','onmousewheel','onscroll','onwheel'];
-    const BUTTON = ['autofocus','disabled','form','formaction','formenctype','formmethod','formnovalidate','formtarget','framename','name','type','value'];
-    const CHECKBOX = ['autofocus','checked','defaultChecked','defaultvalue','disabled','form','indeterminate','name','required','type','value'];
-    const COLOR = ['autocomplete','autofocus','defaultvalue','disabled','form','list','name','type','value'];
-    const DATE = ['autocomplete','autofocus','defaultvalue','disabled','form','list','max','min','name','readonly','required','step','type','value'];
-    const FIELDSET = ['disabled','form','name','legend','legend-attributes'];
-    const FILE = ['accept','autofocus','defaultvalue','disabled','files','form','multiple','name','required','type','value', 'data-max-size'];
-    const FORM = ['accept','accept-charset','action','autocomplete','enctype','method','name','novalidate','target'];
-    const HIDDEN = ['form','name','type','value'];
-    const IMAGE = ['alt','autofocus','defaultvalue','disabled','form','formaction','formenctype','formmethod','formnovalidate','formtarget','height','name','src','type','value','width'];
-    const LABEL = ['for','form'];
-    const OPTGROUP = ['disabled','label'];
-    const OPTION = ['disabled','label','value','selected'];
-    const RANGE = ['autocomplete','autofocus','defaultvalue','disabled','form','list','max','min','name','step','type','value'];
-    const RESET = ['autofocus','defaultvalue','disabled','form','name','type','value'];
-    const SELECT = ['autofocus','disabled','form','multiple','name','required','size','selected','optgroup-attributes','option-attributes','value'];
-    const TEXT = ['autocomplete','autofocus','defaultvalue','disabled','form','list','minlength','maxlength','name','pattern','placeholder','readonly','required','size','type','value'];
-    const TEXTAREA = ['autofocus','cols','dirname','disabled','form','maxlength','name','placeholder','readonly','required','rows','wrap','value'];
+    const COMMON = ['accesskey', 'class', 'contenteditable', 'contextmenu', 'dir', 'draggable', 'dropzone', 'hidden', 'id', 'lang', 'spellcheck', 'style', 'tabindex', 'title', 'translate'];
+    const EVENTS = ['onblur', 'onchange', 'oncontextmenu', 'onfocus', 'oninput', 'oninvalid', 'onreset', 'onsearch', 'onselect', 'onsubmit', 'onkeydown', 'onkeypress', 'onkeyup', 'onclick', 'ondblclick', 'ondrag', 'ondragend', 'ondragenter', 'ondragleave', 'ondragover', 'ondragstart', 'ondrop', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onmousewheel', 'onscroll', 'onwheel'];
+    const BUTTON = ['autofocus', 'disabled', 'form', 'formaction', 'formenctype', 'formmethod', 'formnovalidate', 'formtarget', 'framename', 'name', 'type', 'value'];
+    const CHECKBOX = ['autofocus', 'checked', 'defaultChecked', 'defaultvalue', 'disabled', 'form', 'indeterminate', 'name', 'required', 'type', 'value'];
+    const COLOR = ['autocomplete', 'autofocus', 'defaultvalue', 'disabled', 'form', 'list', 'name', 'type', 'value'];
+    const DATE = ['autocomplete', 'autofocus', 'defaultvalue', 'disabled', 'form', 'list', 'max', 'min', 'name', 'readonly', 'required', 'step', 'type', 'value'];
+    const FIELDSET = ['disabled', 'form', 'name', 'legend', 'legend-attributes'];
+    const FILE = ['accept', 'autofocus', 'defaultvalue', 'disabled', 'files', 'form', 'multiple', 'name', 'required', 'type', 'value', 'data-max-size'];
+    const FORM = ['accept', 'accept-charset', 'action', 'autocomplete', 'enctype', 'method', 'name', 'novalidate', 'target'];
+    const HIDDEN = ['form', 'name', 'type', 'value'];
+    const IMAGE = ['alt', 'autofocus', 'defaultvalue', 'disabled', 'form', 'formaction', 'formenctype', 'formmethod', 'formnovalidate', 'formtarget', 'height', 'name', 'src', 'type', 'value', 'width'];
+    const LABEL = ['for', 'form'];
+    const OPTGROUP = ['disabled', 'label'];
+    const OPTION = ['disabled', 'label', 'value', 'selected'];
+    const RANGE = ['autocomplete', 'autofocus', 'defaultvalue', 'disabled', 'form', 'list', 'max', 'min', 'name', 'step', 'type', 'value'];
+    const RESET = ['autofocus', 'defaultvalue', 'disabled', 'form', 'name', 'type', 'value'];
+    const SELECT = ['autofocus', 'disabled', 'form', 'multiple', 'name', 'required', 'size', 'selected', 'optgroup-attributes', 'option-attributes', 'value'];
+    const TEXT = ['autocomplete', 'autofocus', 'defaultvalue', 'disabled', 'form', 'list', 'minlength', 'maxlength', 'name', 'pattern', 'placeholder', 'readonly', 'required', 'size', 'type', 'value'];
+    const TEXTAREA = ['autofocus', 'cols', 'dirname', 'disabled', 'form', 'maxlength', 'name', 'placeholder', 'readonly', 'required', 'rows', 'wrap', 'value'];
 
     /**
      * @param AttributesBuilder $Attributes
@@ -37,8 +37,8 @@ 
      */
     public static function filter(AttributesBuilder $Attributes)
     {
-        $aAttributes = array_change_key_case($Attributes->All(),CASE_LOWER);
-        $Type = $Attributes->get('type','text');
+        $aAttributes = array_change_key_case($Attributes->All(), CASE_LOWER);
+        $Type = $Attributes->get('type', 'text');
         $AcceptedAttributes = array_merge(self::EVENTS, self::COMMON);
         switch ($Type):
             case 'date':
@@ -48,28 +48,28 @@ 
             case 'number':
             case 'time':
             case 'week':
-                if($Type === 'number') $AcceptedAttributes[]='placeholder';
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::DATE);
+                if ($Type === 'number') $AcceptedAttributes[] = 'placeholder';
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::DATE);
                 break;
             case 'color':
                 $AcceptedAttributes = array_merge($AcceptedAttributes, self::COLOR);
                 break;
             case 'file':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::FILE);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::FILE);
                 break;
             case 'image':
             case 'video':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::IMAGE);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::IMAGE);
                 break;
             case 'radio':
             case 'checkbox':
-                $tmpAttributesList=self::CHECKBOX;
-                if($Type === 'radio')
+                $tmpAttributesList = self::CHECKBOX;
+                if ($Type === 'radio')
                 {
-                    $bannedIndex = array_search('indeterminate', $tmpAttributesList,true);
-                    if(isset($tmpAttributesList[$bannedIndex])) unset($tmpAttributesList[$bannedIndex]);
+                    $bannedIndex = array_search('indeterminate', $tmpAttributesList, true);
+                    if (isset($tmpAttributesList[$bannedIndex])) unset($tmpAttributesList[$bannedIndex]);
                 }
-                $AcceptedAttributes = array_merge($AcceptedAttributes,array_values($tmpAttributesList));
+                $AcceptedAttributes = array_merge($AcceptedAttributes, array_values($tmpAttributesList));
                 break;
 
             case 'submit':
@@ -78,61 +78,61 @@ 
                 break;
 
             case 'reset':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::RESET);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::RESET);
                 break;
             case 'range':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::RANGE);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::RANGE);
                 break;
             case 'textarea':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::TEXTAREA);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::TEXTAREA);
                 break;
             case 'optgroup':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::OPTGROUP);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::OPTGROUP);
                 break;
             case 'option':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::OPTION);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::OPTION);
                 break;
             case 'label':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::LABEL);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::LABEL);
                 break;
             case 'select':
-                $AcceptedAttributes[]='placeholder';
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::SELECT);
+                $AcceptedAttributes[] = 'placeholder';
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::SELECT);
                 break;
             case 'form':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::FORM);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::FORM);
                 break;
             case 'fieldset':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::FIELDSET);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::FIELDSET);
                 break;
             case 'hidden':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::HIDDEN);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::HIDDEN);
                 break;
             default:
-                if($Type === 'email') $AcceptedAttributes[]='multiple';
-                $AcceptedAttributes = array_merge($AcceptedAttributes,self::TEXT);
+                if ($Type === 'email') $AcceptedAttributes[] = 'multiple';
+                $AcceptedAttributes = array_merge($AcceptedAttributes, self::TEXT);
                 break;
         endswitch;
 
         $AcceptedAttributes = array_unique($AcceptedAttributes);
         $attributesKeys = array_keys($aAttributes);
-        $ignore = array_diff($attributesKeys,$AcceptedAttributes);
+        $ignore = array_diff($attributesKeys, $AcceptedAttributes);
         foreach ($ignore as $key=>$attribute)
         {
-            if(is_numeric($attribute))
+            if (is_numeric($attribute))
             {
                 unset($ignore[$key]);
                 $attribute = $aAttributes[$attribute];
                 $ignore[$key] = $attribute;
             }
-            if(substr($attribute,0,5)==='data-')
+            if (substr($attribute, 0, 5) === 'data-')
             {
                 $AcceptedAttributes[] += $attribute;
                 unset($ignore[$key]);
                 continue;
             }
         }
-        if($ignore) $Attributes->Ignore($ignore);
+        if ($ignore) $Attributes->Ignore($ignore);
         return $ignore;
     }
 }
\ No newline at end of file

Braces +12 added lines, -4 removed lines

@@ -48,7 +48,9 @@ 
             case 'number':
             case 'time':
             case 'week':
-                if($Type === 'number') $AcceptedAttributes[]='placeholder';
+                if($Type === 'number') {
+                  $AcceptedAttributes[]='placeholder';
+                }
                 $AcceptedAttributes = array_merge($AcceptedAttributes,self::DATE);
                 break;
             case 'color':
@@ -67,7 +69,9 @@ 
                 if($Type === 'radio')
                 {
                     $bannedIndex = array_search('indeterminate', $tmpAttributesList,true);
-                    if(isset($tmpAttributesList[$bannedIndex])) unset($tmpAttributesList[$bannedIndex]);
+                    if(isset($tmpAttributesList[$bannedIndex])) {
+                      unset($tmpAttributesList[$bannedIndex]);
+                    }
                 }
                 $AcceptedAttributes = array_merge($AcceptedAttributes,array_values($tmpAttributesList));
                 break;
@@ -109,7 +113,9 @@ 
                 $AcceptedAttributes = array_merge($AcceptedAttributes,self::HIDDEN);
                 break;
             default:
-                if($Type === 'email') $AcceptedAttributes[]='multiple';
+                if($Type === 'email') {
+                  $AcceptedAttributes[]='multiple';
+                }
                 $AcceptedAttributes = array_merge($AcceptedAttributes,self::TEXT);
                 break;
         endswitch;
@@ -132,7 +138,9 @@ 
                 continue;
             }
         }
-        if($ignore) $Attributes->Ignore($ignore);
+        if($ignore) {
+          $Attributes->Ignore($ignore);
+        }
         return $ignore;
     }
 }
\ No newline at end of file

Core/Libs/Traits/KeyNormalizer.php

Spacing +5 added lines, -5 removed lines

@@ -17,11 +17,11 @@ 
      */
     private function normalize($keys)
     {
-        if(is_array($keys)) return false;
-        foreach (array(' ', ' ', '\n', '\t', '\r', '"','\'','_') as $strip)
+        if (is_array($keys)) return false;
+        foreach (array(' ', ' ', '\n', '\t', '\r', '"', '\'', '_') as $strip)
             $keys = str_replace($strip, '', (string) $keys);
         $keys = trim(preg_replace('/\W+/', '-', $keys), '-');
-        $keys = strtolower(str_ireplace('input','',$keys));
+        $keys = strtolower(str_ireplace('input', '', $keys));
         return $keys;
     }
 
@@ -30,12 +30,12 @@ 
      * @param array    $array
      * @return array
      */
-    private function array_map_keys (callable $callable, array $array) : array
+    private function array_map_keys(callable $callable, array $array) : array
     {
         $map = [];
         foreach ($array as $key => $value)
         {
-            $key = call_user_func($callable,$key);
+            $key = call_user_func($callable, $key);
             $map[$key] = $value;
         }
         return $map;

Braces +6 added lines, -3 removed lines

@@ -17,9 +17,12 @@
      */
     private function normalize($keys)
     {
-        if(is_array($keys)) return false;
-        foreach (array(' ', ' ', '\n', '\t', '\r', '"','\'','_') as $strip)
-            $keys = str_replace($strip, '', (string) $keys);
+        if(is_array($keys)) {
+          return false;
+        }
+        foreach (array(' ', ' ', '\n', '\t', '\r', '"','\'','_') as $strip) {
+                    $keys = str_replace($strip, '', (string) $keys);
+        }
         $keys = trim(preg_replace('/\W+/', '-', $keys), '-');
         $keys = strtolower(str_ireplace('input','',$keys));
         return $keys;

Core/Interfaces/FormGeneratorInterface.php

Spacing +33 added lines, -33 removed lines

@@ -12,40 +12,40 @@
 interface FormGeneratorInterface
 {
     /* COMMON METHODS */
-    public function Open($attributes=[]);
+    public function Open($attributes = []);
     public function Close();
-    public function addFieldset($attributes=[]);
+    public function addFieldset($attributes = []);
 
     /* INPUT TYPES */
-    public function addAudio($label,$attributes=[]);
-    public function addButton($label,$attributes=[]);
-    public function addCaptcha($label,$attributes=[]);
-    public function addCheckbox($label,$options=[],$attributes=[]);
-    public function addColor($label,$attributes=[]);
-    public function addCountry($label,$attributes=[]);
-    public function addDate($label,$attributes=[]);
-    public function addDatetime($label,$attributes=[]);
-    public function addDatetimeLocal($label,$attributes=[]);
-    public function addEmail($label,$attributes=[]);
-    public function addFile($label,$attributes=[]);
-    public function addHidden($label,$attributes=[]);
-    public function addImage($label,$attributes=[]);
-    public function addMonth($label,$attributes=[]);
-    public function addNumber($label,$attributes=[]);
-    public function addPassword($label,$attributes=[]);
-    public function addPhone($label,$attributes=[]);
-    public function addRadio($label,$options=[],$attributes=[]);
-    public function addRange($label,$attributes=[]);
-    public function addReset($label,$attributes=[]);
-    public function addSearch($label,$attributes=[]);
-    public function addSelect($label,$options=[],$attributes=[]);
-    public function addSubmit($label,$attributes=[]);
-    public function addText($label,$attributes=[]);
-    public function addTextarea($label,$attributes=[]);
-    public function addTextEditor($label,$attributes=[]);
-    public function addTime($label,$attributes=[]);
-    public function addUrl($label,$attributes=[]);
-    public function addVideo($label,$attributes=[]);
-    public function addWeek($label,$attributes=[]);
-    public function addYesNo($label,$attributes=[]);
+    public function addAudio($label, $attributes = []);
+    public function addButton($label, $attributes = []);
+    public function addCaptcha($label, $attributes = []);
+    public function addCheckbox($label, $options = [], $attributes = []);
+    public function addColor($label, $attributes = []);
+    public function addCountry($label, $attributes = []);
+    public function addDate($label, $attributes = []);
+    public function addDatetime($label, $attributes = []);
+    public function addDatetimeLocal($label, $attributes = []);
+    public function addEmail($label, $attributes = []);
+    public function addFile($label, $attributes = []);
+    public function addHidden($label, $attributes = []);
+    public function addImage($label, $attributes = []);
+    public function addMonth($label, $attributes = []);
+    public function addNumber($label, $attributes = []);
+    public function addPassword($label, $attributes = []);
+    public function addPhone($label, $attributes = []);
+    public function addRadio($label, $options = [], $attributes = []);
+    public function addRange($label, $attributes = []);
+    public function addReset($label, $attributes = []);
+    public function addSearch($label, $attributes = []);
+    public function addSelect($label, $options = [], $attributes = []);
+    public function addSubmit($label, $attributes = []);
+    public function addText($label, $attributes = []);
+    public function addTextarea($label, $attributes = []);
+    public function addTextEditor($label, $attributes = []);
+    public function addTime($label, $attributes = []);
+    public function addUrl($label, $attributes = []);
+    public function addVideo($label, $attributes = []);
+    public function addWeek($label, $attributes = []);
+    public function addYesNo($label, $attributes = []);
 }
\ No newline at end of file