iriven / PhpFormGenerator

Interfaces/FormBuilderInterface.php

Spacing +33 added lines, -33 removed lines

@@ -9,43 +9,43 @@
 interface FormBuilderInterface
 {
     /* COMMON METHODS */
-    public function Create($attributes=[]);
+    public function Create($attributes = []);
     public function Close();
-    public function OpenFieldset($attributes=[]);
+    public function OpenFieldset($attributes = []);
     public function CloseFieldset();
 
     /* 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 = []);
 
 
 }

PhpFormBuilder.php

Indentation +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
      */
     public function addAudio($label,$attributes=[])
     {
-       // $attributes['accept']='audio/*;capture=microphone';
+        // $attributes['accept']='audio/*;capture=microphone';
         $attributes['accept']='audio/*';
         return $this->addFile($label,$attributes);
     }
@@ -353,7 +353,7 @@ 
      */
     public function addImage($label,$attributes=[]){
         $attributes['accept']='image/*';
-       // $attributes['accept']='image/*;capture=camera';
+        // $attributes['accept']='image/*;capture=camera';
         return $this->addFile($label,$attributes);
     }
 

Spacing +243 added lines, -243 removed lines

@@ -13,25 +13,25 @@ 
 
 class PhpFormBuilder implements FormBuilderInterface
 {
-    private $GlobalAttributes=['accesskey','class','contenteditable', 'contextmenu','dir','draggable','dropzone','hidden','id','lang','spellcheck','style','tabindex','title','translate'];
-    private $AllowedEvents = ['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'];
-    private $AllowedAttributes= [
-        'button'=>['autofocus','disabled','form','formaction','formenctype','formmethod','formnovalidate','formtarget','framename','name','type','value'],
-        'checkbox'=>['autofocus','checked','defaultChecked','defaultvalue','disabled','form','indeterminate','name','required','type','value'],
-        'color'=>['autocomplete','autofocus','defaultvalue','disabled','form','list','name','type','value'],
-        'date'=>['autocomplete','autofocus','defaultvalue','disabled','form','list','max','min','name','readonly','required','step','type','value'],
-        'fieldset'=>['disabled','form','name','legend','legend-attributes'],
-        'file'=>['accept','autofocus','defaultvalue','disabled','files','form','multiple','name','required','type','value'],
-        'form'=>['accept','accept-charset','action','autocomplete','enctype','method','name','novalidate','target'],
-        'hidden'=>['form','name','type','value'],
-        'image'=>['alt','autofocus','defaultvalue','disabled','form','formaction','formenctype','formmethod','formnovalidate','formtarget','height','name','src','type','value','width'],
-        'label'=>['for','form'],
-        'option'=>['disabled','label','value','selected'],
-        'range'=>['autocomplete','autofocus','defaultvalue','disabled','form','list','max','min','name','step','type','value'],
-        'reset'=>['autofocus','defaultvalue','disabled','form','name','type','value'],
-        'select'=>['autofocus','disabled','form','multiple','name','required','size','selected','optgroup-attributes','option-attributes','value'],
-        'text'=>['autocomplete','autofocus','defaultvalue','disabled','form','list','minlength','maxlength','name','pattern','placeholder','readonly','required','size','type','value'],
-        'textarea'=>['autofocus','cols','dirname','disabled','form','maxlength','name','placeholder','readonly','required','rows','wrap','value']
+    private $GlobalAttributes = ['accesskey', 'class', 'contenteditable', 'contextmenu', 'dir', 'draggable', 'dropzone', 'hidden', 'id', 'lang', 'spellcheck', 'style', 'tabindex', 'title', 'translate'];
+    private $AllowedEvents = ['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'];
+    private $AllowedAttributes = [
+        'button'=>['autofocus', 'disabled', 'form', 'formaction', 'formenctype', 'formmethod', 'formnovalidate', 'formtarget', 'framename', 'name', 'type', 'value'],
+        'checkbox'=>['autofocus', 'checked', 'defaultChecked', 'defaultvalue', 'disabled', 'form', 'indeterminate', 'name', 'required', 'type', 'value'],
+        'color'=>['autocomplete', 'autofocus', 'defaultvalue', 'disabled', 'form', 'list', 'name', 'type', 'value'],
+        'date'=>['autocomplete', 'autofocus', 'defaultvalue', 'disabled', 'form', 'list', 'max', 'min', 'name', 'readonly', 'required', 'step', 'type', 'value'],
+        'fieldset'=>['disabled', 'form', 'name', 'legend', 'legend-attributes'],
+        'file'=>['accept', 'autofocus', 'defaultvalue', 'disabled', 'files', 'form', 'multiple', 'name', 'required', 'type', 'value'],
+        'form'=>['accept', 'accept-charset', 'action', 'autocomplete', 'enctype', 'method', 'name', 'novalidate', 'target'],
+        'hidden'=>['form', 'name', 'type', 'value'],
+        'image'=>['alt', 'autofocus', 'defaultvalue', 'disabled', 'form', 'formaction', 'formenctype', 'formmethod', 'formnovalidate', 'formtarget', 'height', 'name', 'src', 'type', 'value', 'width'],
+        'label'=>['for', 'form'],
+        'option'=>['disabled', 'label', 'value', 'selected'],
+        'range'=>['autocomplete', 'autofocus', 'defaultvalue', 'disabled', 'form', 'list', 'max', 'min', 'name', 'step', 'type', 'value'],
+        'reset'=>['autofocus', 'defaultvalue', 'disabled', 'form', 'name', 'type', 'value'],
+        'select'=>['autofocus', 'disabled', 'form', 'multiple', 'name', 'required', 'size', 'selected', 'optgroup-attributes', 'option-attributes', 'value'],
+        'text'=>['autocomplete', 'autofocus', 'defaultvalue', 'disabled', 'form', 'list', 'minlength', 'maxlength', 'name', 'pattern', 'placeholder', 'readonly', 'required', 'size', 'type', 'value'],
+        'textarea'=>['autofocus', 'cols', 'dirname', 'disabled', 'form', 'maxlength', 'name', 'placeholder', 'readonly', 'required', 'rows', 'wrap', 'value']
     ];
     public $ValidationErrors = [];
     private $OptionResolver;
@@ -41,16 +41,16 @@ 
      * PhpFormBuilder constructor.
      * @param string $method
      */
-    public function __construct($method = 'post'){
-        try{
+    public function __construct($method = 'post') {
+        try {
             $method = strtolower(trim($method));
-            if(!in_array($method,['get','post'],true))
+            if (!in_array($method, ['get', 'post'], true))
                 $method = $_SERVER['REQUEST_METHOD'];
             $this->RequestMethod = $method;
-            $this->OptionResolver= new PhpOptionsResolver();
+            $this->OptionResolver = new PhpOptionsResolver();
             return $this;
         }
-        catch(\Exception $e){echo $e->getMessage();}
+        catch (\Exception $e) {echo $e->getMessage(); }
         return false;
     }
     /* COMMON METHODS */
@@ -58,23 +58,23 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function Create($attributes=[]){
-        $attributes = array_change_key_case($attributes,CASE_LOWER);
+    public function Create($attributes = []) {
+        $attributes = array_change_key_case($attributes, CASE_LOWER);
         $this->OptionResolver->setDefaults([
             'method'=>'post',
             'action'=>basename($_SERVER["SCRIPT_NAME"]),
             'enctype'=>'application/x-www-form-urlencoded',
             'name'=>md5($_SERVER['REQUEST_URI'].microtime(true))
         ]);
-        $this->OptionResolver->addAllowedValues('method',['post','get']);
-        $this->OptionResolver->addAllowedValues('enctype',[
+        $this->OptionResolver->addAllowedValues('method', ['post', 'get']);
+        $this->OptionResolver->addAllowedValues('enctype', [
             'application/x-www-form-urlencoded',
             'multipart/form-data',
             'text/plain']);
-        $this->OptionResolver->addAllowedTypes('action','string');
-        $this->OptionResolver->addAllowedTypes('name','string');
-        $attributes=$this->OptionResolver->resolve($this->FilterAttributes($attributes,'form'));
-        if(strcasecmp($attributes['method'],'get') == 0) unset($attributes['enctype']);
+        $this->OptionResolver->addAllowedTypes('action', 'string');
+        $this->OptionResolver->addAllowedTypes('name', 'string');
+        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes, 'form'));
+        if (strcasecmp($attributes['method'], 'get') == 0) unset($attributes['enctype']);
         $html  = '<form';
         $html .= $this->BuildAttributes($attributes);
         $html .= '>';
@@ -84,7 +84,7 @@ 
     /**
      * @return mixed
      */
-    public function Close(){
+    public function Close() {
         return $this->Save($html = '</form>');
     }
 
@@ -92,22 +92,22 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function OpenFieldset($attributes=[]){
-        $attributes = array_change_key_case($attributes,CASE_LOWER);
+    public function OpenFieldset($attributes = []) {
+        $attributes = array_change_key_case($attributes, CASE_LOWER);
         $this->OptionResolver->setDefaults([
             'legend'=>null,
             'name'=>md5($_SERVER['REQUEST_URI'].microtime(true))
         ]);
-        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes,'fieldset'));
-        $html ='<fieldset';
-        if($attributes)
-            $html.= $this->BuildAttributes($attributes,array('legend','label','id','legend-attributes'));
+        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes, 'fieldset'));
+        $html = '<fieldset';
+        if ($attributes)
+            $html .= $this->BuildAttributes($attributes, array('legend', 'label', 'id', 'legend-attributes'));
         $html .= ' >';
-        if(isset($attributes['legend']))
+        if (isset($attributes['legend']))
         {
-            $attributes['legend-attributes']?:[];
-            is_array($attributes['legend-attributes']) or $attributes['legend-attributes']=[$attributes['legend-attributes']];
-            $legendAttributes=$this->FilterAttributes($attributes['legend-attributes'],'legend');
+            $attributes['legend-attributes'] ?: [];
+            is_array($attributes['legend-attributes']) or $attributes['legend-attributes'] = [$attributes['legend-attributes']];
+            $legendAttributes = $this->FilterAttributes($attributes['legend-attributes'], 'legend');
             $html .= '<legend';
             $html .= $this->BuildAttributes($legendAttributes);
             $html .= '>';
@@ -120,8 +120,8 @@ 
     /**
      * @return PhpFormBuilder
      */
-    public function CloseFieldset(){
-        return $this->Save($html='</fieldset>');
+    public function CloseFieldset() {
+        return $this->Save($html = '</fieldset>');
     }
 
     /* INPUT TYPES */
@@ -130,11 +130,11 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addAudio($label,$attributes=[])
+    public function addAudio($label, $attributes = [])
     {
        // $attributes['accept']='audio/*;capture=microphone';
-        $attributes['accept']='audio/*';
-        return $this->addFile($label,$attributes);
+        $attributes['accept'] = 'audio/*';
+        return $this->addFile($label, $attributes);
     }
 
     /**
@@ -142,10 +142,10 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addButton($label,$attributes=[]){
+    public function addButton($label, $attributes = []) {
         $attributes['type'] = 'button';
-        $attributes['value'] = $attributes['value']?:$label;
-        $html = $this->CreateInput($label,$attributes);
+        $attributes['value'] = $attributes['value'] ?: $label;
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -154,8 +154,8 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addCaptcha($label,$attributes=[]){
-        $attributes = array_change_key_case($attributes,CASE_LOWER);
+    public function addCaptcha($label, $attributes = []) {
+        $attributes = array_change_key_case($attributes, CASE_LOWER);
         $this->OptionResolver->setDefaults([
             'value'=>null,
             'maxlength'=>2,
@@ -164,36 +164,36 @@ 
             'id'=>'inputCaptcha',
             'name'=>'Captcha'
         ]);
-        $label=$label?:'Entrez le résultat de';
+        $label = $label ?: 'Entrez le résultat de';
         $attributes['name'] = $this->normalize($attributes['name']);
-        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes,'text'));
-        $operators = array('+','-','x');
+        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes, 'text'));
+        $operators = array('+', '-', 'x');
         shuffle($operators);
         $operator = $operators[0];
-        switch($operator):
+        switch ($operator):
             case 'x':
-                do{
-                    $num1 = rand(2,6);
-                    $num2 = rand(3,7);
+                do {
+                    $num1 = rand(2, 6);
+                    $num2 = rand(3, 7);
                     $response = $num2 * $num1;
-                } while($response > 35);
+                } while ($response > 35);
                 break;
             case '-':
-                do{
-                    $num1 = rand(1,8);
-                    $num2 = rand(6,11);
+                do {
+                    $num1 = rand(1, 8);
+                    $num2 = rand(6, 11);
                     $response = $num2 - $num1;
-                } while($response < 2);
+                } while ($response < 2);
                 break;
             default:
-                $num1 = rand(1,7);
-                $num2 = rand(3,8);
+                $num1 = rand(1, 7);
+                $num2 = rand(3, 8);
                 $response = $num1 + $num2;
                 break;
         endswitch;
         $label .= ": $num2 $operator $num1";
         $_SESSION[md5($attributes['name'])] = $response;
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -202,12 +202,12 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addColor($label,$attributes=[])
+    public function addColor($label, $attributes = [])
     {
         $attributes['pattern'] = '#[a-g0-9]{6}';
         $attributes['title'] = '6-digit hexidecimal color (e.g. #000000)';
         $attributes['type'] = 'color';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
     /**
@@ -216,47 +216,47 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addCheckbox($label,$options=[],$attributes=[]){
-        $attributes = array_change_key_case($attributes,CASE_LOWER);
+    public function addCheckbox($label, $options = [], $attributes = []) {
+        $attributes = array_change_key_case($attributes, CASE_LOWER);
         $this->OptionResolver->setDefaults([
             'value'=>$this->getDefaultValue($label),
             'type'=>'checkbox',
             'id'=>'input'.$this->normalize($label),
             'name'=>$this->normalize($label)
         ]);
-        $this->OptionResolver->addAllowedValues('type',['radio','checkbox']);
-        $type = $attributes['type']?:'checkbox';
-        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes,$type));
-        if(strpos($attributes['id'],'input')!==0)
+        $this->OptionResolver->addAllowedValues('type', ['radio', 'checkbox']);
+        $type = $attributes['type'] ?: 'checkbox';
+        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes, $type));
+        if (strpos($attributes['id'], 'input') !== 0)
             $attributes['id'] = $this->normalize($attributes['id']);
 
-        if(sizeof($options)<2)
+        if (sizeof($options) < 2)
         {
-            empty($attributes['value']) or $attributes['checked'] ='checked';
+            empty($attributes['value']) or $attributes['checked'] = 'checked';
             $attributes['value'] = '1';
             $attributes['type'] = 'checkbox';
-            $this->addHidden($label,array('value'=>'0'));
-            $html = $this->CreateInput($label,$attributes);
+            $this->addHidden($label, array('value'=>'0'));
+            $html = $this->CreateInput($label, $attributes);
         }
         else
         {
-            if(isset($attributes['value']))
+            if (isset($attributes['value']))
             {
-                if(!is_array($attributes['value'])) $attributes['value'] = array($attributes['value']);
+                if (!is_array($attributes['value'])) $attributes['value'] = array($attributes['value']);
             }
             else
                 $attributes['value'] = [];
-            if(substr($attributes['name'], -2) !== '[]')
+            if (substr($attributes['name'], -2) !== '[]')
                 $attributes['name'] .= '[]';
             $count = 0;
-            $html = $this->InsertLabel($label,array('for'=>$attributes['id']));
-            foreach($options as $value => $text)
+            $html = $this->InsertLabel($label, array('for'=>$attributes['id']));
+            foreach ($options as $value => $text)
             {
                 $html .= '<label for="'.$attributes['id'].'-'.$count.'">';
                 $html .= '<input id="'.$attributes['id'].'-'.$count.'"';
                 $html .= ' value="'.$value.'"';
-                $html .= $this->BuildAttributes($attributes,array('id', 'value', 'checked', 'required'));
-                if(in_array($value, $attributes['value'])) $html .= ' checked="checked"';
+                $html .= $this->BuildAttributes($attributes, array('id', 'value', 'checked', 'required'));
+                if (in_array($value, $attributes['value'])) $html .= ' checked="checked"';
                 $html .= ' >'.$text.'</label>';
                 ++$count;
             }
@@ -268,24 +268,24 @@ 
      * @param array $attributes
      * @return mixed
      */
-    public function addCountry($label,$attributes=[])
+    public function addCountry($label, $attributes = [])
     {
-        $default = array('placeholder'=>'Choose a Country...','required'=>'required');
-        $attributes = array_merge($default,$attributes);
+        $default = array('placeholder'=>'Choose a Country...', 'required'=>'required');
+        $attributes = array_merge($default, $attributes);
         $Dataset = new WorldCountriesDatas();
-        return $this->addSelect($label,$Dataset->getAllCountriesCodeAndName(),$attributes);
+        return $this->addSelect($label, $Dataset->getAllCountriesCodeAndName(), $attributes);
     }
     /**
      * @param $label
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addDate($label,$attributes=[]){
+    public function addDate($label, $attributes = []) {
         // $attributes['pattern'] = '\d{4}-\d{2}-\d{2}';
         //  $attributes['placeholder'] = 'YYYY-dd-MM (e.g. ' . date('Y-m-d') . ')';
         $attributes['type'] = 'date';
         $attributes['title'] = $attributes['placeholder'];
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -294,10 +294,10 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addDatetime($label,$attributes=[]){
+    public function addDatetime($label, $attributes = []) {
         $attributes['type'] = 'datetime';
-        $attributes['placeholder'] = 'YYYY-dd-MM H:i:s(e.g. ' . date('Y-m-d H:i:s') . ')';
-        $html = $this->CreateInput($label,$attributes);
+        $attributes['placeholder'] = 'YYYY-dd-MM H:i:s(e.g. '.date('Y-m-d H:i:s').')';
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -306,9 +306,9 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addDatetimeLocal($label,$attributes=[]){
+    public function addDatetimeLocal($label, $attributes = []) {
         $attributes['type'] = 'datetime-local';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -317,10 +317,10 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addEmail($label,$attributes=[]){
+    public function addEmail($label, $attributes = []) {
         $attributes['type'] = 'email';
         $attributes['required'] = 'required';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -329,9 +329,9 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addFile($label,$attributes=[]){
+    public function addFile($label, $attributes = []) {
         $attributes['type'] = 'file';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -340,9 +340,9 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addHidden($label,$attributes=[]){
+    public function addHidden($label, $attributes = []) {
         $attributes['type'] = 'hidden';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -351,10 +351,10 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addImage($label,$attributes=[]){
-        $attributes['accept']='image/*';
+    public function addImage($label, $attributes = []) {
+        $attributes['accept'] = 'image/*';
        // $attributes['accept']='image/*;capture=camera';
-        return $this->addFile($label,$attributes);
+        return $this->addFile($label, $attributes);
     }
 
     /**
@@ -362,12 +362,12 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addMonth($label,$attributes=[]){
+    public function addMonth($label, $attributes = []) {
         $attributes['type'] = 'month';
         $attributes['pattern'] = '\d{4}-\d{2}';
-        $attributes['placeholder'] = 'YYYY-MM (e.g. ' . date('Y-m') . ')';
+        $attributes['placeholder'] = 'YYYY-MM (e.g. '.date('Y-m').')';
         $attributes['title'] = $attributes['placeholder'];
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -376,11 +376,11 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addNumber($label,$attributes=[]){
-        $default = array('min'=>'0','max'=>'100','step'=>'1');
-        $attributes = array_merge($default,$attributes);
+    public function addNumber($label, $attributes = []) {
+        $default = array('min'=>'0', 'max'=>'100', 'step'=>'1');
+        $attributes = array_merge($default, $attributes);
         $attributes['type'] = 'number';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -389,11 +389,11 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addPassword($label,$attributes=[]){
-        $default = array('placeholder'=>'**********','minlength'=>'6','maxlength'=>'25','required'=>'required');
-        $attributes = array_merge($default,$attributes);
+    public function addPassword($label, $attributes = []) {
+        $default = array('placeholder'=>'**********', 'minlength'=>'6', 'maxlength'=>'25', 'required'=>'required');
+        $attributes = array_merge($default, $attributes);
         $attributes['type'] = 'password';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -402,9 +402,9 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addPhone($label,$attributes=[]){
+    public function addPhone($label, $attributes = []) {
         $attributes['type'] = 'tel';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -414,9 +414,9 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addRadio($label,$options=[],$attributes=[]){
+    public function addRadio($label, $options = [], $attributes = []) {
         $attributes['type'] = 'radio';
-        return $this->addCheckbox($label,$options,$attributes);
+        return $this->addCheckbox($label, $options, $attributes);
     }
 
     /**
@@ -424,11 +424,11 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addRange($label,$attributes=[]){
-        $default = array('min'=>'0','max'=>'100','step'=>'1');
-        $attributes = array_merge($default,$attributes);
+    public function addRange($label, $attributes = []) {
+        $default = array('min'=>'0', 'max'=>'100', 'step'=>'1');
+        $attributes = array_merge($default, $attributes);
         $attributes['type'] = 'range';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -437,10 +437,10 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addReset($label,$attributes=[]){
+    public function addReset($label, $attributes = []) {
         $attributes['type'] = 'reset';
-        $attributes['value'] = $attributes['value']?:$label;
-        $html = $this->CreateInput($label,$attributes);
+        $attributes['value'] = $attributes['value'] ?: $label;
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -449,10 +449,10 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addSearch($label,$attributes=[]){
+    public function addSearch($label, $attributes = []) {
         $attributes['type'] = 'search';
         $attributes['required'] = 'required';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -462,8 +462,8 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addSelect($label,$options=[],$attributes=[]){
-        $attributes = array_change_key_case($attributes,CASE_LOWER);
+    public function addSelect($label, $options = [], $attributes = []) {
+        $attributes = array_change_key_case($attributes, CASE_LOWER);
         $this->OptionResolver->setDefaults([
             'value'=>$this->getDefaultValue($label),
             'id'=>'input'.$this->normalize($label),
@@ -471,48 +471,48 @@ 
             'type'=>'select',
             'placeholder'=>'Make a Choise...'
         ]);
-        $this->OptionResolver->addAllowedValues('type','select');
-        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes,'select'));
-        $multiple=false;
-        if(strpos($attributes['id'],'input')!==0)
+        $this->OptionResolver->addAllowedValues('type', 'select');
+        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes, 'select'));
+        $multiple = false;
+        if (strpos($attributes['id'], 'input') !== 0)
             $attributes['id'] = $this->normalize($attributes['id']);
-        if($attributes['value'])
+        if ($attributes['value'])
         {
-            if(!is_array($attributes['value']))
+            if (!is_array($attributes['value']))
                 $attributes['value'] = array($attributes['value']);
         }
         else
             $attributes['value'] = [];
-        if(isset($attributes['multiple']) and ($attributes['multiple']==='multiple'))
-            $multiple=true;
-        if($multiple)
-        {   $attributes['size']= $attributes['size']?:3;
-            if(substr($attributes['name'], -2) !== '[]')
+        if (isset($attributes['multiple']) and ($attributes['multiple'] === 'multiple'))
+            $multiple = true;
+        if ($multiple)
+        {   $attributes['size'] = $attributes['size'] ?: 3;
+            if (substr($attributes['name'], -2) !== '[]')
                 $attributes['name'] .= '[]';
         }
 
-        $html = $this->InsertLabel($label,array('for'=>$attributes['id']));
-        $html .= '<select'.$this->BuildAttributes($attributes,array('value','selected','optgroup-attributes','option-attributes','placeholder')).'>';
-        if(!$attributes['value'] and isset($attributes['placeholder']))
+        $html = $this->InsertLabel($label, array('for'=>$attributes['id']));
+        $html .= '<select'.$this->BuildAttributes($attributes, array('value', 'selected', 'optgroup-attributes', 'option-attributes', 'placeholder')).'>';
+        if (!$attributes['value'] and isset($attributes['placeholder']))
         {
             $html .= '<option value="" disabled selected>'.$attributes['placeholder'].'</option>';
             unset($attributes['placeholder']);
         }
         $selected = false;
-        foreach($options as $OptionValue=>$OptionLabel):
+        foreach ($options as $OptionValue=>$OptionLabel):
 
-            if(is_array($OptionLabel))
+            if (is_array($OptionLabel))
             {
-                $html .= call_user_func_array($OptGroupHtml = function($groupName,$groupOptions) use (&$OptGroupHtml,&$attributes,&$selected)
+                $html .= call_user_func_array($OptGroupHtml = function($groupName, $groupOptions) use (&$OptGroupHtml, &$attributes, &$selected)
                 {
-                    $output='<optgroup label="'.$groupName.'">';
-                    foreach($groupOptions as $key=>$optLabel)
+                    $output = '<optgroup label="'.$groupName.'">';
+                    foreach ($groupOptions as $key=>$optLabel)
                     {
-                        if(is_array($optLabel))$output .= $OptGroupHtml($key,$optLabel);
+                        if (is_array($optLabel))$output .= $OptGroupHtml($key, $optLabel);
                         else
                         {
                             $output .= '<option value="'.$key.'"';
-                            if(!$selected and in_array($key,$attributes['value']))
+                            if (!$selected and in_array($key, $attributes['value']))
                             {
                                 $output .= ' selected="selected"';
                                 $selected = true;
@@ -521,14 +521,14 @@ 
                             $output .= $optLabel.'</option>';
                         }
                     }
-                    $output.='</optgroup>';
+                    $output .= '</optgroup>';
                     return$output;
-                },[$OptionValue,$OptionLabel]);
+                },[$OptionValue, $OptionLabel]);
             }
             else
             {
                 $html .= '<option value="'.$OptionValue.'"';
-                if(!$selected and in_array($OptionValue,$attributes['value']))
+                if (!$selected and in_array($OptionValue, $attributes['value']))
                 {
                     $html .= ' selected="selected"';
                     $selected = true;
@@ -546,11 +546,11 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addSubmit($label,$attributes=[]){
-        $this->addHidden('token',array('value'=>sha1(session_id())));
+    public function addSubmit($label, $attributes = []) {
+        $this->addHidden('token', array('value'=>sha1(session_id())));
         $attributes['type'] = 'submit';
-        $attributes['value'] = $attributes['value']?:$label;
-        $html = $this->CreateInput($label,$attributes);
+        $attributes['value'] = $attributes['value'] ?: $label;
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -559,9 +559,9 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addText($label,$attributes=[]){
+    public function addText($label, $attributes = []) {
         $attributes['type'] = 'text';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -570,8 +570,8 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addTextarea($label,$attributes=[]){
-        $attributes = array_change_key_case($attributes,CASE_LOWER);
+    public function addTextarea($label, $attributes = []) {
+        $attributes = array_change_key_case($attributes, CASE_LOWER);
         $this->OptionResolver->setDefaults([
             'id'=>'input'.$this->normalize($label),
             'autocomplete'=>'off',
@@ -580,11 +580,11 @@ 
             'value' => $this->getDefaultValue($label),
             'name' => $this->normalize($label)
         ]);
-        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes,'textarea'));
-        if(strpos($attributes['id'],'input')!==0)
+        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes, 'textarea'));
+        if (strpos($attributes['id'], 'input') !== 0)
             $attributes['id'] = $this->normalize($attributes['id']);
-        $html  = $this->InsertLabel($label,array('for'=>$attributes['id']));
-        $html .= '<textarea'. $this->BuildAttributes($attributes,array('value')).'>';
+        $html  = $this->InsertLabel($label, array('for'=>$attributes['id']));
+        $html .= '<textarea'.$this->BuildAttributes($attributes, array('value')).'>';
         $html .= $attributes['value'];
         $html .= '</textarea>';
         return $this->Save($html);
@@ -595,7 +595,7 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addTextEditor($label,$attributes=[])
+    public function addTextEditor($label, $attributes = [])
     {
         $attributes['class'] = 'editor';
         return $this->addTextarea($label, $attributes);
@@ -606,9 +606,9 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addTime($label,$attributes=[]){
+    public function addTime($label, $attributes = []) {
         $attributes['type'] = 'time';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -617,9 +617,9 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addUrl($label,$attributes=[]){
+    public function addUrl($label, $attributes = []) {
         $attributes['type'] = 'url';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -628,10 +628,10 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addVideo($label,$attributes=[]){
+    public function addVideo($label, $attributes = []) {
         //$attributes['accept']='video/*;capture=camcorder';
-        $attributes['accept']='video/*';
-        return $this->addFile($label,$attributes);
+        $attributes['accept'] = 'video/*';
+        return $this->addFile($label, $attributes);
     }
 
     /**
@@ -639,9 +639,9 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addWeek($label,$attributes=[]){
+    public function addWeek($label, $attributes = []) {
         $attributes['type'] = 'week';
-        $html = $this->CreateInput($label,$attributes);
+        $html = $this->CreateInput($label, $attributes);
         return $this->Save($html);
     }
 
@@ -650,12 +650,12 @@ 
      * @param array $attributes
      * @return PhpFormBuilder
      */
-    public function addYesNo($label,$attributes=[]){
+    public function addYesNo($label, $attributes = []) {
         $options = array(
             '1' => 'Yes',
             '0' => 'No'
         );
-        return $this->addRadio($label,$options,$attributes);
+        return $this->addRadio($label, $options, $attributes);
     }
 
     /* PRIVATES METHODS */
@@ -664,25 +664,25 @@ 
      * @param null $ignore
      * @return bool|null|string
      */
-    private function BuildAttributes($attributes,$ignore = null){
-        if(!$attributes) return false;
+    private function BuildAttributes($attributes, $ignore = null) {
+        if (!$attributes) return false;
         is_array($attributes) or $attributes = array($attributes);
         $filtered = array_keys($attributes);
-        if($ignore)
+        if ($ignore)
         {
             if (!is_array($ignore)) $ignore = array($ignore);
             $filtered = array_diff($filtered, $ignore);
         }
         $output = null;
-        foreach($attributes as $key=>$value)
+        foreach ($attributes as $key=>$value)
         {
-            if(!in_array($key,$filtered)) continue;
+            if (!in_array($key, $filtered)) continue;
             $output .= ' ';
             $key = $this->normalize($key);
-            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;
+                if (is_numeric($key)) $output .= $value;
                 else $output .= $key.'="'.$value.'"';
             endif;
         }
@@ -694,16 +694,16 @@ 
      * @param array $attributes
      * @return bool|string
      */
-    private function CreateInput($label,$attributes=[]){
-        $attributes = array_change_key_case($attributes,CASE_LOWER);
+    private function CreateInput($label, $attributes = []) {
+        $attributes = array_change_key_case($attributes, CASE_LOWER);
         $this->OptionResolver->setDefaults([
             'value' => $this->getDefaultValue($label),
             'type' => 'text',
-            'id' => 'input' . $this->normalize($label),
+            'id' => 'input'.$this->normalize($label),
             'autocomplete' => 'off',
             'name' => $this->normalize($label)
         ]);
-        $this->OptionResolver->setAllowedValues('type',[
+        $this->OptionResolver->setAllowedValues('type', [
             'button',
             'checkbox',
             'color',
@@ -727,12 +727,12 @@ 
             'time',
             'url',
             'week']);
-        $type = $attributes['type']?:'text';
-        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes,$type));
-        $notLabeled = array('hidden','submit','reset','button');
-        if(strpos($attributes['id'],'input')!==0)
+        $type = $attributes['type'] ?: 'text';
+        $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes, $type));
+        $notLabeled = array('hidden', 'submit', 'reset', 'button');
+        if (strpos($attributes['id'], 'input') !== 0)
             $attributes['id'] = $this->normalize($attributes['id']);
-        $html  = !in_array($attributes['type'],$notLabeled)?$this->InsertLabel($label,array('for'=>$attributes['id'])):'';
+        $html  = !in_array($attributes['type'], $notLabeled) ? $this->InsertLabel($label, array('for'=>$attributes['id'])) : '';
         $html .= '<input';
         $html .= $this->BuildAttributes($attributes);
         $html .= ' >';
@@ -752,8 +752,8 @@ 
         if (!$errorMsg) return '';
         if (is_array($errorMsg))
         {
-            $html='';
-            foreach ($errorMsg as $error){
+            $html = '';
+            foreach ($errorMsg as $error) {
                 $html .= '<li class="hint"><span class="error">';
                 $html .= $error;
                 $html .= '</span></li>';
@@ -773,10 +773,10 @@ 
      * @param string $element
      * @return array
      */
-    private function FilterAttributes($attributes,$element='text'){
-        is_array($attributes) or $attributes=[$attributes];
-        $attributes=array_change_key_case($attributes,CASE_LOWER);
-        $AcceptedAttributes = array_merge($this->AllowedEvents,$this->GlobalAttributes);
+    private function FilterAttributes($attributes, $element = 'text') {
+        is_array($attributes) or $attributes = [$attributes];
+        $attributes = array_change_key_case($attributes, CASE_LOWER);
+        $AcceptedAttributes = array_merge($this->AllowedEvents, $this->GlobalAttributes);
         $element = strtolower($element);
         switch ($element):
             case 'date':
@@ -786,75 +786,75 @@ 
             case 'number':
             case 'time':
             case 'week':
-                if($element === 'number') $AcceptedAttributes[]='placeholder';
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['date']);
+                if ($element === 'number') $AcceptedAttributes[] = 'placeholder';
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['date']);
                 break;
             case 'color':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['color']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['color']);
                 break;
             case 'file':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['file']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['file']);
                 break;
             case 'image':
             case 'video':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['image']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['image']);
                 break;
             case 'radio':
             case 'checkbox':
-                $tmpAttributesList=$this->AllowedAttributes['checkbox'];
-                if($element === 'radio')
+                $tmpAttributesList = $this->AllowedAttributes['checkbox'];
+                if ($element === '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':
             case 'button':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['button']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['button']);
                 break;
 
             case 'reset':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['reset']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['reset']);
                 break;
             case 'range':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['range']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['range']);
                 break;
             case 'textarea':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['textarea']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['textarea']);
                 break;
             case 'option':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['option']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['option']);
                 break;
             case 'label':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['label']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['label']);
                 break;
             case 'select':
-                $AcceptedAttributes[]='placeholder';
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['select']);
+                $AcceptedAttributes[] = 'placeholder';
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['select']);
                 break;
             case 'form':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['form']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['form']);
                 break;
             case 'fieldset':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['fieldset']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['fieldset']);
                 break;
             case 'hidden':
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['hidden']);
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['hidden']);
                 break;
             default:
