helmut / forms

src/Form.php

Doc Comments +2 added lines, -3 removed lines

@@ -237,7 +237,6 @@ 
     /**
      * Add default models to the form.
      *
-     * @param  mixed  $model
      * @return void
      */
     public function defaults() 
@@ -457,7 +456,7 @@ 
      * Check if a type exists.
      *
      * @param  string  $type
-     * @return string
+     * @return boolean
      */
     public function typeExists($type)
     {
@@ -1072,7 +1071,7 @@ 
      *
      * @param  string  $method
      * @param  array  $parameters
-     * @return mixed
+     * @return Fields\Field|null
      */
     public function __call($method, $parameters)
     {

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

@@ -259,7 +259,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);
@@ -442,7 +444,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);
 
@@ -477,7 +481,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;
+            }
         }
     }
 
@@ -490,9 +496,13 @@ 
      */
     public function errors($name = null)
     {
-        if ($this->submitted()) $this->validate();
+        if ($this->submitted()) {
+            $this->validate();
+        }
 
-        if ( ! is_null($name)) $this->field($name)->errors();
+        if ( ! is_null($name)) {
+            $this->field($name)->errors();
+        }
 
         $errors = [];
 
@@ -684,8 +694,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];
@@ -705,7 +719,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);
     }
@@ -719,7 +735,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);
     }   
@@ -736,9 +754,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;
@@ -992,7 +1014,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()); 

src/Plugin.php

Doc Comments +2 added lines, -1 removed lines

@@ -35,6 +35,7 @@ 
 	/**
      * Get autoload path.
      *
+     * @param string $append
      * @return string
      */
 	public function path($append = null) 
