helmut / forms

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

@@ -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()); 

Doc Comments +3 added lines, -4 removed lines

@@ -236,7 +236,6 @@ 
     /**
      * Add default models to the form.
      *
-     * @param  mixed  $model
      * @return void
      */
     public function defaults() 
@@ -333,7 +332,7 @@ 
     /**
      * Fill a model with values.
      *
-     * @param  object  $model
+     * @param  \stdClass  $model
      * @param  array  $names
      */
     public function fill($model, $names = null)
@@ -456,7 +455,7 @@ 
      * Check if a type exists.
      *
      * @param  string  $type
-     * @return string
+     * @return boolean
      */
     public function typeExists($type)
     {
@@ -1071,7 +1070,7 @@ 
      *
      * @param  string  $method
      * @param  array  $parameters
-     * @return mixed
+     * @return Fields\Field|null
      */
     public function __call($method, $parameters)
     {

src/Request.php

Indentation +6 added lines, -6 removed lines

@@ -4,26 +4,26 @@
 
 interface Request {
 	
-	/**
+    /**
      * Fetch all values from the request.
      *
      * @return array
      */
-	public function all();
+    public function all();
 
-	/**
+    /**
      * Fetch a value from the request matching provided key.
      *
      * @var string
      * @return mixed
      */
-	public function get($key);
+    public function get($key);
 
-	/**
+    /**
      * Return array of csrf template properties.
      *
      * @return array
      */
-	public function csrf();	
+    public function csrf();	
 
 }
\ No newline at end of file

tests/codeception/_support/_generated/AcceptanceTesterActions.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 // @codingStandardsIgnoreFile
 
 use Codeception\Module\PhpBrowser;
-use Helper\Acceptance;
 
 trait AcceptanceTesterActions
 {

tests/codeception/_support/_generated/FunctionalTesterActions.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 // @codingStandardsIgnoreFile
 
 use Codeception\Module\PhpBrowser;
-use Helper\Functional;
 
 trait FunctionalTesterActions
 {

tests/codeception/_support/_generated/UnitTesterActions.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 // @codingStandardsIgnoreFile
 
 use Codeception\Module\Asserts;
-use Helper\Unit;
 
 trait UnitTesterActions
 {

tests/unit/FormTest.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,9 +2,9 @@
 
 namespace Helmut\Forms\Testing;
 
-use Helmut\Forms\Testing\Stubs\FormWithDefinition;
-use Helmut\Forms\Testing\Stubs\Custom\FormWithCustomNamespace;
 use Helmut\Forms\Testing\Stubs\CustomExtension\FormWithCustomExtension;
+use Helmut\Forms\Testing\Stubs\Custom\FormWithCustomNamespace;
+use Helmut\Forms\Testing\Stubs\FormWithDefinition;
 
 class FormTest extends FormTestCase {
 	

Indentation +384 added lines, -384 removed lines

@@ -8,467 +8,467 @@
 
 class FormTest extends FormTestCase {
 	
-	/** @test */
+    /** @test */
     public function it_can_be_created()
     {
-    	$this->assertEquals(get_class($this->form()), 'Helmut\Forms\Testing\Stubs\Form');
-    	$this->assertEquals(get_parent_class($this->form()), 'Helmut\Forms\Form');
+        $this->assertEquals(get_class($this->form()), 'Helmut\Forms\Testing\Stubs\Form');
+        $this->assertEquals(get_parent_class($this->form()), 'Helmut\Forms\Form');
     }
 
-	/** @test */
-	public function it_can_be_rendered()
-	{
-		$form = $this->form();
+    /** @test */
+    public function it_can_be_rendered()
+    {
+        $form = $this->form();
 		
-		$this->assertContains('<form', $form->render());
-	}	    
+        $this->assertContains('<form', $form->render());
+    }	    
 
-	/** @test */
+    /** @test */
     public function it_can_create_a_field()
     {
-    	$form = $this->form();
-		$field = $form->text('foo');
+        $form = $this->form();
+        $field = $form->text('foo');
 
-    	$this->assertTrue(is_subclass_of($field, 'Helmut\Forms\Field'));
+        $this->assertTrue(is_subclass_of($field, 'Helmut\Forms\Field'));
     } 
 
- 	/** @test */
+        /** @test */
     public function it_can_have_fields_defined()
     {
-    	$form = new FormWithDefinition($this->request());
-    	$form->removeAllPlugins();
+        $form = new FormWithDefinition($this->request());
+        $form->removeAllPlugins();
 
-		$fields = $form->fields();
+        $fields = $form->fields();
 		
-		$this->assertCount(1, $form->fields());
+        $this->assertCount(1, $form->fields());
     }  
 
-     /** @test */
+        /** @test */
     public function it_wont_create_the_same_field_twice()
     {
-    	$form = $this->form();
-		$field1 = $form->text('foo');
-		$field2 = $form->text('foo');
+        $form = $this->form();
+        $field1 = $form->text('foo');
+        $field2 = $form->text('foo');
 
-		$this->assertCount(1, $form->fields());
-		$this->assertSame($field1, $field2);
+        $this->assertCount(1, $form->fields());
+        $this->assertSame($field1, $field2);
     }
 
-	/** @test */
+    /** @test */
     public function it_fetches_all_the_keys()
     {
-    	$form = $this->form();
-		$form->text('foo');
-		$form->name('bar');
-		$form->email('baz');
+        $form = $this->form();
+        $form->text('foo');
+        $form->name('bar');
+        $form->email('baz');
 
-		$expected = ['foo', 'bar_first', 'bar_surname', 'bar', 'baz'];
-		$this->assertSame($expected, $form->keys());
-	} 
+        $expected = ['foo', 'bar_first', 'bar_surname', 'bar', 'baz'];
+        $this->assertSame($expected, $form->keys());
+    } 
 
-	/** @test */
+    /** @test */
     public function it_fetches_all_values()
     {
-    	$form = $this->form();
-		$form->text('foo');
-		$form->name('bar');
-		$form->email('baz');
+        $form = $this->form();
+        $form->text('foo');
+        $form->name('bar');
+        $form->email('baz');
 
-		$expected = ['foo'=>'', 'bar_first'=>'', 'bar_surname'=>'', 'bar'=>'', 'baz'=>''];
-		$this->assertSame($expected, $form->all());
-	}   
+        $expected = ['foo'=>'', 'bar_first'=>'', 'bar_surname'=>'', 'bar'=>'', 'baz'=>''];
+        $this->assertSame($expected, $form->all());
+    }   
 
-	/** @test */
+    /** @test */
     public function it_fetches_values_for_simple_field()
     {
-    	$form = $this->form();
-		$form->text('foo');
+        $form = $this->form();
+        $form->text('foo');
 
-		$this->assertSame($form->get('foo'), '');
-	}	 
+        $this->assertSame($form->get('foo'), '');
+    }	 
 
-	/** @test */
+    /** @test */
     public function it_fetches_values_for_a_complex_field()
     {
-    	$form = $this->form();
-		$form->name('foo');
+        $form = $this->form();
+        $form->name('foo');
 
-		$expected = ['foo_first'=>'', 'foo_surname'=>'', 'foo'=>''];
-		$this->assertSame($form->get('foo'), $expected);
-	}
+        $expected = ['foo_first'=>'', 'foo_surname'=>'', 'foo'=>''];
+        $this->assertSame($form->get('foo'), $expected);
+    }
 
-	/** @test */
+    /** @test */
     public function it_fetches_values_for_a_complex_field_by_key()
     {
-    	$form = $this->form();
-		$form->name('foo');
+        $form = $this->form();
+        $form->name('foo');
 
-		$this->assertSame($form->get('foo', 'surname'), '');
-	}
+        $this->assertSame($form->get('foo', 'surname'), '');
+    }
 
-	/** @test */
+    /** @test */
     public function it_is_not_submitted_by_default()
     {
-    	$request = $this->request();
-    	$request->method('get')->will($this->returnValueMap([
-    			['foo', false],
-    		])
-    	);
+        $request = $this->request();
+        $request->method('get')->will($this->returnValueMap([
+                ['foo', false],
+            ])
+        );
 
-    	$form = $this->form($request);
-    	$form->button('foo');
+        $form = $this->form($request);
+        $form->button('foo');
 
-		$this->assertFalse($form->submitted());
-	}	
+        $this->assertFalse($form->submitted());
+    }	
 
-	/** @test */
+    /** @test */
     public function it_can_be_submitted()
     {
-		$request = $this->request();
-    	$request->method('get')->will($this->returnValueMap([
-    			['foo', true],
-    		])
-    	);
+        $request = $this->request();
+        $request->method('get')->will($this->returnValueMap([
+                ['foo', true],
+            ])
+        );
 
-    	$form = $this->form($request);
-    	$form->button('foo');
+        $form = $this->form($request);
+        $form->button('foo');
 
-		$this->assertTrue($form->submitted());
-	}
+        $this->assertTrue($form->submitted());
+    }
 
