@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Helmut\Forms; |
4 | 4 | |
5 | -use Helmut\Forms\Utility\Str; |
|
6 | 5 | use Helmut\Forms\Utility\Reflect; |
6 | +use Helmut\Forms\Utility\Str; |
|
7 | 7 | |
8 | 8 | abstract class Field { |
9 | 9 |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $this->configure($config); |
25 | 25 | |
26 | 26 | $this->setPath(); |
27 | - } |
|
27 | + } |
|
28 | 28 | |
29 | 29 | /** |
30 | 30 | * Configure the plugin. |
@@ -69,11 +69,11 @@ discard block |
||
69 | 69 | * |
70 | 70 | * @return array |
71 | 71 | */ |
72 | - public function templatePaths() |
|
73 | - { |
|
74 | - $path = $this->path('templates'); |
|
75 | - return [$path]; |
|
76 | - } |
|
72 | + public function templatePaths() |
|
73 | + { |
|
74 | + $path = $this->path('templates'); |
|
75 | + return [$path]; |
|
76 | + } |
|
77 | 77 | |
78 | 78 | /** |
79 | 79 | * Trigger an event callback. This allows |
@@ -6,8 +6,11 @@ discard block |
||
6 | 6 | |
7 | 7 | public static function required($var) |
8 | 8 | { |
9 | - if (is_null($var)) return false; |
|
10 | - else if (is_string($var) && trim($var) === '') return false; |
|
9 | + if (is_null($var)) { |
|
10 | + return false; |
|
11 | + } else if (is_string($var) && trim($var) === '') { |
|
12 | + return false; |
|
13 | + } |
|
11 | 14 | return true; |
12 | 15 | } |
13 | 16 | |
@@ -28,13 +31,17 @@ discard block |
||
28 | 31 | |
29 | 32 | public static function alphaNum($var) |
30 | 33 | { |
31 | - if ( ! is_string($var) && ! is_numeric($var)) return false; |
|
34 | + if ( ! is_string($var) && ! is_numeric($var)) { |
|
35 | + return false; |
|
36 | + } |
|
32 | 37 | return preg_match('/^[\pL\pM\pN]+$/u', $var); |
33 | 38 | } |
34 | 39 | |
35 | 40 | public static function alphaDash($var) |
36 | 41 | { |
37 | - if ( ! is_string($var) && ! is_numeric($var)) return false; |
|
42 | + if ( ! is_string($var) && ! is_numeric($var)) { |
|
43 | + return false; |
|
44 | + } |
|
38 | 45 | return preg_match('/^[\pL\pM\pN_-]+$/u', $var); |
39 | 46 | } |
40 | 47 |
@@ -15,7 +15,9 @@ |
||
15 | 15 | */ |
16 | 16 | public function render($path, $properties = []) |
17 | 17 | { |
18 | - if ( ! function_exists('app')) throw new \Exception('Laravel required for blade rendering engine.'); |
|
18 | + if ( ! function_exists('app')) { |
|
19 | + throw new \Exception('Laravel required for blade rendering engine.'); |
|
20 | + } |
|
19 | 21 | |
20 | 22 | return app()->make('view')->file($path, $properties); |
21 | 23 | } |
@@ -21,7 +21,9 @@ |
||
21 | 21 | */ |
22 | 22 | public function compiler() |
23 | 23 | { |
24 | - if ( ! $this->compiler) $this->compiler = new Mustache_Engine; |
|
24 | + if ( ! $this->compiler) { |
|
25 | + $this->compiler = new Mustache_Engine; |
|
26 | + } |
|
25 | 27 | |
26 | 28 | return $this->compiler; |
27 | 29 | } |
@@ -10,6 +10,9 @@ |
||
10 | 10 | protected $value = ''; |
11 | 11 | protected $value_confirmation = ''; |
12 | 12 | |
13 | + /** |
|
14 | + * @param string $value |
|
15 | + */ |
|
13 | 16 | public function hash($value) |
14 | 17 | { |
15 | 18 | if (strlen($value) === 0) { |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | */ |
354 | 354 | public function completed($name = null) |
355 | 355 | { |
356 | - if($this->submitted($name) && $this->valid()) { |
|
356 | + if ($this->submitted($name) && $this->valid()) { |
|
357 | 357 | $this->broadcast('completed'); |
358 | 358 | return true; |
359 | 359 | } |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | $errors = []; |
502 | 502 | |
503 | 503 | foreach ($this->fields as $field) { |
504 | - foreach($field->errors() as $error) { |
|
504 | + foreach ($field->errors() as $error) { |
|
505 | 505 | $errors[] = $error; |
506 | 506 | } |
507 | 507 | } |
@@ -623,8 +623,8 @@ discard block |
||
623 | 623 | { |
624 | 624 | $config = $this->templateConfig($template); |
625 | 625 | |
626 | - if ( isset($config['plugins']) && is_array($config['plugins'])) { |
|
627 | - foreach($config['plugins'] as $key => $plugin) { |
|
626 | + if (isset($config['plugins']) && is_array($config['plugins'])) { |
|
627 | + foreach ($config['plugins'] as $key => $plugin) { |
|
628 | 628 | if (is_array($plugin)) { |
629 | 629 | $this->addPlugin($key, $plugin); |
630 | 630 | } else { |
@@ -644,8 +644,8 @@ discard block |
||
644 | 644 | { |
645 | 645 | $config = $this->templateConfig($template); |
646 | 646 | |
647 | - if ( isset($config['plugins']) && is_array($config['plugins'])) { |
|
648 | - foreach($config['plugins'] as $plugin) { |
|
647 | + if (isset($config['plugins']) && is_array($config['plugins'])) { |
|
648 | + foreach ($config['plugins'] as $plugin) { |
|
649 | 649 | $this->removePlugin($plugin); |
650 | 650 | } |
651 | 651 | } |
@@ -682,7 +682,7 @@ discard block |
||
682 | 682 | foreach ($field->errors() as $error => $parameters) { |
683 | 683 | |
684 | 684 | if ($error == 'userDefined') { |
685 | - foreach($parameters as $message) { |
|
685 | + foreach ($parameters as $message) { |
|
686 | 686 | $properties['errors'][] = ['error' => $message]; |
687 | 687 | } |
688 | 688 | } else { |
@@ -691,7 +691,7 @@ discard block |
||
691 | 691 | |
692 | 692 | $message = $this->translate($error, $field); |
693 | 693 | |
694 | - foreach($parameters as $key => $value) { |
|
694 | + foreach ($parameters as $key => $value) { |
|
695 | 695 | if (is_object($value) && method_exists($value, '__toString')) { |
696 | 696 | $value = (string) $value; |
697 | 697 | } |
@@ -976,7 +976,7 @@ discard block |
||
976 | 976 | */ |
977 | 977 | private function broadcast($event, $params = []) |
978 | 978 | { |
979 | - foreach($this->plugins as $plugin) { |
|
979 | + foreach ($this->plugins as $plugin) { |
|
980 | 980 | $plugin->event($this, $event, $params); |
981 | 981 | } |
982 | 982 | } |
@@ -1117,7 +1117,7 @@ discard block |
||
1117 | 1117 | { |
1118 | 1118 | if ( ! method_exists($this, $method)) |
1119 | 1119 | { |
1120 | - if ( $this->typeExists($method)) { |
|
1120 | + if ($this->typeExists($method)) { |
|
1121 | 1121 | return $this->addField($method, array_shift($parameters)); |
1122 | 1122 | } |
1123 | 1123 | } |
@@ -31,7 +31,9 @@ |
||
31 | 31 | |
32 | 32 | public function setValueFromModel($model) |
33 | 33 | { |
34 | - if (isset($model->{$this->name})) $this->value = $model->{$this->name}; |
|
34 | + if (isset($model->{$this->name})) { |
|
35 | + $this->value = $model->{$this->name}; |
|
36 | + } |
|
35 | 37 | } |
36 | 38 | |
37 | 39 | public function setValueFromRequest($request) |
@@ -38,15 +38,23 @@ |
||
38 | 38 | |
39 | 39 | public function setValueFromDefault() |
40 | 40 | { |
41 | - if (isset($this->default['first'])) $this->value_first = $this->default['first']; |
|
42 | - if (isset($this->default['surname'])) $this->value_surname = $this->default['surname']; |
|
41 | + if (isset($this->default['first'])) { |
|
42 | + $this->value_first = $this->default['first']; |
|
43 | + } |
|
44 | + if (isset($this->default['surname'])) { |
|
45 | + $this->value_surname = $this->default['surname']; |
|
46 | + } |
|
43 | 47 | $this->value = trim($this->value_first.' '.$this->value_surname); |
44 | 48 | } |
45 | 49 | |
46 | 50 | public function setValueFromModel($model) |
47 | 51 | { |
48 | - if (isset($model->{$this->name.'_first'})) $this->value_first = $model->{$this->name.'_first'}; |
|
49 | - if (isset($model->{$this->name.'_surname'})) $this->value_surname = $model->{$this->name.'_surname'}; |
|
52 | + if (isset($model->{$this->name.'_first'})) { |
|
53 | + $this->value_first = $model->{$this->name.'_first'}; |
|
54 | + } |
|
55 | + if (isset($model->{$this->name.'_surname'})) { |
|
56 | + $this->value_surname = $model->{$this->name.'_surname'}; |
|
57 | + } |
|
50 | 58 | $this->value = trim($this->value_first.' '.$this->value_surname); |
51 | 59 | } |
52 | 60 |