-                if($element === 'email') $AcceptedAttributes[]='multiple';
-                $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['text']);
+                if ($element === 'email') $AcceptedAttributes[] = 'multiple';
+                $AcceptedAttributes = array_merge($AcceptedAttributes, $this->AllowedAttributes['text']);
                 break;
         endswitch;
         $AcceptedAttributes = array_unique($AcceptedAttributes);
-        $attributesKeys=array_keys($attributes);
+        $attributesKeys = array_keys($attributes);
         foreach ($attributesKeys as $attribute):
-            !is_numeric($attribute) or $attribute=$attributes[$attribute];
-            if(!in_array($attribute,$AcceptedAttributes)){
-                if(substr($attribute,0,5)!=='data-')
-                    $AcceptedAttributes[] +=$attribute;
+            !is_numeric($attribute) or $attribute = $attributes[$attribute];
+            if (!in_array($attribute, $AcceptedAttributes)) {
+                if (substr($attribute, 0, 5) !== 'data-')
+                    $AcceptedAttributes[] += $attribute;
                 else
                     unset($attributes[$attribute]);
             }
@@ -867,11 +867,11 @@ 
      * @param $label
      * @return bool|string
      */
-    private function getDefaultValue($label){
-        if(!$label) return false;
+    private function getDefaultValue($label) {
+        if (!$label) return false;
         $label = $this->normalize($label);
-        $request = strcasecmp($this->RequestMethod,'get')==0 ? $_GET : $_POST;
-        if(!$value = $request[$label]) return '';
+        $request = strcasecmp($this->RequestMethod, 'get') == 0 ? $_GET : $_POST;
+        if (!$value = $request[$label]) return '';
         return $value;
     }
 
@@ -880,9 +880,9 @@ 
      * @param array $attributes
      * @return bool|string
      */
-    private function InsertLabel($label,$attributes=[]){
-        if(!$label or is_array($label)) return false;
-        $labelAttributes = $this->FilterAttributes($attributes,'label');
+    private function InsertLabel($label, $attributes = []) {
+        if (!$label or is_array($label)) return false;
+        $labelAttributes = $this->FilterAttributes($attributes, 'label');
         $html = '<label'.$this->BuildAttributes($labelAttributes).'>';
         $html .= $label;
         $html .= $this->DisplayError($label);
@@ -895,11 +895,11 @@ 
      */
     private function normalize($keys)
     {
-        if(is_array($keys)) return false;
-        foreach (array(' ', '&nbsp;', '\n', '\t', '\r', '"','\'','_') as $strip)
+        if (is_array($keys)) return false;
+        foreach (array(' ', '&nbsp;', '\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;
     }
 
@@ -910,7 +910,7 @@ 
     private function Save($html)
     {
         print_r($html);
-        return strcasecmp($html,'</form>') !== 0? $this: null;
+        return strcasecmp($html, '</form>') !== 0 ? $this : null;
     }
 
 }

Braces +100 added lines, -57 removed lines

@@ -44,13 +44,13 @@ 
     public function __construct($method = 'post'){
         try{
             $method = strtolower(trim($method));
-            if(!in_array($method,['get','post'],true))
-                $method = $_SERVER['REQUEST_METHOD'];
+            if(!in_array($method,['get','post'],true)) {
+                            $method = $_SERVER['REQUEST_METHOD'];
+            }
             $this->RequestMethod = $method;
             $this->OptionResolver= new PhpOptionsResolver();
             return $this;
-        }
-        catch(\Exception $e){echo $e->getMessage();}
+        } catch(\Exception $e){echo $e->getMessage();}
         return false;
     }
     /* COMMON METHODS */
@@ -74,7 +74,9 @@ 
         $this->OptionResolver->addAllowedTypes('action','string');
         $this->OptionResolver->addAllowedTypes('name','string');
         $attributes=$this->OptionResolver->resolve($this->FilterAttributes($attributes,'form'));
-        if(strcasecmp($attributes['method'],'get') == 0) unset($attributes['enctype']);
+        if(strcasecmp($attributes['method'],'get') == 0) {
+          unset($attributes['enctype']);
+        }
         $html  = '<form';
         $html .= $this->BuildAttributes($attributes);
         $html .= '>';
@@ -100,8 +102,9 @@ 
         ]);
         $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes,'fieldset'));
         $html ='<fieldset';