-	/** @test */
+    /** @test */
     public function it_can_detect_which_submit_button_was_clicked()
     {
-    	$request = $this->request();
-    	$request->method('get')->will($this->returnValueMap([
-    			['foo', null],
-    			['bar', true],
-    		])
-    	);
+        $request = $this->request();
+        $request->method('get')->will($this->returnValueMap([
+                ['foo', null],
+                ['bar', true],
+            ])
+        );
+
+        $form = $this->form($request);
+        $form->button('foo');
+        $form->button('bar');
+
+        $this->assertFalse($form->submitted('foo'));
+        $this->assertTrue($form->submitted('bar'));
+    }	
+
+    /** @test */
+    public function it_loads_values_from_the_request()
+    {
+        $request = $this->request();
+        $request->method('all')->will($this->returnValue(['foo'=>'bar', 'register'=>true]));
+        $request->method('get')->will($this->returnValueMap([
+            ['foo', 'bar'],
+            ['register', true],
+        ]));
 
-    	$form = $this->form($request);
-    	$form->button('foo');
-    	$form->button('bar');
+        $form = $this->form($request);
+        $form->text('foo');
+        $form->button('register');
 
-		$this->assertFalse($form->submitted('foo'));
-		$this->assertTrue($form->submitted('bar'));
-	}	
+        $this->assertSame($form->get('foo'), 'bar');
+    }	
 
