helmut / forms

src/Fields/Search/lang/en.php

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php 
 
 return [
-	'placeholder' => 'Search&hellip;',
-	'button' => 'Go',
+    'placeholder' => 'Search&hellip;',
+    'button' => 'Go',
 ];
\ No newline at end of file

src/Fields/Search/Search.php

Braces +9 added lines, -3 removed lines

@@ -25,12 +25,16 @@ 
 
     public function setValuesFromDefaults($defaults)
     {
-        if (count($defaults)) $this->value = array_shift($defaults);
+        if (count($defaults)) {
+            $this->value = array_shift($defaults);
+        }
     }
 
     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)
@@ -40,7 +44,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/Validator.php

Indentation +76 added lines, -76 removed lines

@@ -4,87 +4,87 @@
 
 class Validator {
 	
-	public function required($var) 
-	{
-		if (is_null($var)) return false;
+    public function required($var) 
+    {
+        if (is_null($var)) return false;
         else if (is_string($var) && trim($var) === '') return false;
         return true;
-	}
-
-	public function stringMin($var, $min) 
-	{
-		return strlen($var) >= $min;
-	}
-
-	public function stringMax($var, $max) 
-	{
-		return strlen($var) <= $max;
-	}
-
-	public function alpha($var)
-	{
-		return is_string($var) && preg_match('/^[\pL\pM]+$/u', $var);
-	}
-
-	public function alphaNum($var)
-	{
- 		if (! is_string($var) && ! is_numeric($var)) return false;
+    }
+
+    public function stringMin($var, $min) 
+    {
+        return strlen($var) >= $min;
+    }
+
+    public function stringMax($var, $max) 
+    {
+        return strlen($var) <= $max;
+    }
+
+    public function alpha($var)
+    {
+        return is_string($var) && preg_match('/^[\pL\pM]+$/u', $var);
+    }
+
+    public function alphaNum($var)
+    {
+            if (! is_string($var) && ! is_numeric($var)) return false;
         return preg_match('/^[\pL\pM\pN]+$/u', $var);
     }
 
-	public function alphaDash($var)
-	{
- 		if (! is_string($var) && ! is_numeric($var)) return false;
+    public function alphaDash($var)
+    {
+            if (! is_string($var) && ! is_numeric($var)) return false;
         return preg_match('/^[\pL\pM\pN_-]+$/u', $var);
-	}
-
-	public function in($var, $array)
-	{
- 		return in_array($var, $array);
-	}
-
-	public function notIn($var, $array)
-	{
- 		return ! in_array($var, $array);
-	}
-
-	public function email($var)
-	{
-		return filter_var($var, FILTER_VALIDATE_EMAIL) !== false;
-	}
-
-	public function numeric($var)
-	{
-		return is_numeric($var);
-	}
-
-	public function numericMin($var, $min) 
-	{
-		return $var >= $min;
-	}
-
-	public function numericMax($var, $max) 
-	{
-		return $var <= $max;
-	}
-
-	public function integer($var)
-	{
-		return filter_var($var, FILTER_VALIDATE_INT) !== false;
-	}
-
-	public function snake($var)
-	{
-		if ( ! ctype_lower($var)) {
-    		$var = preg_replace('/\s+/', '', $var);
-    		$var = strtolower(preg_replace('/(.)(?=[A-Z])/', '$1'.'_', $var));
-		}
-		return $var;
-	}
-
-	public function studly($var)
-	{
-		return str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $var)));
-	}
+    }
+
+    public function in($var, $array)
+    {
+            return in_array($var, $array);
+    }
+
+    public function notIn($var, $array)
+    {
+            return ! in_array($var, $array);
+    }
+
+    public function email($var)
+    {
+        return filter_var($var, FILTER_VALIDATE_EMAIL) !== false;
+    }
+
+    public function numeric($var)
+    {
+        return is_numeric($var);
+    }
+
+    public function numericMin($var, $min) 
+    {
+        return $var >= $min;
+    }
+
+    public function numericMax($var, $max) 
+    {
+        return $var <= $max;
+    }
+
+    public function integer($var)
+    {
+        return filter_var($var, FILTER_VALIDATE_INT) !== false;
+    }
+
+    public function snake($var)
+    {
+        if ( ! ctype_lower($var)) {
+            $var = preg_replace('/\s+/', '', $var);
+            $var = strtolower(preg_replace('/(.)(?=[A-Z])/', '$1'.'_', $var));
+        }
+        return $var;
+    }
+
+    public function studly($var)
+    {
+        return str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $var)));
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -28,13 +28,13 @@
 
 	public 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 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);
 	}
 

