@@ -25,12 +25,16 @@ discard block |
||
25 | 25 | |
26 | 26 | public function setValuesFromDefaults($defaults) |
27 | 27 | { |
28 | - if (count($defaults)) $this->value = array_shift($defaults); |
|
28 | + if (count($defaults)) { |
|
29 | + $this->value = array_shift($defaults); |
|
30 | + } |
|
29 | 31 | } |
30 | 32 | |
31 | 33 | public function setValuesFromModel($model) |
32 | 34 | { |
33 | - if (property_exists($model, $this->name)) $this->value = $model->{$this->name}; |
|
35 | + if (property_exists($model, $this->name)) { |
|
36 | + $this->value = $model->{$this->name}; |
|
37 | + } |
|
34 | 38 | } |
35 | 39 | |
36 | 40 | public function setValuesFromRequest($request) |
@@ -40,7 +44,9 @@ discard block |
||
40 | 44 | |
41 | 45 | public function fillModelWithValues($model) |
42 | 46 | { |
43 | - if (property_exists($model, $this->name)) $model->{$this->name} = $this->value; |
|
47 | + if (property_exists($model, $this->name)) { |
|
48 | + $model->{$this->name} = $this->value; |
|
49 | + } |
|
44 | 50 | } |
45 | 51 | |
46 | 52 | public function validateRequired() |
@@ -25,12 +25,16 @@ discard block |
||
25 | 25 | |
26 | 26 | public function setValuesFromDefaults($defaults) |
27 | 27 | { |
28 | - if (count($defaults)) $this->value = array_shift($defaults); |
|
28 | + if (count($defaults)) { |
|
29 | + $this->value = array_shift($defaults); |
|
30 | + } |
|
29 | 31 | } |
30 | 32 | |
31 | 33 | public function setValuesFromModel($model) |
32 | 34 | { |
33 | - if (property_exists($model, $this->name)) $this->value = $model->{$this->name}; |
|
35 | + if (property_exists($model, $this->name)) { |
|
36 | + $this->value = $model->{$this->name}; |
|
37 | + } |
|
34 | 38 | } |
35 | 39 | |
36 | 40 | public function setValuesFromRequest($request) |
@@ -40,7 +44,9 @@ discard block |
||
40 | 44 | |
41 | 45 | public function fillModelWithValues($model) |
42 | 46 | { |
43 | - if (property_exists($model, $this->name)) $model->{$this->name} = $this->value; |
|
47 | + if (property_exists($model, $this->name)) { |
|
48 | + $model->{$this->name} = $this->value; |
|
49 | + } |
|
44 | 50 | } |
45 | 51 | |
46 | 52 | public function validateRequired() |
@@ -25,12 +25,16 @@ discard block |
||
25 | 25 | |
26 | 26 | public function setValuesFromDefaults($defaults) |
27 | 27 | { |
28 | - if (count($defaults)) $this->value = array_shift($defaults); |
|
28 | + if (count($defaults)) { |
|
29 | + $this->value = array_shift($defaults); |
|
30 | + } |
|
29 | 31 | } |
30 | 32 | |
31 | 33 | public function setValuesFromModel($model) |
32 | 34 | { |
33 | - if (property_exists($model, $this->name)) $this->value = $model->{$this->name}; |
|
35 | + if (property_exists($model, $this->name)) { |
|
36 | + $this->value = $model->{$this->name}; |
|
37 | + } |
|
34 | 38 | } |
35 | 39 | |
36 | 40 | public function setValuesFromRequest($request) |
@@ -40,7 +44,9 @@ discard block |
||
40 | 44 | |
41 | 45 | public function fillModelWithValues($model) |
42 | 46 | { |
43 | - if (property_exists($model, $this->name)) $model->{$this->name} = $this->value; |
|
47 | + if (property_exists($model, $this->name)) { |
|
48 | + $model->{$this->name} = $this->value; |
|
49 | + } |
|
44 | 50 | } |
45 | 51 | |
46 | 52 | public function validateRequired() |
@@ -10,134 +10,134 @@ |
||
10 | 10 | * |
11 | 11 | * @var array |
12 | 12 | */ |
13 | - protected $engines = [ |
|
14 | - '.mustache.php' => 'Helmut\Forms\Engines\Mustache', |
|
15 | - '.twig.php' => 'Helmut\Forms\Engines\Twig', |
|
16 | - '.blade.php' => 'Helmut\Forms\Engines\Blade', |
|
17 | - ]; |
|
13 | + protected $engines = [ |
|
14 | + '.mustache.php' => 'Helmut\Forms\Engines\Mustache', |
|
15 | + '.twig.php' => 'Helmut\Forms\Engines\Twig', |
|
16 | + '.blade.php' => 'Helmut\Forms\Engines\Blade', |
|
17 | + ]; |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * Cache of running engines. |
21 | 21 | * |
22 | 22 | * @var array |
23 | 23 | */ |
24 | - protected $running = []; |
|
24 | + protected $running = []; |
|
25 | 25 | |
26 | 26 | /** |
27 | 27 | * Cache of template files. |
28 | 28 | * |
29 | 29 | * @var array |
30 | 30 | */ |
31 | - protected $templates = []; |
|
31 | + protected $templates = []; |
|
32 | 32 | |
33 | 33 | /** |
34 | 34 | * Add a new engine implementation. |
35 | 35 | * |
36 | - * @param string $extension |
|
37 | - * @param string $class |
|
36 | + * @param string $extension |
|
37 | + * @param string $class |
|
38 | 38 | * @return void |
39 | 39 | */ |
40 | - public function addEngine($extension, $class) |
|
41 | - { |
|
42 | - array_unshift($this->engines, [$extension => $class]); |
|
43 | - } |
|
40 | + public function addEngine($extension, $class) |
|
41 | + { |
|
42 | + array_unshift($this->engines, [$extension => $class]); |
|
43 | + } |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * Get an engine implementation. |
47 | 47 | * |
48 | - * @param string $key |
|
48 | + * @param string $key |
|
49 | 49 | * @return \Helmut\Forms\Engine |
50 | 50 | */ |
51 | - public function start($key) |
|
52 | - { |
|
53 | - if ( ! isset($this->running[$key])) { |
|
54 | - $this->running[$key] = new $this->engines[$key]; |
|
55 | - } |
|
51 | + public function start($key) |
|
52 | + { |
|
53 | + if ( ! isset($this->running[$key])) { |
|
54 | + $this->running[$key] = new $this->engines[$key]; |
|
55 | + } |
|
56 | 56 | |
57 | - return $this->running[$key]; |
|
58 | - } |
|
57 | + return $this->running[$key]; |
|
58 | + } |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Get engine file extensions. |
62 | 62 | * |
63 | 63 | * @return array |
64 | 64 | */ |
65 | - public function extensions() |
|
66 | - { |
|
67 | - return array_keys($this->engines); |
|
68 | - } |
|
65 | + public function extensions() |
|
66 | + { |
|
67 | + return array_keys($this->engines); |
|
68 | + } |
|
69 | 69 | |
70 | 70 | /** |
71 | 71 | * Create a template cache key. |
72 | 72 | * |
73 | - * @param string $template |
|
74 | - * @param array $paths |
|
73 | + * @param string $template |
|
74 | + * @param array $paths |
|
75 | 75 | * @return string |
76 | 76 | */ |
77 | - public function key($template, $paths) |
|
78 | - { |
|
79 | - return $template.'-'.md5(serialize($paths)); |
|
80 | - } |
|
77 | + public function key($template, $paths) |
|
78 | + { |
|
79 | + return $template.'-'.md5(serialize($paths)); |
|
80 | + } |
|
81 | 81 | |
82 | 82 | /** |
83 | 83 | * Render a template. |
84 | 84 | * |
85 | - * @param string $template |
|
86 | - * @param array $properties |
|
87 | - * @param array $paths |
|
85 | + * @param string $template |
|
86 | + * @param array $properties |
|
87 | + * @param array $paths |
|
88 | 88 | * @return string |
89 | 89 | */ |
90 | - public function render($template, $properties, $paths) |
|
91 | - { |
|
92 | - if ($this->has($template, $paths)) { |
|
90 | + public function render($template, $properties, $paths) |
|
91 | + { |
|
92 | + if ($this->has($template, $paths)) { |
|
93 | 93 | |
94 | - $template = $this->findTemplate($template, $paths); |
|
94 | + $template = $this->findTemplate($template, $paths); |
|
95 | 95 | |
96 | - return $this->start($template['engine'])->render($template['path'], $properties); |
|
97 | - } |
|
98 | - } |
|
96 | + return $this->start($template['engine'])->render($template['path'], $properties); |
|
97 | + } |
|
98 | + } |
|
99 | 99 | |
100 | 100 | /** |
101 | 101 | * Check if a template exists. |
102 | 102 | * |
103 | - * @param string $template |
|
104 | - * @param array $paths |
|
103 | + * @param string $template |
|
104 | + * @param array $paths |
|
105 | 105 | * @return boolean |
106 | 106 | */ |
107 | - public function has($template, $paths) |
|
108 | - { |
|
109 | - return ! is_null($this->findTemplate($template, $paths)); |
|
110 | - } |
|
107 | + public function has($template, $paths) |
|
108 | + { |
|
109 | + return ! is_null($this->findTemplate($template, $paths)); |
|
110 | + } |
|
111 | 111 | |
112 | 112 | /** |
113 | 113 | * Find template file with engine. |
114 | 114 | * |
115 | - * @param string $template |
|
116 | - * @param array $paths |
|
115 | + * @param string $template |
|
116 | + * @param array $paths |
|
117 | 117 | * @return array |
118 | 118 | */ |
119 | - public function findTemplate($template, $paths) |
|
120 | - { |
|
121 | - $key = $this->key($template, $paths); |
|
122 | - |
|
123 | - if ( ! isset($this->templates[$key])) { |
|
124 | - |
|
125 | - $this->templates[$key] = null; |
|
126 | - |
|
127 | - $extensions = $this->extensions(); |
|
128 | - foreach ($paths as $path) { |
|
129 | - foreach ($extensions as $extension) { |
|
130 | - if (file_exists($path.$template.$extension)) { |
|
131 | - return $this->templates[$key] = [ |
|
132 | - 'engine' => $extension, |
|
133 | - 'path' => $path.$template.$extension, |
|
134 | - ]; |
|
135 | - } |
|
136 | - } |
|
137 | - } |
|
138 | - } |
|
139 | - |
|
140 | - return $this->templates[$key]; |
|
141 | - } |
|
119 | + public function findTemplate($template, $paths) |
|
120 | + { |
|
121 | + $key = $this->key($template, $paths); |
|
122 | + |
|
123 | + if ( ! isset($this->templates[$key])) { |
|
124 | + |
|
125 | + $this->templates[$key] = null; |
|
126 | + |
|
127 | + $extensions = $this->extensions(); |
|
128 | + foreach ($paths as $path) { |
|
129 | + foreach ($extensions as $extension) { |
|
130 | + if (file_exists($path.$template.$extension)) { |
|
131 | + return $this->templates[$key] = [ |
|
132 | + 'engine' => $extension, |
|
133 | + 'path' => $path.$template.$extension, |
|
134 | + ]; |
|
135 | + } |
|
136 | + } |
|
137 | + } |
|
138 | + } |
|
139 | + |
|
140 | + return $this->templates[$key]; |
|
141 | + } |
|
142 | 142 | |
143 | 143 | } |
@@ -8,41 +8,41 @@ |
||
8 | 8 | |
9 | 9 | class Twig implements Engine { |
10 | 10 | |
11 | - /** |
|
12 | - * The twig compiler engine. |
|
13 | - * |
|
14 | - * @var \Twig_Environment |
|
15 | - */ |
|
16 | - protected $compiler; |
|
17 | - |
|
18 | - /** |
|
11 | + /** |
|
12 | + * The twig compiler engine. |
|
13 | + * |
|
14 | + * @var \Twig_Environment |
|
15 | + */ |
|
16 | + protected $compiler; |
|
17 | + |
|
18 | + /** |
|
19 | 19 | * Fetch the compiler. |
20 | 20 | * |
21 | 21 | * @return \Twig_Environment |
22 | 22 | */ |
23 | - public function compiler() |
|
24 | - { |
|
25 | - if ( ! $this->compiler) { |
|
26 | - $this->compiler = new Twig_Environment(new Twig_Loader_Array([])); |
|
27 | - } |
|
23 | + public function compiler() |
|
24 | + { |
|
25 | + if ( ! $this->compiler) { |
|
26 | + $this->compiler = new Twig_Environment(new Twig_Loader_Array([])); |
|
27 | + } |
|
28 | 28 | |
29 | - return $this->compiler; |
|
30 | - } |
|
29 | + return $this->compiler; |
|
30 | + } |
|
31 | 31 | |
32 | - /** |
|
32 | + /** |
|
33 | 33 | * Render the template content. |
34 | 34 | * |
35 | - * @param string $path |
|
36 | - * @param array $properties |
|
35 | + * @param string $path |
|
36 | + * @param array $properties |
|
37 | 37 | * @return string |
38 | 38 | */ |
39 | - public function render($path, $properties = []) |
|
40 | - { |
|
41 | - $content = file_get_contents($path); |
|
39 | + public function render($path, $properties = []) |
|
40 | + { |
|
41 | + $content = file_get_contents($path); |
|
42 | 42 | |
43 | 43 | $template = $this->compiler()->createTemplate($content); |
44 | 44 | |
45 | - return $template->render($properties); |
|
46 | - } |
|
45 | + return $template->render($properties); |
|
46 | + } |
|
47 | 47 | |
48 | 48 | } |
@@ -6,19 +6,19 @@ |
||
6 | 6 | |
7 | 7 | class Basic implements Request { |
8 | 8 | |
9 | - public function all() |
|
10 | - { |
|
11 | - return isset($_POST) ? $_POST : []; |
|
12 | - } |
|
9 | + public function all() |
|
10 | + { |
|
11 | + return isset($_POST) ? $_POST : []; |
|
12 | + } |
|
13 | 13 | |
14 | - public function get($key) |
|
15 | - { |
|
16 | - return isset($_POST[$key]) ? $_POST[$key] : null; |
|
17 | - } |
|
14 | + public function get($key) |
|
15 | + { |
|
16 | + return isset($_POST[$key]) ? $_POST[$key] : null; |
|
17 | + } |
|
18 | 18 | |
19 | - public function csrf() |
|
20 | - { |
|
21 | - return []; |
|
22 | - } |
|
19 | + public function csrf() |
|
20 | + { |
|
21 | + return []; |
|
22 | + } |
|
23 | 23 | |
24 | 24 | } |
25 | 25 | \ No newline at end of file |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return [ |
4 | - 'plugins' => [ |
|
5 | - 'feedback', |
|
6 | - ], |
|
4 | + 'plugins' => [ |
|
5 | + 'feedback', |
|
6 | + ], |
|
7 | 7 | ]; |
8 | 8 | \ No newline at end of file |
@@ -30,6 +30,9 @@ discard block |
||
30 | 30 | } |
31 | 31 | } |
32 | 32 | |
33 | + /** |
|
34 | + * @param string $class |
|
35 | + */ |
|
33 | 36 | public static function getNamespace($class) |
34 | 37 | { |
35 | 38 | try { |
@@ -45,6 +48,10 @@ discard block |
||
45 | 48 | } |
46 | 49 | } |
47 | 50 | |
51 | + /** |
|
52 | + * @param \Helmut\Forms\Field $class |
|
53 | + * @param string $method |
|
54 | + */ |
|
48 | 55 | public static function getParameters($class, $method) |
49 | 56 | { |
50 | 57 | $params = []; |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace Helmut\Forms\Utility; |
4 | 4 | |
5 | 5 | use ReflectionClass; |
6 | -use ReflectionMethod; |
|
7 | 6 | use ReflectionException; |
7 | +use ReflectionMethod; |
|
8 | 8 | |
9 | 9 | class Reflect { |
10 | 10 |
@@ -53,7 +53,7 @@ |
||
53 | 53 | |
54 | 54 | $method = new ReflectionMethod($class, $method); |
55 | 55 | |
56 | - foreach($method->getParameters() as $param) { |
|
56 | + foreach ($method->getParameters() as $param) { |
|
57 | 57 | $params[] = $param->getName(); |
58 | 58 | } |
59 | 59 |
@@ -4,73 +4,73 @@ |
||
4 | 4 | |
5 | 5 | class Validate { |
6 | 6 | |
7 | - public static function required($var) |
|
8 | - { |
|
9 | - if (is_null($var)) return false; |
|
7 | + public static function required($var) |
|
8 | + { |
|
9 | + if (is_null($var)) return false; |
|
10 | 10 | else if (is_string($var) && trim($var) === '') return false; |
11 | 11 | return true; |
12 | - } |
|
12 | + } |
|
13 | 13 | |
14 | - public static function stringMin($var, $min) |
|
15 | - { |
|
16 | - return strlen($var) >= $min; |
|
17 | - } |
|
14 | + public static function stringMin($var, $min) |
|
15 | + { |
|
16 | + return strlen($var) >= $min; |
|
17 | + } |
|
18 | 18 | |
19 | - public static function stringMax($var, $max) |
|
20 | - { |
|
21 | - return strlen($var) <= $max; |
|
22 | - } |
|
19 | + public static function stringMax($var, $max) |
|
20 | + { |
|
21 | + return strlen($var) <= $max; |
|
22 | + } |
|
23 | 23 | |
24 | - public static function alpha($var) |
|
25 | - { |
|
26 | - return is_string($var) && preg_match('/^[\pL\pM]+$/u', $var); |
|
27 | - } |
|
24 | + public static function alpha($var) |
|
25 | + { |
|
26 | + return is_string($var) && preg_match('/^[\pL\pM]+$/u', $var); |
|
27 | + } |
|
28 | 28 | |
29 | - public static function alphaNum($var) |
|
30 | - { |
|
31 | - if (! is_string($var) && ! is_numeric($var)) return false; |
|
29 | + public static function alphaNum($var) |
|
30 | + { |
|
31 | + if (! is_string($var) && ! is_numeric($var)) return false; |
|
32 | 32 | return preg_match('/^[\pL\pM\pN]+$/u', $var); |
33 | 33 | } |
34 | 34 | |
35 | - public static function alphaDash($var) |
|
36 | - { |
|
37 | - if (! is_string($var) && ! is_numeric($var)) return false; |
|
35 | + public static function alphaDash($var) |
|
36 | + { |
|
37 | + if (! is_string($var) && ! is_numeric($var)) return false; |
|
38 | 38 | return preg_match('/^[\pL\pM\pN_-]+$/u', $var); |
39 | - } |
|
39 | + } |
|
40 | 40 | |
41 | - public static function in($var, $array) |
|
42 | - { |
|
43 | - return in_array($var, $array); |
|
44 | - } |
|
41 | + public static function in($var, $array) |
|
42 | + { |
|
43 | + return in_array($var, $array); |
|
44 | + } |
|
45 | 45 | |
46 | - public static function notIn($var, $array) |
|
47 | - { |
|
48 | - return ! in_array($var, $array); |
|
49 | - } |
|
46 | + public static function notIn($var, $array) |
|
47 | + { |
|
48 | + return ! in_array($var, $array); |
|
49 | + } |
|
50 | 50 | |
51 | - public static function email($var) |
|
52 | - { |
|
53 | - return filter_var($var, FILTER_VALIDATE_EMAIL) !== false; |
|
54 | - } |
|
51 | + public static function email($var) |
|
52 | + { |
|
53 | + return filter_var($var, FILTER_VALIDATE_EMAIL) !== false; |
|
54 | + } |
|
55 | 55 | |
56 | - public static function numeric($var) |
|
57 | - { |
|
58 | - return is_numeric($var); |
|
59 | - } |
|
56 | + public static function numeric($var) |
|
57 | + { |
|
58 | + return is_numeric($var); |
|
59 | + } |
|
60 | 60 | |
61 | - public static function numericMin($var, $min) |
|
62 | - { |
|
63 | - return $var >= $min; |
|
64 | - } |
|
61 | + public static function numericMin($var, $min) |
|
62 | + { |
|
63 | + return $var >= $min; |
|
64 | + } |
|
65 | 65 | |
66 | - public static function numericMax($var, $max) |
|
67 | - { |
|
68 | - return $var <= $max; |
|
69 | - } |
|
66 | + public static function numericMax($var, $max) |
|
67 | + { |
|
68 | + return $var <= $max; |
|
69 | + } |
|
70 | 70 | |
71 | - public static function integer($var) |
|
72 | - { |
|
73 | - return filter_var($var, FILTER_VALIDATE_INT) !== false; |
|
74 | - } |
|
71 | + public static function integer($var) |
|
72 | + { |
|
73 | + return filter_var($var, FILTER_VALIDATE_INT) !== false; |
|
74 | + } |
|
75 | 75 | |
76 | 76 | } |
@@ -28,13 +28,13 @@ |
||
28 | 28 | |
29 | 29 | public function alphaNum($var) |
30 | 30 | { |
31 | - if (! is_string($var) && ! is_numeric($var)) return false; |
|
31 | + if ( ! is_string($var) && ! is_numeric($var)) return false; |
|
32 | 32 | return preg_match('/^[\pL\pM\pN]+$/u', $var); |
33 | 33 | } |
34 | 34 | |
35 | 35 | public function alphaDash($var) |
36 | 36 | { |
37 | - if (! is_string($var) && ! is_numeric($var)) return false; |
|
37 | + if ( ! is_string($var) && ! is_numeric($var)) return false; |
|
38 | 38 | return preg_match('/^[\pL\pM\pN_-]+$/u', $var); |
39 | 39 | } |
40 | 40 |
@@ -6,8 +6,11 @@ discard block |
||
6 | 6 | |
7 | 7 | public 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 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 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 |