-	/** @test */
-    public function it_loads_values_from_the_request()
+    /** @test */
+    public function it_loads_complex_values_from_the_request()
+    {
+        $request = $this->request();
+        $request->method('all')->will($this->returnValue(['foo_first'=>'John', 'foo_surname'=>'Smith', 'register'=>true]));
+        $request->method('get')->will($this->returnValueMap([
+            ['foo_first', 'John'],
+            ['foo_surname', 'Smith'],
+            ['register', true],
+        ]));
+
+        $form = $this->form($request);		
+        $form->name('foo');
+        $form->button('register');
+
+        $expected = ['foo_first'=>'John', 'foo_surname'=>'Smith', 'foo'=>'John Smith'];
+        $this->assertSame($form->get('foo'), $expected);
+    }
+
+    /** @test */
+    public function it_loads_complex_values_by_key_from_the_request()
+    {
+        $request = $this->request();
+        $request->method('all')->will($this->returnValue(['foo_first'=>'John', 'foo_surname'=>'Smith', 'register'=>true]));
+        $request->method('get')->will($this->returnValueMap([
+            ['foo_first', 'John'],
+            ['foo_surname', 'Smith'],
+            ['register', true],
+        ]));
+
+        $form = $this->form($request);		
+        $form->name('foo');
+        $form->button('register');
+
+        $this->assertSame($form->get('foo', 'surname'), 'Smith');
+    }	
+
+    /** @test */
+    public function it_only_loads_values_if_submitted()
     {
-    	$request = $this->request();
-    	$request->method('all')->will($this->returnValue(['foo'=>'bar', 'register'=>true]));
-    	$request->method('get')->will($this->returnValueMap([
-    		['foo', 'bar'],
-    		['register', true],
-    	]));
+        $request = $this->request();
+        $request->method('all')->will($this->returnValue(['foo'=>'bar', 'register'=>null]));
+        $request->method('get')->will($this->returnValueMap([
+            ['foo', 'bar'],
+            ['register', null],
+        ]));
 
-		$form = $this->form($request);
-		$form->text('foo');
-		$form->button('register');
+        $form = $this->form($request);		
+        $form->text('foo');
+        $form->button('register');
 
-		$this->assertSame($form->get('foo'), 'bar');
-	}	
+        $this->assertSame($form->get('foo'), '');
+    }	
 