-        if($attributes)
-            $html.= $this->BuildAttributes($attributes,array('legend','label','id','legend-attributes'));
+        if($attributes) {
+                    $html.= $this->BuildAttributes($attributes,array('legend','label','id','legend-attributes'));
+        }
         $html .= ' >';
         if(isset($attributes['legend']))
         {
@@ -227,8 +230,9 @@ 
         $this->OptionResolver->addAllowedValues('type',['radio','checkbox']);
         $type = $attributes['type']?:'checkbox';
         $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes,$type));
-        if(strpos($attributes['id'],'input')!==0)
-            $attributes['id'] = $this->normalize($attributes['id']);
+        if(strpos($attributes['id'],'input')!==0) {
+                    $attributes['id'] = $this->normalize($attributes['id']);
+        }
 
         if(sizeof($options)<2)
         {
@@ -237,17 +241,19 @@ 
             $attributes['type'] = 'checkbox';
             $this->addHidden($label,array('value'=>'0'));
             $html = $this->CreateInput($label,$attributes);
-        }
-        else
+        } else
         {
             if(isset($attributes['value']))
             {
-                if(!is_array($attributes['value'])) $attributes['value'] = array($attributes['value']);
+                if(!is_array($attributes['value'])) {
+                  $attributes['value'] = array($attributes['value']);
+                }
+            } else {
+                            $attributes['value'] = [];
+            }
+            if(substr($attributes['name'], -2) !== '[]') {
+                            $attributes['name'] .= '[]';
             }
-            else
-                $attributes['value'] = [];
-            if(substr($attributes['name'], -2) !== '[]')
-                $attributes['name'] .= '[]';
             $count = 0;
             $html = $this->InsertLabel($label,array('for'=>$attributes['id']));
             foreach($options as $value => $text)
@@ -256,7 +262,9 @@ 
                 $html .= '<input id="'.$attributes['id'].'-'.$count.'"';
                 $html .= ' value="'.$value.'"';
                 $html .= $this->BuildAttributes($attributes,array('id', 'value', 'checked', 'required'));
-                if(in_array($value, $attributes['value'])) $html .= ' checked="checked"';
+                if(in_array($value, $attributes['value'])) {
+                  $html .= ' checked="checked"';
+                }
                 $html .= ' >'.$text.'</label>';
                 ++$count;
             }
