helmut / forms

src/Fields/Checkbox/Checkbox.php

Braces +6 added lines, -2 removed lines

@@ -42,7 +42,9 @@ 
 
     public function setValuesFromModel($model)
     {
-        if (property_exists($model, $this->name)) $this->value = $model->{$this->name} ? true : false;
+        if (property_exists($model, $this->name)) {
+            $this->value = $model->{$this->name} ? true : false;
+        }
     }   
 
     public function setValuesFromRequest($request)
@@ -52,7 +54,9 @@ 
 
     public function fillModelWithValues($model)
     {
-        if (property_exists($model, $this->name)) $model->{$this->name} = $this->value ? 1 : 0;
+        if (property_exists($model, $this->name)) {
+            $model->{$this->name} = $this->value ? 1 : 0;
+        }
     }
 
     public function validateRequired()

src/Fields/Password/Password.php

Braces +9 added lines, -3 removed lines

@@ -19,7 +19,9 @@ 
 
     public function needsRehash($hash = null)
     {
-        if (is_null($hash)) $hash = $this->value;
+        if (is_null($hash)) {
+            $hash = $this->value;
+        }
 
         return password_needs_rehash($hash, PASSWORD_BCRYPT, ['cost' => 10]);
     }   
@@ -57,7 +59,9 @@ 
 
     public function setValuesFromModel($model)
     {
-        if (property_exists($model, $this->name)) $this->value = $model->{$this->name};
+        if (property_exists($model, $this->name)) {
+            $this->value = $model->{$this->name};
+        }
     }
 
     public function setValuesFromRequest($request)
@@ -67,7 +71,9 @@ 
 
     public function fillModelWithValues($model)
     {
-        if (property_exists($model, $this->name)) $model->{$this->name} = $this->value;
+        if (property_exists($model, $this->name)) {
+            $model->{$this->name} = $this->value;
+        }
     }   
 
     public function validateRequired()

src/Engines/Blade.php

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
      */
 	public function render($path, $properties = []) 
 	{
-		if ( ! function_exists('app')) throw new \Exception('Laravel required for blade rendering engine.');
+		if ( ! function_exists('app')) {
+		    throw new \Exception('Laravel required for blade rendering engine.');
+		}
 
 		return app()->make('view')->file($path, $properties);
 	}

src/Engines/Mustache.php

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
      */
 	public function compiler()
 	{
-		if ( ! $this->compiler) $this->compiler = new Mustache_Engine;
+		if ( ! $this->compiler) {
+		    $this->compiler = new Mustache_Engine;
+		}
 
 		return $this->compiler;
 	}

src/Form.php

Braces +30 added lines, -10 removed lines