-	/** @test */
-    public function it_loads_complex_values_from_the_request()
+    /** @test */
+    public function it_is_valid_by_default()
     {
-		$request = $this->request();
-    	$request->method('all')->will($this->returnValue(['foo_first'=>'John', 'foo_surname'=>'Smith', 'register'=>true]));
-    	$request->method('get')->will($this->returnValueMap([
-    		['foo_first', 'John'],
-    		['foo_surname', 'Smith'],
-    		['register', true],
-    	]));
+        $form = $this->form();		
+        $form->text('foo');
+        $form->button('register');
 
-		$form = $this->form($request);		
-		$form->name('foo');
-		$form->button('register');
+        $this->assertTrue($form->valid());
+    }	
 
-		$expected = ['foo_first'=>'John', 'foo_surname'=>'Smith', 'foo'=>'John Smith'];
-		$this->assertSame($form->get('foo'), $expected);
-	}
+    /** @test */
+    public function it_can_validate_specific_fields()
+    {
+        $form = $this->form();		
+        $form->email('foo')->default('foo@example.com');
+        $form->email('bar')->default('bar@invalid');
+        $form->button('register');
 
-	/** @test */
-    public function it_loads_complex_values_by_key_from_the_request()
+        $this->assertTrue($form->valid('foo'));
+        $this->assertFalse($form->valid('bar'));
+    }
+
+    /** @test */
+    public function it_renders_no_errors_unless_submitted()
     {
-		$request = $this->request();
-    	$request->method('all')->will($this->returnValue(['foo_first'=>'John', 'foo_surname'=>'Smith', 'register'=>true]));
-    	$request->method('get')->will($this->returnValueMap([
-    		['foo_first', 'John'],
-    		['foo_surname', 'Smith'],
-    		['register', true],
-    	]));
+        $form = $this->form();
+        $form->text('foo')->required();
+        $form->button('register');
+		
+        $this->assertNotContains('<p class="error_message"', $form->render());
+    }
+
+    /** @test */
+    public function it_renders_errors()
+    {
+        $request = $this->request();
+        $request->method('get')->will($this->returnValueMap([
+            ['foo', ''],
+            ['register', true],
+        ]));
 
-		$form = $this->form($request);		
-		$form->name('foo');
-		$form->button('register');
+        $form = $this->form($request);
+        $form->text('foo')->required();
+        $form->button('register');
 
-		$this->assertSame($form->get('foo', 'surname'), 'Smith');
-	}	
+        $this->assertContains('<p class="error_message">', $form->render());
+    }
 