@@ -474,21 +482,25 @@ 
         $this->OptionResolver->addAllowedValues('type','select');
         $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes,'select'));
         $multiple=false;
-        if(strpos($attributes['id'],'input')!==0)
-            $attributes['id'] = $this->normalize($attributes['id']);
+        if(strpos($attributes['id'],'input')!==0) {
+                    $attributes['id'] = $this->normalize($attributes['id']);
+        }
         if($attributes['value'])
         {
-            if(!is_array($attributes['value']))
-                $attributes['value'] = array($attributes['value']);
+            if(!is_array($attributes['value'])) {
+                            $attributes['value'] = array($attributes['value']);
+            }
+        } else {
+                    $attributes['value'] = [];
+        }
+        if(isset($attributes['multiple']) and ($attributes['multiple']==='multiple')) {
+                    $multiple=true;
         }
-        else
-            $attributes['value'] = [];
-        if(isset($attributes['multiple']) and ($attributes['multiple']==='multiple'))
-            $multiple=true;
         if($multiple)
         {   $attributes['size']= $attributes['size']?:3;
-            if(substr($attributes['name'], -2) !== '[]')
-                $attributes['name'] .= '[]';
+            if(substr($attributes['name'], -2) !== '[]') {
+                            $attributes['name'] .= '[]';
+            }
         }
 
         $html = $this->InsertLabel($label,array('for'=>$attributes['id']));