@@ -253,7 +253,9 @@ 
      */
     public function fields($names = null)
     {
-        if (is_null($names)) return $this->fields;
+        if (is_null($names)) {
+            return $this->fields;
+        }
 
         return array_filter($this->fields, function($field) use ($names) {
             return array_key_exists($field->name, $names);
@@ -473,7 +475,9 @@ 
         $class = '\\Fields\\'.ucwords($class).'\\'.ucwords($class);
 
         foreach ($this->namespaces as $namespace) {
-            if (class_exists($namespace.$class)) return $namespace.$class;
+            if (class_exists($namespace.$class)) {
+                return $namespace.$class;
+            }
         }
     }
 
@@ -486,9 +490,13 @@ 
      */
     public function errors($name = null)
     {
-        if ($this->submitted()) $this->validate();
+        if ($this->submitted()) {
+            $this->validate();
+        }
 
-        if ( ! is_null($name)) return $this->field($name)->errors();
+        if ( ! is_null($name)) {
+            return $this->field($name)->errors();
+        }
 
         $errors = [];
 
@@ -680,8 +688,12 @@ 
                     $message = $this->translate($error, $field);
 
                     foreach($parameters as $key => $value) {
-                        if (is_object($value) && method_exists($value, '__toString')) $value = (string) $value;
-                        if (is_array($value)) $value = implode(', ', $value);
+                        if (is_object($value) && method_exists($value, '__toString')) {
+                            $value = (string) $value;
+                        }
+                        if (is_array($value)) {
+                            $value = implode(', ', $value);
+                        }
                         $message = str_replace('['.$key.']', $value, $message);
                     }
                     $properties['errors'][] = ['error' => $message];
@@ -701,7 +713,9 @@ 
      */
     public function renderField($field, $properties = null) 
     {   
-        if (is_null($properties)) $properties = $this->fieldProperties($field);
+        if (is_null($properties)) {
+            $properties = $this->fieldProperties($field);
+        }
 
         return $this->renderTemplate($field->type, $properties, $field);
     }
@@ -715,7 +729,9 @@ 
      */
     public function renderFieldErrors($field, $properties = null) 
     {   
-        if (is_null($properties)) $properties = $this->fieldProperties($field);
+        if (is_null($properties)) {
+            $properties = $this->fieldProperties($field);
+        }
 
         return $this->renderTemplate('errors', $properties, $field);
     }   
@@ -732,9 +748,13 @@ 
 
         $this->setValues();
 
-        if ($this->submitted()) $this->validate();
+        if ($this->submitted()) {
+            $this->validate();
+        }
 
-        if ( ! is_null($template)) $this->setTemplate($template);
+        if ( ! is_null($template)) {
+            $this->setTemplate($template);
+        }
 
         $properties = [];
         $properties['id'] = $this->id;

src/Utility/Validate.php

Braces +11 added lines, -4 removed lines

@@ -6,8 +6,11 @@ 
     
     public static function required($var) 
     {
-        if (is_null($var)) return false;
-        else if (is_string($var) && trim($var) === '') return false;
+        if (is_null($var)) {
+            return false;
+        } else if (is_string($var) && trim($var) === '') {
+            return false;
+        }
         return true;
     }
 
@@ -28,13 +31,17 @@ 
 
     public static function alphaNum($var)
     {
-        if (! is_string($var) && ! is_numeric($var)) return false;
+        if (! is_string($var) && ! is_numeric($var)) {
+            return false;
+        }
         return preg_match('/^[\pL\pM\pN]+$/u', $var);
     }
 
     public static function alphaDash($var)
     {
-        if (! is_string($var) && ! is_numeric($var)) return false;
+        if (! is_string($var) && ! is_numeric($var)) {
+            return false;
+        }
         return preg_match('/^[\pL\pM\pN_-]+$/u', $var);
     }
 

src/Fields/Checkboxes/Checkboxes.php

Braces +12 added lines, -4 removed lines

@@ -84,14 +84,18 @@ 
     public function setValueFromDefault()
     {
         foreach (array_keys($this->options) as $key) {
-            if (isset($this->default[$key])) $this->values[$key] = $this->default[$key] ? true : false;
+            if (isset($this->default[$key])) {
+                $this->values[$key] = $this->default[$key] ? true : false;
+            }
         }
     }
 
     public function setValueFromModel($model)
     {
         foreach (array_keys($this->options) as $key) {
-            if (property_exists($model, $this->name.'_'.$key)) $this->values[$key] = $model->{$this->name.'_'.$key} ? true : false;
+            if (property_exists($model, $this->name.'_'.$key)) {
+                $this->values[$key] = $model->{$this->name.'_'.$key} ? true : false;
+            }
         }
 
     }   
@@ -106,7 +110,9 @@ 
     public function fillModelWithValue($model)
     {
         foreach (array_keys($this->options) as $key) {
-            if (property_exists($model, $this->name.'_'.$key)) $model->{$this->name.'_'.$key} = $this->values[$key] ? 1 : 0;
+            if (property_exists($model, $this->name.'_'.$key)) {
+                $model->{$this->name.'_'.$key} = $this->values[$key] ? 1 : 0;
+            }
         }
     }
 
@@ -115,7 +121,9 @@ 
         $checked = false;
 
         foreach (array_keys($this->options) as $key) {
-            if ($this->values[$key]) $checked = true;
+            if ($this->values[$key]) {
+                $checked = true;
+            }
         }
 
         return $checked;

src/Fields/Name/Name.php

Braces +21 added lines, -7 removed lines

@@ -38,15 +38,23 @@ 
 
     public function setValueFromDefault()
     {
-        if (isset($this->default['first'])) $this->value_first = $this->default['first'];
-        if (isset($this->default['surname'])) $this->value_surname = $this->default['surname'];
+        if (isset($this->default['first'])) {
+            $this->value_first = $this->default['first'];
+        }
+        if (isset($this->default['surname'])) {
+            $this->value_surname = $this->default['surname'];
+        }
         $this->value = trim($this->value_first.' '.$this->value_surname);
     }
 
     public function setValueFromModel($model)
     {
-        if (property_exists($model, $this->name.'_first')) $this->value_first = $model->{$this->name.'_first'};
-        if (property_exists($model, $this->name.'_surname')) $this->value_surname = $model->{$this->name.'_surname'};
+        if (property_exists($model, $this->name.'_first')) {
+            $this->value_first = $model->{$this->name.'_first'};
+        }
+        if (property_exists($model, $this->name.'_surname')) {
+            $this->value_surname = $model->{$this->name.'_surname'};
+        }
         $this->value = trim($this->value_first.' '.$this->value_surname);
     }
 
@@ -59,9 +67,15 @@ 
 
     public function fillModelWithValue($model)
     {
-        if (property_exists($model, $this->name.'_first')) $model->{$this->name.'_first'} = $this->value_first;
-        if (property_exists($model, $this->name.'_surname')) $model->{$this->name.'_surname'} = $this->value_surname;
-        if (property_exists($model, $this->name)) $model->{$this->name} = $this->value;
+        if (property_exists($model, $this->name.'_first')) {
+            $model->{$this->name.'_first'} = $this->value_first;
+        }
+        if (property_exists($model, $this->name.'_surname')) {
+            $model->{$this->name.'_surname'} = $this->value_surname;
+        }
+        if (property_exists($model, $this->name)) {
+            $model->{$this->name} = $this->value;
+        }
     }
 
     public function validateRequired()

src/Fields/Text/Text.php

Braces +6 added lines, -2 removed lines

@@ -41,7 +41,9 @@ 
 
     public function setValueFromModel($model)
     {
-        if (property_exists($model, $this->name)) $this->value = $model->{$this->name};
+        if (property_exists($model, $this->name)) {
+            $this->value = $model->{$this->name};
+        }
     }
 
     public function setValueFromRequest($request)
@@ -51,7 +53,9 @@ 
 
     public function fillModelWithValue($model)
     {
-        if (property_exists($model, $this->name)) $model->{$this->name} = $this->value;
+        if (property_exists($model, $this->name)) {
+            $model->{$this->name} = $this->value;
+        }
     }   
 
     public function validateRequired()