@@ -46,7 +47,7 @@ 
 	/**
      * Get paths to templates.
      *
-     * @return string
+     * @return string[]
      */
 	public function templatePaths() 
 	{

Indentation +35 added lines, -35 removed lines

@@ -9,52 +9,52 @@ 
      *
      * @var string
      */
-	protected $path;
+    protected $path;
 
-	/**
+    /**
      * Create a new plugin instance.
      *
      * @return void
      */
-	public function __construct() 
-	{
-		$this->setPath();
-	}
+    public function __construct() 
+    {
+        $this->setPath();
+    }
 
-	/**
+    /**
      * Set the plugin autoload path.
      *
      * @return void
      */
-	public function setPath()
-	{
-		$reflector = new \ReflectionClass($this);
-		$this->path = dirname($reflector->getFileName());;
-	}
+    public function setPath()
+    {
+        $reflector = new \ReflectionClass($this);
+        $this->path = dirname($reflector->getFileName());;
+    }
 
-	/**
+    /**
      * Get autoload path.
      *
      * @return string
      */
-	public function path($append = null) 
-	{
-		return is_null($append) ? $this->path 
-			: $this->path.'/'.ltrim(rtrim($append, '/'), '/').'/';
-	}
+    public function path($append = null) 
+    {
+        return is_null($append) ? $this->path 
+            : $this->path.'/'.ltrim(rtrim($append, '/'), '/').'/';
+    }
 
-	/**
+    /**
      * Get paths to templates.
      *
      * @return string
      */
-	public function templatePaths() 
-	{
-		$path = $this->path('templates');
-		return [$path];
-	}
+    public function templatePaths() 
+    {
+        $path = $this->path('templates');
+        return [$path];
+    }
 
-	/**
+    /**
      * Trigger an event callback. 
      * - onLoad
      * - onDefine
@@ -66,19 +66,19 @@ 
      * - onValid
      * - onInvalid
      *
-	 * @param  \Helmut\Forms\Form  $form
-	 * @param  string  $name
-	 * @param  array  $params
+     * @param  \Helmut\Forms\Form  $form
+     * @param  string  $name
+     * @param  array  $params
      * @return mixed
      */
-	public function event($form, $name, $params = []) 
-	{
-		$name = $form->validator()->studly($name);
+    public function event($form, $name, $params = []) 
+    {
+        $name = $form->validator()->studly($name);
 
-		if (method_exists($this, 'on'.$name)) {
-			return call_user_func_array(array($this, 'on'.$name), [$form, $params]);
-		}
+        if (method_exists($this, 'on'.$name)) {
+            return call_user_func_array(array($this, 'on'.$name), [$form, $params]);
+        }
 
-	}
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	public function setPath()
 	{
 		$reflector = new \ReflectionClass($this);
-		$this->path = dirname($reflector->getFileName());;
+		$this->path = dirname($reflector->getFileName()); ;
 	}
 
 	/**

src/Renderer.php

Doc Comments +1 added lines, -2 removed lines

@@ -70,8 +70,8 @@ 
 	/**
      * Create a template cache key.
      *
-	 * @param  string  $name
 	 * @param  array  $paths
+	 * @param string $template
      * @return string
      */	
 	public function key($template, $paths) 
@@ -100,7 +100,6 @@ 
 	/**
      * Check if a template exists.
      *
-	 * @param  string  $key
 	 * @param  string  $template
 	 * @param  array  $paths
      * @return boolean

Indentation +99 added lines, -99 removed lines

@@ -4,141 +4,141 @@
 
 class Renderer {
 	
- 	/**
-     * Array of engine definitions using
-     * file extension as key.
-     * 
-     * @var array
-     */
-	protected $engines = [
-		'.mustache.php' => 'Helmut\Forms\Engines\Mustache',
-		'.twig.php' => 'Helmut\Forms\Engines\Twig',
-		'.blade.php' => 'Helmut\Forms\Engines\Blade',
-	];
-
- 	/**
-     * Cache of running engines.
-     *
-     * @var array
-     */
-	protected $running = [];
-
- 	/**
-     * Cache of template files.
-     *
-     * @var array
-     */
-	protected $templates = [];
-
-	/**
+        /**
+         * Array of engine definitions using
+         * file extension as key.
+         * 
+         * @var array
+         */
+    protected $engines = [
+        '.mustache.php' => 'Helmut\Forms\Engines\Mustache',
+        '.twig.php' => 'Helmut\Forms\Engines\Twig',
+        '.blade.php' => 'Helmut\Forms\Engines\Blade',
+    ];
+
+        /**
+         * Cache of running engines.
+         *
+         * @var array
+         */
+    protected $running = [];
+
+        /**
+         * Cache of template files.
+         *
+         * @var array
+         */
+    protected $templates = [];
+
+    /**
      * Add a new engine implementation.
      *
-	 * @param  string  $extension
-	 * @param  string  $class
+     * @param  string  $extension
+     * @param  string  $class
      * @return void
      */
-	public function addEngine($extension, $class)
-	{
-		array_unshift($this->engines, [$extension => $class]);
-	}
+    public function addEngine($extension, $class)
+    {
+        array_unshift($this->engines, [$extension => $class]);
+    }
 
-	/**
+    /**
      * Get an engine implementation.
      *
-	 * @param  string  $key
+     * @param  string  $key
      * @return \Helmut\Forms\Engine
      */
-	public function start($key)
-	{
-		if ( ! isset($this->running[$key])) {
-			$this->running[$key] = new $this->engines[$key];
-		}
+    public function start($key)
+    {
+        if ( ! isset($this->running[$key])) {
+            $this->running[$key] = new $this->engines[$key];
+        }
 
-		return $this->running[$key];
-	}
+        return $this->running[$key];
+    }
 
-	/**
+    /**
      * Get engine file extensions.
      *
      * @return array
      */
-	public function extensions()
-	{
-		return array_keys($this->engines);
-	}
+    public function extensions()
+    {
+        return array_keys($this->engines);
+    }
 
-	/**
+    /**
      * Create a template cache key.
      *
-	 * @param  string  $name
-	 * @param  array  $paths
+     * @param  string  $name
+     * @param  array  $paths
      * @return string
      */	
-	public function key($template, $paths) 
-	{
-		return $template.'-'.md5(serialize($paths));
-	}
+    public function key($template, $paths) 
+    {
+        return $template.'-'.md5(serialize($paths));
+    }
 
-	/**
+    /**
      * Render a template.
      *
-	 * @param  string  $template
-	 * @param  array  $properties
-	 * @param  array  $paths
+     * @param  string  $template
+     * @param  array  $properties
+     * @param  array  $paths
      * @return string
      */
-	public function render($template, $properties, $paths)
-	{
-		if ($this->has($template, $paths)) {
+    public function render($template, $properties, $paths)
+    {
+        if ($this->has($template, $paths)) {
 
-			$template = $this->findTemplate($template, $paths);
+            $template = $this->findTemplate($template, $paths);
 
-			return $this->start($template['engine'])->render($template['path'], $properties);
-		}
-	}
+            return $this->start($template['engine'])->render($template['path'], $properties);
+        }
+    }
 
-	/**
+    /**
      * Check if a template exists.
      *
-	 * @param  string  $key
-	 * @param  string  $template
-	 * @param  array  $paths
+     * @param  string  $key
+     * @param  string  $template
+     * @param  array  $paths
      * @return boolean
      */	
-	public function has($template, $paths)
-	{
-		return ! is_null($this->findTemplate($template, $paths));
-	}
+    public function has($template, $paths)
+    {
+        return ! is_null($this->findTemplate($template, $paths));
+    }
 
-	/**
+    /**
      * Find template file with engine.
      *
-	 * @param  string  $template
-	 * @param  array  $paths
+     * @param  string  $template
+     * @param  array  $paths
      * @return void
      */	
-	public function findTemplate($template, $paths)
-	{
-		$key = $this->key($template, $paths);
-
-		if ( ! isset($this->templates[$key])) {
-
-			$this->templates[$key] = null;
-
-			$extensions = $this->extensions();
-			foreach ($paths as $path) {
-				foreach ($extensions as $extension) {
-					if (file_exists($path.$template.$extension)) {
-						return $this->templates[$key] = [
-							'engine' => $extension, 
-							'path' => $path.$template.$extension,
-						];
-					}
-				}
-			}
-		}
-
-		return $this->templates[$key];
-	}	
+    public function findTemplate($template, $paths)
+    {
+        $key = $this->key($template, $paths);
+
+        if ( ! isset($this->templates[$key])) {
+
+            $this->templates[$key] = null;
+
+            $extensions = $this->extensions();
+            foreach ($paths as $path) {
+                foreach ($extensions as $extension) {
+                    if (file_exists($path.$template.$extension)) {
+                        return $this->templates[$key] = [
+                            'engine' => $extension, 
+                            'path' => $path.$template.$extension,
+                        ];
+                    }
+                }
+            }
+        }
+
+        return $this->templates[$key];
+    }	
 
 }

src/lang/es.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php 
 
 return [
-	'required' => 'Este campo es obligatorio.',
-	'validate' => 'El campo [field] es inválido.',
-	'validate_required' => 'El campo [field] es obligatorio.',
+    'required' => 'Este campo es obligatorio.',
+    'validate' => 'El campo [field] es inválido.',
+    'validate_required' => 'El campo [field] es obligatorio.',
     'validate_alpha' => 'El campo [field] solo debe contener letras.',
     'validate_alpha_dash' => 'El campo [field] solo debe contener letras, números y guiones.',
     'validate_alpha_num' => 'El campo [field] solo debe contener letras y números.',

src/lang/en.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php 
 
 return [
-	'required' => 'This field is required.',
-	'validate' => 'The [field] field is invalid.',
-	'validate_required' => 'The [field] field is required.',
+    'required' => 'This field is required.',
+    'validate' => 'The [field] field is invalid.',
+    'validate_required' => 'The [field] field is required.',
     'validate_alpha' => 'The [field] may only contain letters.',
     'validate_alpha_dash' => 'The [field] may only contain letters, numbers, and dashes.',
     'validate_alpha_num' => 'The [field] may only contain letters and numbers.',

src/Field.php

Spacing +1 added lines, -1 removed lines

@@ -471,7 +471,7 @@
 
                 // Work out the argument names of the requested method
                 $method = new \ReflectionMethod($this, $name);
-                foreach($method->getParameters() as $arg) {
+                foreach ($method->getParameters() as $arg) {
                     $args[] = $arg->getName();
                 }
 

Braces +6 added lines, -2 removed lines

@@ -347,7 +347,9 @@ 
             return false;
         }
 
-        if (isset($this->errors[$method])) unset($this->errors[$method]);
+        if (isset($this->errors[$method])) {
+            unset($this->errors[$method]);
+        }
 
         return true;
     }
@@ -389,7 +391,9 @@ 
      */
     public function error($message)
     {
-        if ( ! isset($this->errors['userDefined'])) $this->errors['userDefined'] = [];
+        if ( ! isset($this->errors['userDefined'])) {
+            $this->errors['userDefined'] = [];
+        }
 
         $this->errors['userDefined'][] = $message;
     }

src/Plugins/Memory/Memory.php

Indentation +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 class Memory extends Plugin {
 
-	// Protects input from accidental loss
+    // Protects input from accidental loss
     // by saving as you type. WIP
 
 }
\ No newline at end of file

src/Plugins/Feedback/Feedback.php

Indentation +27 added lines, -27 removed lines

@@ -6,40 +6,40 @@
 
 class Feedback extends Plugin {
 
-	public function onLoad($form)
-	{
-		$form->addButton('feedback_trigger_'.$form->id);
-	}
+    public function onLoad($form)
+    {
+        $form->addButton('feedback_trigger_'.$form->id);
+    }
 
-	public function onSubmitted($form) 
-	{
-		$request = $form->getRequest();
+    public function onSubmitted($form) 
+    {
+        $request = $form->getRequest();
 
-		if ($request->get('feedback_trigger_'.$form->id)) {
+        if ($request->get('feedback_trigger_'.$form->id)) {
 
-			$field = $form->field($request->get('name'));
+            $field = $form->field($request->get('name'));
 
-			if ( ! is_null($field)) {
+            if ( ! is_null($field)) {
 
-				$field->setFromRequest($request);
-				$field->runValidations();
+                $field->setFromRequest($request);
+                $field->runValidations();
 
-				$response = [
-					'id' => $field->id, 
-					'valid' => $field->valid(), 
-					'error_id' => 'feedback_errors_'.$field->id,
-					'error' => '', 
-				];
+                $response = [
+                    'id' => $field->id, 
+                    'valid' => $field->valid(), 
+                    'error_id' => 'feedback_errors_'.$field->id,
+                    'error' => '', 
+                ];
 
-				if ( ! $field->valid()) {
-					$response['error'] = $form->renderFieldErrors($field);
-				}
+                if ( ! $field->valid()) {
+                    $response['error'] = $form->renderFieldErrors($field);
+                }
 
-				header('Content-Type: application/json');
-				echo json_encode($response);
-				exit();
-			}
-		}
-	}
+                header('Content-Type: application/json');
+                echo json_encode($response);
+                exit();
+            }
+        }
+    }
 
 }
\ No newline at end of file

src/templates/foundation/config.php

Indentation +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@
 <?php 
 
 return [
-	'plugins' => [
-		'feedback',
-	],
+    'plugins' => [
+        'feedback',
+    ],
 ];
\ No newline at end of file