@@ -508,8 +520,9 @@ 
                     $output='<optgroup label="'.$groupName.'">';
                     foreach($groupOptions as $key=>$optLabel)
                     {
-                        if(is_array($optLabel))$output .= $OptGroupHtml($key,$optLabel);
-                        else
+                        if(is_array($optLabel)) {
+                          $output .= $OptGroupHtml($key,$optLabel);
+                        } else
                         {
                             $output .= '<option value="'.$key.'"';
                             if(!$selected and in_array($key,$attributes['value']))
@@ -524,8 +537,7 @@ 
                     $output.='</optgroup>';
                     return$output;
                 },[$OptionValue,$OptionLabel]);
-            }
-            else
+            } else
             {
                 $html .= '<option value="'.$OptionValue.'"';
                 if(!$selected and in_array($OptionValue,$attributes['value']))
@@ -581,8 +593,9 @@ 
             'name' => $this->normalize($label)
         ]);
         $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes,'textarea'));
-        if(strpos($attributes['id'],'input')!==0)
-            $attributes['id'] = $this->normalize($attributes['id']);
+        if(strpos($attributes['id'],'input')!==0) {
+                    $attributes['id'] = $this->normalize($attributes['id']);
+        }
         $html  = $this->InsertLabel($label,array('for'=>$attributes['id']));
         $html .= '<textarea'. $this->BuildAttributes($attributes,array('value')).'>';
         $html .= $attributes['value'];