-	/** @test */
-    public function it_only_loads_values_if_submitted()
+    /** @test */
+    public function it_renders_default_language()
     {
-		$request = $this->request();
-    	$request->method('all')->will($this->returnValue(['foo'=>'bar', 'register'=>null]));
-    	$request->method('get')->will($this->returnValueMap([
-    		['foo', 'bar'],
-    		['register', null],
-    	]));
+        $form = $this->form();
+        $form->text('foo')->required();
+        $form->button('register');
 
-		$form = $this->form($request);		
-		$form->text('foo');
-		$form->button('register');
+        $this->assertContains('This field is required.', $form->render());
+    }
 
-		$this->assertSame($form->get('foo'), '');
-	}	
+    /** @test */
+    public function it_renders_default_added_language()
+    {
+        $form = $this->form();
+        $form->setLanguage('es');
+        $form->text('foo')->required();
 
-	/** @test */
-    public function it_is_valid_by_default()
+        $this->assertContains('Este campo es obligatorio.', $form->render());
+    }	
+
+    /** @test */
+    public function it_sets_own_namespace()
+    {	
+        $form = $this->form();
+
+        $this->assertSame($form->namespaces(), ['Helmut\Forms\Testing\Stubs', 'Helmut\Forms']);
+    }
+
+    /** @test */
+    public function it_can_add_a_namespace()
     {
-		$form = $this->form();		
-		$form->text('foo');
-		$form->button('register');
+        $form = $this->form();
+        $form->addNamespace('My\Custom\Namespace');
+        $form->addNamespace('My\Other\Custom\Namespace');
 
-		$this->assertTrue($form->valid());
-	}	
+        $this->assertSame($form->namespaces(), ['My\Other\Custom\Namespace', 'My\Custom\Namespace', 'Helmut\Forms\Testing\Stubs', 'Helmut\Forms']);
+    }
 
