@@ -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 | |
@@ -84,14 +84,18 @@ discard block |
||
| 84 | 84 | public function setValueFromDefault() |
| 85 | 85 | { |
| 86 | 86 | foreach (array_keys($this->options) as $key) { |
| 87 | - if (isset($this->default[$key])) $this->values[$key] = $this->default[$key] ? true : false; |
|
| 87 | + if (isset($this->default[$key])) { |
|
| 88 | + $this->values[$key] = $this->default[$key] ? true : false; |
|
| 89 | + } |
|
| 88 | 90 | } |
| 89 | 91 | } |
| 90 | 92 | |
| 91 | 93 | public function setValueFromModel($model) |
| 92 | 94 | { |
| 93 | 95 | foreach (array_keys($this->options) as $key) { |
| 94 | - if (property_exists($model, $this->name.'_'.$key)) $this->values[$key] = $model->{$this->name.'_'.$key} ? true : false; |
|
| 96 | + if (property_exists($model, $this->name.'_'.$key)) { |
|
| 97 | + $this->values[$key] = $model->{$this->name.'_'.$key} ? true : false; |
|
| 98 | + } |
|
| 95 | 99 | } |
| 96 | 100 | |
| 97 | 101 | } |
@@ -106,7 +110,9 @@ discard block |
||
| 106 | 110 | public function fillModelWithValue($model) |
| 107 | 111 | { |
| 108 | 112 | foreach (array_keys($this->options) as $key) { |
| 109 | - if (property_exists($model, $this->name.'_'.$key)) $model->{$this->name.'_'.$key} = $this->values[$key] ? 1 : 0; |
|
| 113 | + if (property_exists($model, $this->name.'_'.$key)) { |
|
| 114 | + $model->{$this->name.'_'.$key} = $this->values[$key] ? 1 : 0; |
|
| 115 | + } |
|
| 110 | 116 | } |
| 111 | 117 | } |
| 112 | 118 | |
@@ -115,7 +121,9 @@ discard block |
||
| 115 | 121 | $checked = false; |
| 116 | 122 | |
| 117 | 123 | foreach (array_keys($this->options) as $key) { |
| 118 | - if ($this->values[$key]) $checked = true; |
|
| 124 | + if ($this->values[$key]) { |
|
| 125 | + $checked = true; |
|
| 126 | + } |
|
| 119 | 127 | } |
| 120 | 128 | |
| 121 | 129 | return $checked; |
@@ -52,7 +52,9 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | public function setValueFromModel($model) |
| 54 | 54 | { |
| 55 | - if (property_exists($model, $this->name)) $this->value = $model->{$this->name}; |
|
| 55 | + if (property_exists($model, $this->name)) { |
|
| 56 | + $this->value = $model->{$this->name}; |
|
| 57 | + } |
|
| 56 | 58 | } |
| 57 | 59 | |
| 58 | 60 | public function setValueFromRequest($request) |
@@ -62,7 +64,9 @@ discard block |
||
| 62 | 64 | |
| 63 | 65 | public function fillModelWithValue($model) |
| 64 | 66 | { |
| 65 | - if (property_exists($model, $this->name)) $model->{$this->name} = $this->value; |
|
| 67 | + if (property_exists($model, $this->name)) { |
|
| 68 | + $model->{$this->name} = $this->value; |
|
| 69 | + } |
|
| 66 | 70 | } |
| 67 | 71 | |
| 68 | 72 | public function validateRequired() |
@@ -31,7 +31,9 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | public function setValueFromModel($model) |
| 33 | 33 | { |
| 34 | - if (property_exists($model, $this->name)) $this->value = $model->{$this->name}; |
|
| 34 | + if (property_exists($model, $this->name)) { |
|
| 35 | + $this->value = $model->{$this->name}; |
|
| 36 | + } |
|
| 35 | 37 | } |
| 36 | 38 | |
| 37 | 39 | public function setValueFromRequest($request) |
@@ -41,7 +43,9 @@ discard block |
||
| 41 | 43 | |
| 42 | 44 | public function fillModelWithValue($model) |
| 43 | 45 | { |
| 44 | - if (property_exists($model, $this->name)) $model->{$this->name} = $this->value; |
|
| 46 | + if (property_exists($model, $this->name)) { |
|
| 47 | + $model->{$this->name} = $this->value; |
|
| 48 | + } |
|
| 45 | 49 | } |
| 46 | 50 | |
| 47 | 51 | public function validate() |
@@ -38,15 +38,23 @@ discard block |
||
| 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 (property_exists($model, $this->name.'_first')) $this->value_first = $model->{$this->name.'_first'}; |
|
| 49 | - if (property_exists($model, $this->name.'_surname')) $this->value_surname = $model->{$this->name.'_surname'}; |
|
| 52 | + if (property_exists($model, $this->name.'_first')) { |
|
| 53 | + $this->value_first = $model->{$this->name.'_first'}; |
|
| 54 | + } |
|
| 55 | + if (property_exists($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 | |
@@ -59,9 +67,15 @@ discard block |
||
| 59 | 67 | |
| 60 | 68 | public function fillModelWithValue($model) |
| 61 | 69 | { |
| 62 | - if (property_exists($model, $this->name.'_first')) $model->{$this->name.'_first'} = $this->value_first; |
|
| 63 | - if (property_exists($model, $this->name.'_surname')) $model->{$this->name.'_surname'} = $this->value_surname; |
|
| 64 | - if (property_exists($model, $this->name)) $model->{$this->name} = $this->value; |
|
| 70 | + if (property_exists($model, $this->name.'_first')) { |
|
| 71 | + $model->{$this->name.'_first'} = $this->value_first; |
|
| 72 | + } |
|
| 73 | + if (property_exists($model, $this->name.'_surname')) { |
|
| 74 | + $model->{$this->name.'_surname'} = $this->value_surname; |
|
| 75 | + } |
|
| 76 | + if (property_exists($model, $this->name)) { |
|
| 77 | + $model->{$this->name} = $this->value; |
|
| 78 | + } |
|
| 65 | 79 | } |
| 66 | 80 | |
| 67 | 81 | public function validateRequired() |
@@ -41,7 +41,9 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | public function setValueFromModel($model) |
| 43 | 43 | { |
| 44 | - if (property_exists($model, $this->name)) $this->value = $model->{$this->name}; |
|
| 44 | + if (property_exists($model, $this->name)) { |
|
| 45 | + $this->value = $model->{$this->name}; |
|
| 46 | + } |
|
| 45 | 47 | } |
| 46 | 48 | |
| 47 | 49 | public function setValueFromRequest($request) |
@@ -51,7 +53,9 @@ discard block |
||
| 51 | 53 | |
| 52 | 54 | public function fillModelWithValue($model) |
| 53 | 55 | { |
| 54 | - if (property_exists($model, $this->name)) $model->{$this->name} = $this->value; |
|
| 56 | + if (property_exists($model, $this->name)) { |
|
| 57 | + $model->{$this->name} = $this->value; |
|
| 58 | + } |
|
| 55 | 59 | } |
| 56 | 60 | |
| 57 | 61 | public function validate() |
@@ -31,7 +31,9 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | public function setValueFromModel($model) |
| 33 | 33 | { |
| 34 | - if (property_exists($model, $this->name)) $this->value = $model->{$this->name}; |
|
| 34 | + if (property_exists($model, $this->name)) { |
|
| 35 | + $this->value = $model->{$this->name}; |
|
| 36 | + } |
|
| 35 | 37 | } |
| 36 | 38 | |
| 37 | 39 | public function setValueFromRequest($request) |
@@ -41,7 +43,9 @@ discard block |
||
| 41 | 43 | |
| 42 | 44 | public function fillModelWithValue($model) |
| 43 | 45 | { |
| 44 | - if (property_exists($model, $this->name)) $model->{$this->name} = $this->value; |
|
| 46 | + if (property_exists($model, $this->name)) { |
|
| 47 | + $model->{$this->name} = $this->value; |
|
| 48 | + } |
|
| 45 | 49 | } |
| 46 | 50 | |
| 47 | 51 | public function validateRequired() |
@@ -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 | |