@@ -665,25 +678,35 @@ 
      * @return bool|null|string
      */
     private function BuildAttributes($attributes,$ignore = null){
-        if(!$attributes) return false;
+        if(!$attributes) {
+          return false;
+        }
         is_array($attributes) or $attributes = array($attributes);
         $filtered = array_keys($attributes);
         if($ignore)
         {
-            if (!is_array($ignore)) $ignore = array($ignore);
+            if (!is_array($ignore)) {
+              $ignore = array($ignore);
+            }
             $filtered = array_diff($filtered, $ignore);
         }
         $output = null;
         foreach($attributes as $key=>$value)
         {
-            if(!in_array($key,$filtered)) continue;
+            if(!in_array($key,$filtered)) {
+              continue;
+            }
             $output .= ' ';
             $key = $this->normalize($key);
             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;
         }
         return $output;
@@ -730,8 +753,9 @@ 
         $type = $attributes['type']?:'text';
         $attributes = $this->OptionResolver->resolve($this->FilterAttributes($attributes,$type));
         $notLabeled = array('hidden','submit','reset','button');
-        if(strpos($attributes['id'],'input')!==0)
-            $attributes['id'] = $this->normalize($attributes['id']);
+        if(strpos($attributes['id'],'input')!==0) {
+                    $attributes['id'] = $this->normalize($attributes['id']);
+        }
         $html  = !in_array($attributes['type'],$notLabeled)?$this->InsertLabel($label,array('for'=>$attributes['id'])):'';
         $html .= '<input';
         $html .= $this->BuildAttributes($attributes);
@@ -745,11 +769,15 @@ 
      */
     private function DisplayError($label)
     {
-        if (!$label) return false;
+        if (!$label) {
+          return false;
+        }
         $label = $this->normalize($label);
         $errorMsg = null;
         !isset($this->ValidationErrors[$label]) OR $errorMsg = $this->ValidationErrors[$label];
-        if (!$errorMsg) return '';
+        if (!$errorMsg) {
+          return '';
+        }
         if (is_array($errorMsg))
         {
             $html='';
@@ -758,8 +786,7 @@ 
                 $html .= $error;
                 $html .= '</span></li>';
             }
-        }
-        else
+        } else
         {
             $html = '<li class="hint"><span class="error">';
             $html .= $errorMsg;
@@ -786,7 +813,9 @@ 
             case 'number':
             case 'time':
             case 'week':
-                if($element === 'number') $AcceptedAttributes[]='placeholder';
+                if($element === 'number') {
+                  $AcceptedAttributes[]='placeholder';
+                }
                 $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['date']);
                 break;
             case 'color':
