@@ -42,6 +42,10 @@ discard block |
||
42 | 42 | * @return Form |
43 | 43 | */ |
44 | 44 | public function setEncType($enctype) { $this->enctype = $enctype; return $this; } |
45 | + |
|
46 | + /** |
|
47 | + * @param string|null $action |
|
48 | + */ |
|
45 | 49 | public function setAction($action) { $this->action = $action; return $this; } |
46 | 50 | public function setMethod($method) { $this->method = $method; return $this; } |
47 | 51 | public function setAttrs(array $attrs) { $this->attrs = $attrs; return $this; } |
@@ -466,7 +470,7 @@ discard block |
||
466 | 470 | } |
467 | 471 | |
468 | 472 | /** |
469 | - * @param $token_field |
|
473 | + * @param string $token_field |
|
470 | 474 | * @return bool |
471 | 475 | */ |
472 | 476 | protected function existsFormToken($token_field) { |
@@ -494,7 +498,7 @@ discard block |
||
494 | 498 | /** |
495 | 499 | * Método que extrae el valor de un campo del formulario del modelo |
496 | 500 | * @param $field |
497 | - * @param $value |
|
501 | + * @param ObjectCollection $value |
|
498 | 502 | * @param $type |
499 | 503 | * @return mixed |
500 | 504 | */ |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | use PSFS\base\Singleton; |
13 | 13 | use PSFS\base\types\interfaces\FormType; |
14 | 14 | |
15 | - abstract class Form extends Singleton implements FormType{ |
|
15 | + abstract class Form extends Singleton implements FormType { |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * Variables de formulario |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | |
32 | 32 | public function __construct($model = null) |
33 | 33 | { |
34 | - if(null !== $model) { |
|
34 | + if (null !== $model) { |
|
35 | 35 | $this->model = $model; |
36 | 36 | } |
37 | 37 | } |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | */ |
123 | 123 | public function getFieldValue($name) { |
124 | 124 | $value = null; |
125 | - if (null !== $this->getField($name)){ |
|
125 | + if (null !== $this->getField($name)) { |
|
126 | 126 | $field = $this->getField($name); |
127 | 127 | $value = (array_key_exists('value', $field) && null !== $field['value']) ? $field['value'] : null; |
128 | 128 | } |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | $model->save(); |
324 | 324 | $save = true; |
325 | 325 | Logger::getInstance()->infoLog(get_class($this->model)." guardado con id ".$this->model->getPrimaryKey()); |
326 | - } catch (\Exception $e) { |
|
326 | + }catch (\Exception $e) { |
|
327 | 327 | Logger::getInstance()->errorLog($e->getMessage()); |
328 | 328 | throw new FormException($e->getMessage(), $e->getCode(), $e); |
329 | 329 | } |
@@ -369,10 +369,10 @@ discard block |
||
369 | 369 | if (array_key_exists($key, $data[$form_name])) { |
370 | 370 | if (preg_match("/id/i", $key) && ($data[$form_name][$key] === 0 || $data[$form_name][$key] === "%" || $data[$form_name][$key] === "")) { |
371 | 371 | $field["value"] = null; |
372 | - } else { |
|
372 | + }else { |
|
373 | 373 | $field["value"] = $data[$form_name][$key]; |
374 | 374 | } |
375 | - } else { |
|
375 | + }else { |
|
376 | 376 | unset($field["value"]); |
377 | 377 | } |
378 | 378 | return array($data, $field); |
@@ -416,10 +416,10 @@ discard block |
||
416 | 416 | if (array_key_exists('class_id', $field) && method_exists($class, "get".$field["class_id"])) { |
417 | 417 | $method = "get".$field["class_id"]; |
418 | 418 | $data[] = $class->$method(); |
419 | - } else { |
|
419 | + }else { |
|
420 | 420 | $data[] = $class->getPrimaryKey(); |
421 | 421 | } |
422 | - } else { |
|
422 | + }else { |
|
423 | 423 | $data[] = $val; |
424 | 424 | } |
425 | 425 | |
@@ -449,11 +449,11 @@ discard block |
||
449 | 449 | $field["value"] = $value; |
450 | 450 | } elseif ($value instanceof \DateTime) { |
451 | 451 | $field["value"] = $value->format("Y-m-d H:i:s"); |
452 | - } else { |
|
452 | + }else { |
|
453 | 453 | $field["value"] = $value->getPrimaryKey(); |
454 | 454 | } |
455 | 455 | } |
456 | - } else { |
|
456 | + }else { |
|
457 | 457 | $field["value"] = $value; |
458 | 458 | } |
459 | 459 | } |
@@ -156,7 +156,9 @@ discard block |
||
156 | 156 | //Validamos los campos del formulario |
157 | 157 | if ($valid && count($this->fields) > 0) { |
158 | 158 | foreach ($this->fields as $key => &$field) { |
159 | - if ($key === $token_field || $key === self::SEPARATOR) continue; |
|
159 | + if ($key === $token_field || $key === self::SEPARATOR) { |
|
160 | + continue; |
|
161 | + } |
|
160 | 162 | list($field, $valid) = $this->checkFieldValidation($field, $key); |
161 | 163 | } |
162 | 164 | } |
@@ -442,7 +444,7 @@ discard block |
||
442 | 444 | //Si es una relación múltiple |
443 | 445 | if ($value instanceof ObjectCollection) { |
444 | 446 | $field = $this->computeModelFieldValue($field, $value, $type); |
445 | - }else { //O una relación unitaria |
|
447 | + } else { //O una relación unitaria |
|
446 | 448 | if (method_exists($value, "__toString")) { |
447 | 449 | $field["value"] = $value; |
448 | 450 | } elseif ($value instanceof \DateTime) { |
@@ -20,13 +20,13 @@ discard block |
||
20 | 20 | try { |
21 | 21 | $reflectionClass = new \ReflectionClass($this); |
22 | 22 | $properties = $reflectionClass->getProperties(); |
23 | - if(count($properties) > 0) { |
|
23 | + if (count($properties) > 0) { |
|
24 | 24 | /** @var \ReflectionProperty $property */ |
25 | - foreach($properties as $property) { |
|
25 | + foreach ($properties as $property) { |
|
26 | 26 | $dto[$property->getName()] = $property->getValue($this); |
27 | 27 | } |
28 | 28 | } |
29 | - } catch(\Exception $e) { |
|
29 | + }catch (\Exception $e) { |
|
30 | 30 | Logger::getInstance(get_class($this))->errorLog($e->getMessage()); |
31 | 31 | } |
32 | 32 | return $dto; |
@@ -47,9 +47,9 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function fromArray(array $object = array()) |
49 | 49 | { |
50 | - if(count($object) > 0) { |
|
51 | - foreach($object as $key => $value) { |
|
52 | - if(property_exists($this, $key)) { |
|
50 | + if (count($object) > 0) { |
|
51 | + foreach ($object as $key => $value) { |
|
52 | + if (property_exists($this, $key)) { |
|
53 | 53 | $this->$key = $value; |
54 | 54 | } |
55 | 55 | } |
@@ -31,8 +31,8 @@ discard block |
||
31 | 31 | { |
32 | 32 | $order = array(); |
33 | 33 | if (count($order) > 0) { |
34 | - foreach($this->fields as $field => $direction) { |
|
35 | - if(strtolower($fieldToRemove) === strtolower($field)) { |
|
34 | + foreach ($this->fields as $field => $direction) { |
|
35 | + if (strtolower($fieldToRemove) === strtolower($field)) { |
|
36 | 36 | continue; |
37 | 37 | } |
38 | 38 | $order[$field] = $direction; |
@@ -60,9 +60,9 @@ discard block |
||
60 | 60 | */ |
61 | 61 | public static function parseDirection($direction = Order::ASC) |
62 | 62 | { |
63 | - if(preg_match('/^asc$/i', $direction)) { |
|
63 | + if (preg_match('/^asc$/i', $direction)) { |
|
64 | 64 | return Order::ASC; |
65 | - } else { |
|
65 | + }else { |
|
66 | 66 | return Order::DESC; |
67 | 67 | } |
68 | 68 | } |
@@ -303,7 +303,7 @@ |
||
303 | 303 | $js = file_get_contents($file); |
304 | 304 | try { |
305 | 305 | $data .= ";\n".$js; |
306 | - }catch (\Exception $e) { |
|
306 | + } catch (\Exception $e) { |
|
307 | 307 | throw new ConfigException($e->getMessage()); |
308 | 308 | } |
309 | 309 | return $data; |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | } |
154 | 154 | try { |
155 | 155 | $minifiedJs = Minifier::minify($data); |
156 | - } catch(\Exception $e) { |
|
156 | + }catch (\Exception $e) { |
|
157 | 157 | Logger::log($e->getMessage(), LOG_ERR); |
158 | 158 | $minifiedJs = false; |
159 | 159 | } |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | foreach ($this->compiled_files as $file) { |
197 | 197 | echo "\t\t<script type='text/javascript' src='{$file}'></script>\n"; |
198 | 198 | } |
199 | - } else { |
|
199 | + }else { |
|
200 | 200 | echo "\t\t<script type='text/javascript' src='/js/".$this->hash.".js'></script>\n"; |
201 | 201 | } |
202 | 202 | } |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | foreach ($this->compiled_files as $file) { |
211 | 211 | echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>"; |
212 | 212 | } |
213 | - } else { |
|
213 | + }else { |
|
214 | 214 | echo "\t\t<link href='/css/".$this->hash.".css' rel='stylesheet' media='screen, print'>"; |
215 | 215 | } |
216 | 216 | } |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | Logger::log("$orig copiado a $dest", LOG_INFO); |
236 | 236 | } |
237 | 237 | } |
238 | - } catch (\Exception $e) { |
|
238 | + }catch (\Exception $e) { |
|
239 | 239 | Logger::log($e->getMessage(), LOG_ERR); |
240 | 240 | } |
241 | 241 | } |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | if ($this->debug) { |
264 | 264 | $data = file_get_contents($file); |
265 | 265 | $this->storeContents($base.$file_path, $data); |
266 | - } else { |
|
266 | + }else { |
|
267 | 267 | $data .= file_get_contents($file); |
268 | 268 | } |
269 | 269 | $this->compiled_files[] = "/css/".$file_path; |
@@ -135,7 +135,7 @@ |
||
135 | 135 | $tmp = array(); |
136 | 136 | if (NULL === $node) { |
137 | 137 | $node = $value; |
138 | - }else { |
|
138 | + } else { |
|
139 | 139 | $tmp = $this->getTmpAttribute($node); |
140 | 140 | } |
141 | 141 | $tmp[] = $value->getAttribute("value"); |
@@ -52,7 +52,7 @@ |
||
52 | 52 | $router = Router::getInstance(); |
53 | 53 | try { |
54 | 54 | return $router->getRoute($path, $absolute, $params); |
55 | - } catch (\Exception $e) |
|
55 | + }catch (\Exception $e) |
|
56 | 56 | { |
57 | 57 | return $router->getRoute('', $absolute, $params); |
58 | 58 | } |
@@ -136,7 +136,7 @@ |
||
136 | 136 | * @param string $path |
137 | 137 | * @param $domains |
138 | 138 | * |
139 | - * @return mixed |
|
139 | + * @return string |
|
140 | 140 | */ |
141 | 141 | private static function extractPathname($path, $domains) |
142 | 142 | { |
@@ -179,8 +179,11 @@ |
||
179 | 179 | private static function putResourceContent($name, $filename_path, $base, $file_path) |
180 | 180 | { |
181 | 181 | $data = file_get_contents($filename_path); |
182 | - if (!empty($name)) file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data); |
|
183 | - else file_put_contents($base.$file_path, $data); |
|
182 | + if (!empty($name)) { |
|
183 | + file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data); |
|
184 | + } else { |
|
185 | + file_put_contents($base.$file_path, $data); |
|
186 | + } |
|
184 | 187 | } |
185 | 188 | |
186 | 189 | /** |
@@ -22,7 +22,9 @@ |
||
22 | 22 | $class = get_called_class(); |
23 | 23 | if (!array_key_exists($class, self::$instance) || !self::$instance[$class] instanceof $class) { |
24 | 24 | self::$instance[$class] = new $class(func_get_args()); |
25 | - if (method_exists(self::$instance[$class], "init")) self::$instance[$class]->init(); |
|
25 | + if (method_exists(self::$instance[$class], "init")) { |
|
26 | + self::$instance[$class]->init(); |
|
27 | + } |
|
26 | 28 | } |
27 | 29 | return self::$instance[$class]; |
28 | 30 | } |
@@ -29,12 +29,16 @@ discard block |
||
29 | 29 | |
30 | 30 | public function infoLog($msg) |
31 | 31 | { |
32 | - if ($this->verbosity) $this->log->writeln($msg); |
|
32 | + if ($this->verbosity) { |
|
33 | + $this->log->writeln($msg); |
|
34 | + } |
|
33 | 35 | } |
34 | 36 | } |
35 | 37 | } |
36 | 38 | |
37 | - if (!isset($console)) $console = new Application(); |
|
39 | + if (!isset($console)) { |
|
40 | + $console = new Application(); |
|
41 | + } |
|
38 | 42 | $console |
39 | 43 | ->register('psfs:create:module') |
40 | 44 | ->setDefinition(array( |
@@ -58,7 +62,7 @@ discard block |
||
58 | 62 | { |
59 | 63 | \PSFS\services\GeneratorService::getInstance()->createStructureModule($module, $log); |
60 | 64 | } |
61 | - }catch (\Exception $e) |
|
65 | + } catch (\Exception $e) |
|
62 | 66 | { |
63 | 67 | $output->writeln($e->getMessage()); |
64 | 68 | $output->writeln($e->getTraceAsString()); |
@@ -31,14 +31,18 @@ |
||
31 | 31 | //Hidratamos con los comandos de PSFS |
32 | 32 | $commands = new Finder(); |
33 | 33 | $commands->in(__DIR__)->notName("PSFSConsole.php"); |
34 | - foreach ($commands as $com) include_once($com->getRealPath()); |
|
34 | + foreach ($commands as $com) { |
|
35 | + include_once($com->getRealPath()); |
|
36 | + } |
|
35 | 37 | |
36 | 38 | //Hidratamos con los comandos de los módulos |
37 | 39 | if (file_exists(CORE_DIR)) |
38 | 40 | { |
39 | 41 | $commands = new Finder(); |
40 | 42 | $commands->in(CORE_DIR)->path("Command")->name("*.php"); |
41 | - foreach ($commands as $com) include_once($com->getRealPath()); |
|
43 | + foreach ($commands as $com) { |
|
44 | + include_once($com->getRealPath()); |
|
45 | + } |
|
42 | 46 | } |
43 | 47 | |
44 | 48 | $console->run(); |