Braces +11 added lines, -4 removed lines

@@ -6,8 +6,11 @@ 
 	
 	public 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 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 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/Engines/Blade.php

Indentation +8 added lines, -8 removed lines

@@ -6,18 +6,18 @@
 
 class Blade implements Engine {
 
-	/**
+    /**
      * Render the template content.
      *
-	 * @param  string  $path
-	 * @param  array  $properties
+     * @param  string  $path
+     * @param  array  $properties
      * @return string
      */
-	public function render($path, $properties = []) 
-	{
-		if ( ! function_exists('app')) throw new \Exception('Laravel required for blade rendering engine.');
+    public function render($path, $properties = []) 
+    {
+        if ( ! function_exists('app')) throw new \Exception('Laravel required for blade rendering engine.');
 
-		return app()->make('view')->file($path, $properties);
-	}
+        return app()->make('view')->file($path, $properties);
+    }
 
 }

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

Indentation +15 added lines, -15 removed lines

@@ -12,32 +12,32 @@
      *
      * @var \Mustache_Engine
      */	
-	protected $compiler;
+    protected $compiler;
 
-	/**
+    /**
      * Fetch the compiler.
      *
      * @return \Mustache_Engine
      */
-	public function compiler()
-	{
-		if ( ! $this->compiler) $this->compiler = new Mustache_Engine;
+    public function compiler()
+    {
+        if ( ! $this->compiler) $this->compiler = new Mustache_Engine;
 
-		return $this->compiler;
-	}
+        return $this->compiler;
+    }
 
-	/**
+    /**
      * Render the template content.
      *
-	 * @param  string  $path
-	 * @param  array  $properties
+     * @param  string  $path
+     * @param  array  $properties
      * @return string
      */
-	public function render($path, $properties = []) 
-	{
-		$content = file_get_contents($path);
+    public function render($path, $properties = []) 
+    {
+        $content = file_get_contents($path);
 
-		return $this->compiler()->render($content, $properties);
-	}
+        return $this->compiler()->render($content, $properties);
+    }
 
 }

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/Engine.php

Indentation +4 added lines, -4 removed lines

@@ -4,13 +4,13 @@
 
 interface Engine {
 	
-	/**
+    /**
      * Render the template content.
      *
-	 * @param  string  $path
-	 * @param  array  $properties
+     * @param  string  $path
+     * @param  array  $properties
      * @return string
      */
-	public function render($path, $properties = []);
+    public function render($path, $properties = []);
 
 }
\ No newline at end of file

src/Requests/Symfony.php

Indentation +21 added lines, -21 removed lines

@@ -7,26 +7,26 @@
 
 class Symfony implements Request {
 	
-	protected $request;
-
-	public function __construct()
-	{
-		$this->request = SymfonyRequest::createFromGlobals();
-	}
-
-	public function all()
-	{
-		return $this->request->request->all();
-	}
-
-	public function get($key)
-	{
-		return $this->request->request->get($key);
-	}
-
-	public function csrf()
-	{
-		return ['name' => '_token', 'value' => csrf_token()];
-	}
+    protected $request;
+
+    public function __construct()
+    {
+        $this->request = SymfonyRequest::createFromGlobals();
+    }
+
+    public function all()
+    {
+        return $this->request->request->all();
+    }
+
+    public function get($key)
+    {
+        return $this->request->request->get($key);
+    }
+
+    public function csrf()
+    {
+        return ['name' => '_token', 'value' => csrf_token()];
+    }
 
 }
\ No newline at end of file

src/Requests/Laravel.php

Indentation +21 added lines, -21 removed lines