@@ -805,7 +834,9 @@ 
                 if($element === '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;
@@ -844,7 +875,9 @@ 
                 $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['hidden']);
                 break;
             default:
-                if($element === 'email') $AcceptedAttributes[]='multiple';
+                if($element === 'email') {
+                  $AcceptedAttributes[]='multiple';
+                }
                 $AcceptedAttributes = array_merge($AcceptedAttributes,$this->AllowedAttributes['text']);
                 break;
         endswitch;
@@ -853,10 +886,11 @@ 
         foreach ($attributesKeys as $attribute):
             !is_numeric($attribute) or $attribute=$attributes[$attribute];
             if(!in_array($attribute,$AcceptedAttributes)){
-                if(substr($attribute,0,5)!=='data-')
-                    $AcceptedAttributes[] +=$attribute;
-                else
-                    unset($attributes[$attribute]);
+                if(substr($attribute,0,5)!=='data-') {
+                                    $AcceptedAttributes[] +=$attribute;
+                } else {
+                                    unset($attributes[$attribute]);
+                }
             }
 
         endforeach;
@@ -868,10 +902,14 @@ 
      * @return bool|string
      */
     private function getDefaultValue($label){
-        if(!$label) return false;
+        if(!$label) {
+          return false;
+        }
         $label = $this->normalize($label);
         $request = strcasecmp($this->RequestMethod,'get')==0 ? $_GET : $_POST;
-        if(!$value = $request[$label]) return '';
+        if(!$value = $request[$label]) {
+          return '';
+        }
         return $value;
     }
 
@@ -881,7 +919,9 @@ 
      * @return bool|string
      */
     private function InsertLabel($label,$attributes=[]){
-        if(!$label or is_array($label)) return false;
+        if(!$label or is_array($label)) {
+          return false;
+        }
         $labelAttributes = $this->FilterAttributes($attributes,'label');
         $html = '<label'.$this->BuildAttributes($labelAttributes).'>';
         $html .= $label;
@@ -895,9 +935,12 @@ 
      */
     private function normalize($keys)
     {
-        if(is_array($keys)) return false;
-        foreach (array(' ', '&nbsp;', '\n', '\t', '\r', '"','\'','_') as $strip)
-            $keys = str_replace($strip, '', (string) $keys);
+        if(is_array($keys)) {
+          return false;
+        }
+        foreach (array(' ', '&nbsp;', '\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;