-	/** @test */
-    public function it_can_validate_specific_fields()
+    /** @test */
+    public function it_can_add_autoload_paths()
     {
-		$form = $this->form();		
-		$form->email('foo')->default('foo@example.com');
-		$form->email('bar')->default('bar@invalid');
-		$form->button('register');
-
-		$this->assertTrue($form->valid('foo'));
-		$this->assertFalse($form->valid('bar'));
-	}
-
-	/** @test */
-	public function it_renders_no_errors_unless_submitted()
-	{
-		$form = $this->form();
-		$form->text('foo')->required();
-		$form->button('register');
-		
-		$this->assertNotContains('<p class="error_message"', $form->render());
-	}
-
-	/** @test */
-	public function it_renders_errors()
-	{
-		$request = $this->request();
-    	$request->method('get')->will($this->returnValueMap([
-    		['foo', ''],
-    		['register', true],
-    	]));
-
-		$form = $this->form($request);
-		$form->text('foo')->required();
-		$form->button('register');
-
-		$this->assertContains('<p class="error_message">', $form->render());
-	}
-
-	/** @test */
-	public function it_renders_default_language()
-	{
-		$form = $this->form();
-		$form->text('foo')->required();
-		$form->button('register');
-
-		$this->assertContains('This field is required.', $form->render());
-	}
-
-	/** @test */
-	public function it_renders_default_added_language()
-	{
-		$form = $this->form();
-		$form->setLanguage('es');
-		$form->text('foo')->required();
-
-		$this->assertContains('Este campo es obligatorio.', $form->render());
-	}	
-
-	/** @test */
-	public function it_sets_own_namespace()
-	{	
-		$form = $this->form();
-
-		$this->assertSame($form->namespaces(), ['Helmut\Forms\Testing\Stubs', 'Helmut\Forms']);
-	}
-
-	/** @test */
-	public function it_can_add_a_namespace()
-	{
-		$form = $this->form();
-		$form->addNamespace('My\Custom\Namespace');
-		$form->addNamespace('My\Other\Custom\Namespace');
-
-		$this->assertSame($form->namespaces(), ['My\Other\Custom\Namespace', 'My\Custom\Namespace', 'Helmut\Forms\Testing\Stubs', 'Helmut\Forms']);
-	}
-
-	/** @test */
-	public function it_can_add_autoload_paths()
-	{
-		$form = $this->form();
-		$form->addPath(__DIR__.'/folder');
-		$form->addPath(__DIR__.'/folder/subfolder');
-
-		$paths = $form->paths();
-
-		$this->assertCount(4, $paths);
-		$this->assertContains('forms/tests/unit/folder/subfolder', $paths[0]);
-		$this->assertContains('forms/tests/unit/folder/', $paths[1]);
-		$this->assertContains('forms/tests/unit/stubs/', $paths[2]);
-		$this->assertContains('forms/src/', $paths[3]);
-	}
-
-	/** @test */
-	public function it_will_not_add_autoload_paths_that_do_not_exist()
-	{
-		$form = $this->form();
-		$form->addPath(__DIR__.'/folder');
-		$form->addPath(__DIR__.'/folder/subfolder');
-		$form->addPath(__DIR__.'/folder/doesnotexist');
-
-		$paths = $form->paths();
-
-		$this->assertCount(4, $paths);
-		$this->assertContains('forms/tests/unit/folder/subfolder', $paths[0]);
-		$this->assertContains('forms/tests/unit/folder/', $paths[1]);
-		$this->assertContains('forms/tests/unit/stubs/', $paths[2]);
-		$this->assertContains('forms/src/', $paths[3]);
-	}	
-
-	/** @test */
-	public function it_adds_autoload_paths_with_trailing_slash()
-	{
-		$form = $this->form();
-		$form->addPath(__DIR__.'/folder/');
-		$form->addPath(__DIR__.'/folder/subfolder/');
-
-		$paths = $form->paths();
-
-		$this->assertContains('forms/tests/unit/folder/subfolder', $paths[0]);
-		$this->assertContains('forms/tests/unit/folder/', $paths[1]);
-		$this->assertContains('forms/tests/unit/stubs/', $paths[2]);
-		$this->assertContains('forms/src/', $paths[3]);
-	}
-
-	/** @test */
-	public function it_can_set_template()
-	{
-		$form = $this->form();
-		$form->setTemplate('testing');
-
-		$paths = $form->templatePaths();
-
-		$this->assertCount(1, $paths);
-		$this->assertContains('forms/tests/unit/stubs/templates/testing/', $paths[0]);
-	}
-
-	/** @test */
-	public function it_will_not_add_template_path_that_does_not_exist()
-	{
-		$form = $this->form();
-		$form->setTemplate('doesnotexist');
-
-		$paths = $form->templatePaths();
-
-		$this->assertCount(0, $paths);
-	}	
-
-	/** @test */
-	public function it_sets_template_autoload_path()
-	{
-		$form = $this->form();
+        $form = $this->form();
+        $form->addPath(__DIR__.'/folder');
+        $form->addPath(__DIR__.'/folder/subfolder');
+
+        $paths = $form->paths();
+
+        $this->assertCount(4, $paths);
+        $this->assertContains('forms/tests/unit/folder/subfolder', $paths[0]);
+        $this->assertContains('forms/tests/unit/folder/', $paths[1]);
+        $this->assertContains('forms/tests/unit/stubs/', $paths[2]);
+        $this->assertContains('forms/src/', $paths[3]);
+    }
+
+    /** @test */
+    public function it_will_not_add_autoload_paths_that_do_not_exist()
+    {
+        $form = $this->form();
+        $form->addPath(__DIR__.'/folder');
+        $form->addPath(__DIR__.'/folder/subfolder');
+        $form->addPath(__DIR__.'/folder/doesnotexist');
+
+        $paths = $form->paths();
+
+        $this->assertCount(4, $paths);
+        $this->assertContains('forms/tests/unit/folder/subfolder', $paths[0]);
+        $this->assertContains('forms/tests/unit/folder/', $paths[1]);
+        $this->assertContains('forms/tests/unit/stubs/', $paths[2]);
+        $this->assertContains('forms/src/', $paths[3]);
+    }	
+
+    /** @test */
+    public function it_adds_autoload_paths_with_trailing_slash()
+    {
+        $form = $this->form();
+        $form->addPath(__DIR__.'/folder/');
+        $form->addPath(__DIR__.'/folder/subfolder/');
+
+        $paths = $form->paths();
+
+        $this->assertContains('forms/tests/unit/folder/subfolder', $paths[0]);
+        $this->assertContains('forms/tests/unit/folder/', $paths[1]);
+        $this->assertContains('forms/tests/unit/stubs/', $paths[2]);
+        $this->assertContains('forms/src/', $paths[3]);
+    }
+
+    /** @test */
+    public function it_can_set_template()
+    {
+        $form = $this->form();
+        $form->setTemplate('testing');
+
+        $paths = $form->templatePaths();
+
+        $this->assertCount(1, $paths);
+        $this->assertContains('forms/tests/unit/stubs/templates/testing/', $paths[0]);
+    }
+
+    /** @test */
+    public function it_will_not_add_template_path_that_does_not_exist()
+    {
+        $form = $this->form();
+        $form->setTemplate('doesnotexist');
+
+        $paths = $form->templatePaths();
+
+        $this->assertCount(0, $paths);
+    }	
+
+    /** @test */
+    public function it_sets_template_autoload_path()
+    {
+        $form = $this->form();
 		
-		$paths = $form->templatePaths();
-
-		$this->assertCount(2, $paths);
-		$this->assertContains('forms/tests/unit/stubs/templates/bootstrap/', $paths[0]);
-		$this->assertContains('forms/src/templates/bootstrap/', $paths[1]);
-	}
-
-	/** @test */
-	public function it_uses_added_autoload_paths_to_find_templates()
-	{
-		$form = $this->form();
-		$form->addPath(__DIR__.'/folder');
-
-		$paths = $form->templatePaths();
-
-		$this->assertCount(3, $paths);
-		$this->assertContains('forms/tests/unit/folder/templates/bootstrap/', $paths[0]);
-		$this->assertContains('forms/tests/unit/stubs/templates/bootstrap/', $paths[1]);
-		$this->assertContains('forms/src/templates/bootstrap/', $paths[2]);
-	}
-
-	/** @test */
-	public function it_uses_added_autoload_paths_to_find_templates_with_a_set_template()
-	{
-		$form = $this->form();
-		$form->setTemplate('testing');
-		$form->addPath(__DIR__.'/folder');
-
-		$paths = $form->templatePaths();
-
-		$this->assertCount(2, $paths);
-		$this->assertContains('forms/tests/unit/folder/templates/testing/', $paths[0]);
-		$this->assertContains('forms/tests/unit/stubs/templates/testing/', $paths[1]);
-	}	
-
-	/** @test */
-	public function it_sets_your_namespace_as_an_autoload_path()
-	{
-    	$form = new FormWithCustomNamespace($this->request());
-		$form->removeAllPlugins();
-
-		$paths = $form->paths();
-
-		$this->assertCount(2, $paths);
-		$this->assertContains('tests/unit/stubs/Custom/', $paths[0]);
-		$this->assertContains('forms/src/', $paths[1]);
-	}
-
-	/** @test */
-	public function it_sets_your_namespace_and_parent_namespaces_as_an_autoload_path()
-	{
-    	$form = new FormWithCustomExtension($this->request());
-		$form->removeAllPlugins();
-
-		$paths = $form->paths();
-
-		$this->assertCount(3, $paths);
-		$this->assertContains('tests/unit/stubs/CustomExtension/', $paths[0]);
-		$this->assertContains('tests/unit/stubs/CustomExtension/FormExtension/', $paths[1]);
-		$this->assertContains('forms/src/', $paths[2]);
-	}
-
-	/** @test */
-	public function it_sets_your_namespace_template_autoload_path_with_added_template()
-	{
-    	$form = new FormWithCustomNamespace($this->request());
-		$form->removeAllPlugins();    	
-		$form->setTemplate('testing');
-
-		$paths = $form->templatePaths();
-
-		$this->assertCount(1, $paths);
-		$this->assertContains('tests/unit/stubs/Custom/templates/testing/', $paths[0]);
-	}		
-
-	/** @test */
-	public function it_renders_using_your_namespace_template()
-	{
-    	$form = new FormWithCustomNamespace($this->request());
-		$form->removeAllPlugins();
-
-		$this->assertContains('it_renders_using_your_namespace_template', $form->render());
-	}
+        $paths = $form->templatePaths();
+
+        $this->assertCount(2, $paths);
+        $this->assertContains('forms/tests/unit/stubs/templates/bootstrap/', $paths[0]);
+        $this->assertContains('forms/src/templates/bootstrap/', $paths[1]);
+    }
+
+    /** @test */
+    public function it_uses_added_autoload_paths_to_find_templates()
+    {
+        $form = $this->form();
+        $form->addPath(__DIR__.'/folder');
+
+        $paths = $form->templatePaths();
+
+        $this->assertCount(3, $paths);
+        $this->assertContains('forms/tests/unit/folder/templates/bootstrap/', $paths[0]);
+        $this->assertContains('forms/tests/unit/stubs/templates/bootstrap/', $paths[1]);
+        $this->assertContains('forms/src/templates/bootstrap/', $paths[2]);
+    }
+
+    /** @test */
+    public function it_uses_added_autoload_paths_to_find_templates_with_a_set_template()
+    {
+        $form = $this->form();
+        $form->setTemplate('testing');
+        $form->addPath(__DIR__.'/folder');
+
+        $paths = $form->templatePaths();
+
+        $this->assertCount(2, $paths);
+        $this->assertContains('forms/tests/unit/folder/templates/testing/', $paths[0]);
+        $this->assertContains('forms/tests/unit/stubs/templates/testing/', $paths[1]);
+    }	
+
+    /** @test */
+    public function it_sets_your_namespace_as_an_autoload_path()
+    {
+        $form = new FormWithCustomNamespace($this->request());
+        $form->removeAllPlugins();
+
+        $paths = $form->paths();
+
+        $this->assertCount(2, $paths);
+        $this->assertContains('tests/unit/stubs/Custom/', $paths[0]);
+        $this->assertContains('forms/src/', $paths[1]);
+    }
+
+    /** @test */
+    public function it_sets_your_namespace_and_parent_namespaces_as_an_autoload_path()
+    {
+        $form = new FormWithCustomExtension($this->request());
+        $form->removeAllPlugins();
+
+        $paths = $form->paths();
+
+        $this->assertCount(3, $paths);
+        $this->assertContains('tests/unit/stubs/CustomExtension/', $paths[0]);
+        $this->assertContains('tests/unit/stubs/CustomExtension/FormExtension/', $paths[1]);
+        $this->assertContains('forms/src/', $paths[2]);
+    }
+
+    /** @test */
+    public function it_sets_your_namespace_template_autoload_path_with_added_template()
+    {
+        $form = new FormWithCustomNamespace($this->request());
+        $form->removeAllPlugins();    	
+        $form->setTemplate('testing');
+
+        $paths = $form->templatePaths();
+
+        $this->assertCount(1, $paths);
+        $this->assertContains('tests/unit/stubs/Custom/templates/testing/', $paths[0]);
+    }		
+
+    /** @test */
+    public function it_renders_using_your_namespace_template()
+    {
+        $form = new FormWithCustomNamespace($this->request());
+        $form->removeAllPlugins();
+
+        $this->assertContains('it_renders_using_your_namespace_template', $form->render());
+    }
 
 }
\ 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

src/Fields/Dropdown/Dropdown.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()