@@ -7,26 +7,26 @@
 
 class Laravel implements Request {
 	
-	protected $request;
-
-	public function __construct(IlluminateRequest $request)
-	{
-		$this->request = $request;
-	}
-
-	public function all()
-	{
-		return $this->request->all();
-	}
-
-	public function get($key)
-	{
-		return $this->request->get($key);
-	}
-
-	public function csrf()
-	{
-		return ['name' => '_token', 'value' => csrf_token()];
-	}
+    protected $request;
+
+    public function __construct(IlluminateRequest $request)
+    {
+        $this->request = $request;
+    }
+
+    public function all()
+    {
+        return $this->request->all();
+    }
+
+    public function get($key)
+    {
+        return $this->request->get($key);
+    }
+
+    public function csrf()
+    {
+        return ['name' => '_token', 'value' => csrf_token()];
+    }
 
 }
\ No newline at end of file

src/Form.php

Spacing +10 added lines, -10 removed lines

@@ -357,7 +357,7 @@ 
      */
     public function completed($name = null)
     {
-        if($this->submitted($name) && $this->valid()) {
+        if ($this->submitted($name) && $this->valid()) {
             $this->broadcast('completed');
             return true;
         }
@@ -497,7 +497,7 @@ 
         $errors = [];
 
         foreach ($this->fields as $field) {
-            foreach($field->errors() as $error) {
+            foreach ($field->errors() as $error) {
                 $errors[] = $error;
             }
         }
@@ -619,8 +619,8 @@ 
     {
         $config = $this->templateConfig($template);
 
-        if ( isset($config['plugins']) && is_array($config['plugins'])) {
-            foreach($config['plugins'] as $plugin) {
+        if (isset($config['plugins']) && is_array($config['plugins'])) {
+            foreach ($config['plugins'] as $plugin) {
                 $this->addPlugin($plugin);
             }
         }
@@ -636,8 +636,8 @@ 
     {
         $config = $this->templateConfig($template);
 
-        if ( isset($config['plugins']) && is_array($config['plugins'])) {
-            foreach($config['plugins'] as $plugin) {
+        if (isset($config['plugins']) && is_array($config['plugins'])) {
+            foreach ($config['plugins'] as $plugin) {
                 $this->removePlugin($plugin);
             }
         }
@@ -674,7 +674,7 @@ 
             foreach ($field->errors() as $error => $parameters) {
 
                 if ($error == 'userDefined') {
-                    foreach($parameters as $message) {
+                    foreach ($parameters as $message) {
                         $properties['errors'][] = ['error' => $message];
                     }
                 } else {
@@ -683,7 +683,7 @@ 
 
                     $message = $this->translate($error, $field);
 
-                    foreach($parameters as $key => $value) {
+                    foreach ($parameters as $key => $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);
@@ -930,7 +930,7 @@ 
      */
     private function broadcast($event, $params = []) 
     {
-        foreach($this->plugins as $plugin) {
+        foreach ($this->plugins as $plugin) {
             $plugin->event($this, $event, $params);
         }
     }
@@ -1078,7 +1078,7 @@ 
     {
         if ( ! method_exists($this, $method))
         {
-            if ( $this->typeExists($method)) {
+            if ($this->typeExists($method)) {
                 return $this->addField($method, array_shift($parameters));
             }
         }

Braces +36 added lines, -12 removed lines

@@ -257,7 +257,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);
@@ -440,7 +442,9 @@ 
      */
     public function addNamespaceForClass($class)
     {
-        if (is_object($class)) $class = get_class($class);
+        if (is_object($class)) {
+            $class = get_class($class);
+        }
 
         $reflector = new \ReflectionClass($class);
 
@@ -475,7 +479,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;
+            }
         }
     }
 
@@ -488,9 +494,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 = [];
 
@@ -682,8 +692,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];
@@ -703,7 +717,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);
     }
@@ -717,7 +733,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);
     }   
@@ -734,9 +752,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;
@@ -990,7 +1012,9 @@ 
      */
     public function pathForClass($class)
     {
-        if (is_object($class)) $class = get_class($class);
+        if (is_object($class)) {
+            $class = get_class($class);
+        }
 
         $reflector = new \ReflectionClass($class);
         $path = dirname($reflector->getFileName());