@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | */ |
73 | 73 | protected function init() |
74 | 74 | { |
75 | - if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE)) { |
|
75 | + if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) { |
|
76 | 76 | $this->loadConfigData(); |
77 | 77 | } |
78 | 78 | return $this; |
@@ -170,10 +170,10 @@ discard block |
||
170 | 170 | $final_data = self::saveExtraParams($data); |
171 | 171 | $saved = false; |
172 | 172 | try { |
173 | - Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE, $final_data, Cache::JSON, true); |
|
173 | + Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, $final_data, Cache::JSON, true); |
|
174 | 174 | Config::getInstance()->loadConfigData(); |
175 | 175 | $saved = true; |
176 | - } catch (ConfigException $e) { |
|
176 | + }catch (ConfigException $e) { |
|
177 | 177 | Logger::log($e->getMessage(), LOG_ERR); |
178 | 178 | } |
179 | 179 | return $saved; |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | */ |
206 | 206 | public function loadConfigData() |
207 | 207 | { |
208 | - $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE, |
|
208 | + $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, |
|
209 | 209 | Cache::JSON, |
210 | 210 | TRUE) ?: []; |
211 | 211 | $this->debug = (array_key_exists('debug', $this->config)) ? (bool)$this->config['debug'] : FALSE; |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | /** |
182 | 182 | * Method that returns a config value |
183 | 183 | * @param string $param |
184 | - * @param mixed $defaultValue |
|
184 | + * @param boolean $defaultValue |
|
185 | 185 | * |
186 | 186 | * @return mixed|null |
187 | 187 | */ |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | /** |
222 | 222 | * Static wrapper for extracting params |
223 | 223 | * @param string $key |
224 | - * @param mixed|null $defaultValue |
|
224 | + * @param string|boolean $defaultValue |
|
225 | 225 | * @return mixed|null |
226 | 226 | */ |
227 | 227 | public static function getParam($key, $defaultValue = null) |
@@ -19,10 +19,10 @@ discard block |
||
19 | 19 | $objects = scandir($dir); |
20 | 20 | foreach ($objects as $object) { |
21 | 21 | if ($object != "." && $object != "..") { |
22 | - if (filetype($dir . "/" . $object) == "dir") { |
|
23 | - self::deleteDir($dir . "/" . $object); |
|
24 | - } else { |
|
25 | - unlink($dir . "/" . $object); |
|
22 | + if (filetype($dir."/".$object) == "dir") { |
|
23 | + self::deleteDir($dir."/".$object); |
|
24 | + }else { |
|
25 | + unlink($dir."/".$object); |
|
26 | 26 | } |
27 | 27 | } |
28 | 28 | } |
@@ -38,10 +38,10 @@ discard block |
||
38 | 38 | { |
39 | 39 | $rootDirs = array("css", "js", "media", "font"); |
40 | 40 | foreach ($rootDirs as $dir) { |
41 | - if (file_exists(WEB_DIR . DIRECTORY_SEPARATOR . $dir)) { |
|
41 | + if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) { |
|
42 | 42 | try { |
43 | - self::deleteDir(WEB_DIR . DIRECTORY_SEPARATOR . $dir); |
|
44 | - } catch (\Exception $e) { |
|
43 | + self::deleteDir(WEB_DIR.DIRECTORY_SEPARATOR.$dir); |
|
44 | + }catch (\Exception $e) { |
|
45 | 45 | Logger::log($e->getMessage()); |
46 | 46 | } |
47 | 47 | } |
@@ -57,12 +57,12 @@ discard block |
||
57 | 57 | { |
58 | 58 | try { |
59 | 59 | if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) { |
60 | - throw new \Exception(_('Can\'t create directory ') . $dir); |
|
60 | + throw new \Exception(_('Can\'t create directory ').$dir); |
|
61 | 61 | } |
62 | - } catch (\Exception $e) { |
|
62 | + }catch (\Exception $e) { |
|
63 | 63 | Logger::log($e->getMessage(), LOG_WARNING); |
64 | 64 | if (!file_exists(dirname($dir))) { |
65 | - throw new GeneratorException($e->getMessage() . $dir); |
|
65 | + throw new GeneratorException($e->getMessage().$dir); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public static function getTemplatePath() |
75 | 75 | { |
76 | - $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR; |
|
76 | + $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR; |
|
77 | 77 | return realpath($path); |
78 | 78 | } |
79 | 79 | } |
80 | 80 | \ No newline at end of file |
@@ -144,7 +144,7 @@ |
||
144 | 144 | * @param string $path |
145 | 145 | * @param $domains |
146 | 146 | * |
147 | - * @return mixed |
|
147 | + * @return string |
|
148 | 148 | */ |
149 | 149 | private static function extractPathname($path, $domains) |
150 | 150 | { |
@@ -39,12 +39,12 @@ discard block |
||
39 | 39 | |
40 | 40 | $file_path = ""; |
41 | 41 | if (!file_exists($file_path)) { |
42 | - $file_path = BASE_DIR . $string; |
|
42 | + $file_path = BASE_DIR.$string; |
|
43 | 43 | } |
44 | 44 | $filename_path = AssetsParser::findDomainPath($string, $file_path); |
45 | 45 | |
46 | 46 | $file_path = self::processAsset($string, $name, $return, $filename_path); |
47 | - $return_path = (empty($name)) ? Request::getInstance()->getRootUrl() . '/' . $file_path : $name; |
|
47 | + $return_path = (empty($name)) ? Request::getInstance()->getRootUrl().'/'.$file_path : $name; |
|
48 | 48 | return ($return) ? $return_path : ''; |
49 | 49 | } |
50 | 50 | |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $router = Router::getInstance(); |
62 | 62 | try { |
63 | 63 | return $router->getRoute($path, $absolute, $params); |
64 | - } catch (\Exception $e) { |
|
64 | + }catch (\Exception $e) { |
|
65 | 65 | return $router->getRoute('', $absolute, $params); |
66 | 66 | } |
67 | 67 | } |
@@ -187,8 +187,8 @@ discard block |
||
187 | 187 | private static function putResourceContent($name, $filename_path, $base, $file_path) |
188 | 188 | { |
189 | 189 | $data = file_get_contents($filename_path); |
190 | - if (!empty($name)) file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data); |
|
191 | - else file_put_contents($base . $file_path, $data); |
|
190 | + if (!empty($name)) file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data); |
|
191 | + else file_put_contents($base.$file_path, $data); |
|
192 | 192 | } |
193 | 193 | |
194 | 194 | /** |
@@ -206,9 +206,9 @@ discard block |
||
206 | 206 | if (file_exists($filename_path)) { |
207 | 207 | list($base, $html_base, $file_path) = AssetsParser::calculateAssetPath($string, $name, $return, $filename_path); |
208 | 208 | //Creamos el directorio si no existe |
209 | - GeneratorHelper::createDir($base . $html_base); |
|
209 | + GeneratorHelper::createDir($base.$html_base); |
|
210 | 210 | //Si se ha modificado |
211 | - if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($filename_path)) { |
|
211 | + if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($filename_path)) { |
|
212 | 212 | if ($html_base == 'css') { |
213 | 213 | self::processCssLines($filename_path); |
214 | 214 | } |
@@ -187,8 +187,11 @@ |
||
187 | 187 | private static function putResourceContent($name, $filename_path, $base, $file_path) |
188 | 188 | { |
189 | 189 | $data = file_get_contents($filename_path); |
190 | - if (!empty($name)) file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data); |
|
191 | - else file_put_contents($base . $file_path, $data); |
|
190 | + if (!empty($name)) { |
|
191 | + file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data); |
|
192 | + } else { |
|
193 | + file_put_contents($base . $file_path, $data); |
|
194 | + } |
|
192 | 195 | } |
193 | 196 | |
194 | 197 | /** |
@@ -8,7 +8,6 @@ |
||
8 | 8 | use PSFS\base\extension\TemplateFunctions; |
9 | 9 | use PSFS\base\types\helpers\GeneratorHelper; |
10 | 10 | use PSFS\base\types\helpers\ResponseHelper; |
11 | -use PSFS\base\types\helpers\TemplateHelper; |
|
12 | 11 | use PSFS\base\types\SingletonTrait; |
13 | 12 | |
14 | 13 |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | ResponseHelper::setStatusHeader($this->status_code); |
130 | 130 | ResponseHelper::setAuthHeaders($this->public_zone); |
131 | 131 | ResponseHelper::setCookieHeaders($cookies); |
132 | - header('Content-type: ' . $contentType); |
|
132 | + header('Content-type: '.$contentType); |
|
133 | 133 | |
134 | 134 | } |
135 | 135 | |
@@ -145,15 +145,15 @@ discard block |
||
145 | 145 | Logger::log('Start output response'); |
146 | 146 | ob_start(); |
147 | 147 | $this->setReponseHeaders($contentType, $cookies); |
148 | - header('Content-length: ' . strlen($output)); |
|
148 | + header('Content-length: '.strlen($output)); |
|
149 | 149 | |
150 | 150 | $cache = Cache::needCache(); |
151 | 151 | if (false !== $cache && $this->status_code === Template::STATUS_OK && $this->debug === false) { |
152 | 152 | Logger::log('Saving output response into cache'); |
153 | 153 | $cacheName = $this->cache->getRequestCacheHash(); |
154 | - $tmpDir = substr($cacheName, 0, 2) . DIRECTORY_SEPARATOR . substr($cacheName, 2, 2) . DIRECTORY_SEPARATOR; |
|
155 | - $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $tmpDir . $cacheName, $output); |
|
156 | - $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $tmpDir . $cacheName . ".headers", headers_list(), Cache::JSON); |
|
154 | + $tmpDir = substr($cacheName, 0, 2).DIRECTORY_SEPARATOR.substr($cacheName, 2, 2).DIRECTORY_SEPARATOR; |
|
155 | + $this->cache->storeData("json".DIRECTORY_SEPARATOR.$tmpDir.$cacheName, $output); |
|
156 | + $this->cache->storeData("json".DIRECTORY_SEPARATOR.$tmpDir.$cacheName.".headers", headers_list(), Cache::JSON); |
|
157 | 157 | } |
158 | 158 | echo $output; |
159 | 159 | |
@@ -170,11 +170,11 @@ discard block |
||
170 | 170 | { |
171 | 171 | Logger::log('Close template render'); |
172 | 172 | Security::getInstance()->setSessionKey("lastRequest", array( |
173 | - "url" => Request::getInstance()->getRootUrl() . Request::requestUri(), |
|
173 | + "url" => Request::getInstance()->getRootUrl().Request::requestUri(), |
|
174 | 174 | "ts" => microtime(true), |
175 | 175 | )); |
176 | 176 | Security::getInstance()->updateSession(); |
177 | - Logger::log('End request: ' . Request::requestUri(), LOG_INFO); |
|
177 | + Logger::log('End request: '.Request::requestUri(), LOG_INFO); |
|
178 | 178 | exit; |
179 | 179 | } |
180 | 180 | |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | $dump = ''; |
225 | 225 | try { |
226 | 226 | $dump = $this->tpl->render($tpl, $vars); |
227 | - } catch (\Exception $e) { |
|
227 | + }catch (\Exception $e) { |
|
228 | 228 | Logger::log($e->getMessage(), LOG_ERR); |
229 | 229 | } |
230 | 230 | return $dump; |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | public function regenerateTemplates() |
339 | 339 | { |
340 | 340 | $this->generateTemplatesCache(); |
341 | - $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, true); |
|
341 | + $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, true); |
|
342 | 342 | $translations = []; |
343 | 343 | if (is_array($domains)) { |
344 | 344 | $translations = $this->parsePathTranslations($domains); |
@@ -360,8 +360,8 @@ discard block |
||
360 | 360 | // force compilation |
361 | 361 | if ($file->isFile()) { |
362 | 362 | try { |
363 | - $this->tpl->load(str_replace($tplDir . '/', '', $file)); |
|
364 | - } catch (\Exception $e) { |
|
363 | + $this->tpl->load(str_replace($tplDir.'/', '', $file)); |
|
364 | + }catch (\Exception $e) { |
|
365 | 365 | Logger::log($e->getMessage(), LOG_ERR, ['file' => $e->getFile(), 'line' => $e->getLine()]); |
366 | 366 | } |
367 | 367 | } |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | */ |
436 | 436 | private function loadDomains() |
437 | 437 | { |
438 | - $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true); |
|
438 | + $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true); |
|
439 | 439 | if (null !== $domains) { |
440 | 440 | foreach ($domains as $domain => $paths) { |
441 | 441 | $this->addPath($paths['template'], preg_replace('/(@|\/)/', '', $domain)); |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | $this->cache = Cache::getInstance(); |
453 | 453 | $loader = new \Twig_Loader_Filesystem(GeneratorHelper::getTemplatePath()); |
454 | 454 | $this->tpl = new \Twig_Environment($loader, array( |
455 | - 'cache' => CACHE_DIR . DIRECTORY_SEPARATOR . 'twig', |
|
455 | + 'cache' => CACHE_DIR.DIRECTORY_SEPARATOR.'twig', |
|
456 | 456 | 'debug' => (bool)$this->debug, |
457 | 457 | 'auto_reload' => Config::getParam('twig.auto_reload', TRUE), |
458 | 458 | )); |
@@ -48,6 +48,9 @@ discard block |
||
48 | 48 | return $this; |
49 | 49 | } |
50 | 50 | |
51 | + /** |
|
52 | + * @param string|null $action |
|
53 | + */ |
|
51 | 54 | public function setAction($action) |
52 | 55 | { |
53 | 56 | $this->action = $action; |
@@ -562,7 +565,7 @@ discard block |
||
562 | 565 | } |
563 | 566 | |
564 | 567 | /** |
565 | - * @param $token_field |
|
568 | + * @param string $token_field |
|
566 | 569 | * @return bool |
567 | 570 | */ |
568 | 571 | protected function existsFormToken($token_field) |
@@ -594,7 +597,7 @@ discard block |
||
594 | 597 | /** |
595 | 598 | * Método que extrae el valor de un campo del formulario del modelo |
596 | 599 | * @param $field |
597 | - * @param $value |
|
600 | + * @param ObjectCollection $value |
|
598 | 601 | * @param $type |
599 | 602 | * @return mixed |
600 | 603 | */ |
@@ -69,8 +69,8 @@ discard block |
||
69 | 69 | public function add($name, array $value = array()) |
70 | 70 | { |
71 | 71 | $this->fields[$name] = $value; |
72 | - $this->fields[$name]['name'] = $this->getName() . "[{$name}]"; |
|
73 | - $this->fields[$name]['id'] = $this->getName() . '_' . $name; |
|
72 | + $this->fields[$name]['name'] = $this->getName()."[{$name}]"; |
|
73 | + $this->fields[$name]['id'] = $this->getName().'_'.$name; |
|
74 | 74 | $this->fields[$name]['placeholder'] = (array_key_exists('placeholder', $value)) ? $value['placeholder'] : $name; |
75 | 75 | $this->fields[$name]['hasLabel'] = (array_key_exists('hasLabel', $value)) ? $value['hasLabel'] : true; |
76 | 76 | return $this; |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | if ('' !== $hash_orig) { |
135 | 135 | $this->crfs = sha1($hash_orig); |
136 | - $this->add($this->getName() . '_token', array( |
|
136 | + $this->add($this->getName().'_token', array( |
|
137 | 137 | "type" => "hidden", |
138 | 138 | "value" => $this->crfs, |
139 | 139 | )); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | public function isValid() |
203 | 203 | { |
204 | 204 | $valid = true; |
205 | - $token_field = $this->getName() . '_token'; |
|
205 | + $token_field = $this->getName().'_token'; |
|
206 | 206 | //Controlamos CSRF token |
207 | 207 | if (!$this->existsFormToken($token_field)) { |
208 | 208 | $this->errors[$token_field] = _('Formulario no válido'); |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | $data = array(); |
275 | 275 | if (count($this->fields) > 0) { |
276 | 276 | foreach ($this->fields as $key => $field) { |
277 | - if (self::SEPARATOR !== $key && $key !== ($this->getName() . "_token")) { |
|
277 | + if (self::SEPARATOR !== $key && $key !== ($this->getName()."_token")) { |
|
278 | 278 | $data[$key] = (array_key_exists('value', $field)) ? $field["value"] : null; |
279 | 279 | } |
280 | 280 | } |
@@ -389,8 +389,8 @@ discard block |
||
389 | 389 | $model = $this->getHydratedModel(); |
390 | 390 | $model->save(); |
391 | 391 | $save = true; |
392 | - Logger::getInstance()->infoLog(get_class($this->model) . " guardado con id " . $this->model->getPrimaryKey()); |
|
393 | - } catch (\Exception $e) { |
|
392 | + Logger::getInstance()->infoLog(get_class($this->model)." guardado con id ".$this->model->getPrimaryKey()); |
|
393 | + }catch (\Exception $e) { |
|
394 | 394 | Logger::getInstance()->errorLog($e->getMessage()); |
395 | 395 | throw new FormException($e->getMessage(), $e->getCode(), $e); |
396 | 396 | } |
@@ -409,10 +409,10 @@ discard block |
||
409 | 409 | if (null === $value) { |
410 | 410 | $isEmpty = true; |
411 | 411 | // Empty Array check |
412 | - } else if (is_array($value) && 0 === count($value)) { |
|
412 | + }else if (is_array($value) && 0 === count($value)) { |
|
413 | 413 | $isEmpty = true; |
414 | 414 | // Empty string check |
415 | - } else if (0 === strlen(preg_replace('/(\ |\r|\n)/m', '', $value))) { |
|
415 | + }else if (0 === strlen(preg_replace('/(\ |\r|\n)/m', '', $value))) { |
|
416 | 416 | $isEmpty = true; |
417 | 417 | } |
418 | 418 | |
@@ -439,7 +439,7 @@ discard block |
||
439 | 439 | && array_key_exists($key, $field) |
440 | 440 | && !array_key_exists('error', $field[$key]) |
441 | 441 | && !empty($field["value"]) |
442 | - && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0 |
|
442 | + && preg_match('/'.$field['pattern'].'/', $field['value']) === 0 |
|
443 | 443 | ) { |
444 | 444 | $this->setError($key, str_replace('%s', "<strong>{$key}</strong>", _("El campo %s no tiene un formato válido"))); |
445 | 445 | $field["error"] = $this->getError($key); |
@@ -461,10 +461,10 @@ discard block |
||
461 | 461 | if (array_key_exists($key, $data[$form_name])) { |
462 | 462 | if (preg_match("/id/i", $key) && ($data[$form_name][$key] === 0 || $data[$form_name][$key] === "%" || $data[$form_name][$key] === "")) { |
463 | 463 | $field["value"] = null; |
464 | - } else { |
|
464 | + }else { |
|
465 | 465 | $field["value"] = $data[$form_name][$key]; |
466 | 466 | } |
467 | - } else { |
|
467 | + }else { |
|
468 | 468 | unset($field["value"]); |
469 | 469 | } |
470 | 470 | return array($data, $field); |
@@ -478,8 +478,8 @@ discard block |
||
478 | 478 | */ |
479 | 479 | private function hydrateModelField($key, $value) |
480 | 480 | { |
481 | - $setter = "set" . ucfirst($key); |
|
482 | - $getter = "get" . ucfirst($key); |
|
481 | + $setter = "set".ucfirst($key); |
|
482 | + $getter = "get".ucfirst($key); |
|
483 | 483 | if (method_exists($this->model, $setter)) { |
484 | 484 | if (method_exists($this->model, $getter)) { |
485 | 485 | $tmp = $this->model->$getter(); |
@@ -504,16 +504,16 @@ discard block |
||
504 | 504 | { |
505 | 505 | //Extraemos el dato del modelo relacionado si existe el getter |
506 | 506 | $method = null; |
507 | - if (array_key_exists('class_data', $field) && method_exists($val, "get" . $field["class_data"])) { |
|
508 | - $class_method = "get" . $field["class_data"]; |
|
507 | + if (array_key_exists('class_data', $field) && method_exists($val, "get".$field["class_data"])) { |
|
508 | + $class_method = "get".$field["class_data"]; |
|
509 | 509 | $class = $val->$class_method(); |
510 | - if (array_key_exists('class_id', $field) && method_exists($class, "get" . $field["class_id"])) { |
|
511 | - $method = "get" . $field["class_id"]; |
|
510 | + if (array_key_exists('class_id', $field) && method_exists($class, "get".$field["class_id"])) { |
|
511 | + $method = "get".$field["class_id"]; |
|
512 | 512 | $data[] = $class->$method(); |
513 | - } else { |
|
513 | + }else { |
|
514 | 514 | $data[] = $class->getPrimaryKey(); |
515 | 515 | } |
516 | - } else { |
|
516 | + }else { |
|
517 | 517 | $data[] = $val; |
518 | 518 | } |
519 | 519 | |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | private function extractModelFieldValue($key, $field) |
530 | 530 | { |
531 | 531 | //Extraemos el valor del campo del modelo |
532 | - $method = "get" . ucfirst($key); |
|
532 | + $method = "get".ucfirst($key); |
|
533 | 533 | $type = (array_key_exists('type', $field)) ? $field["type"] : "text"; |
534 | 534 | //Extraemos los campos del modelo |
535 | 535 | if (method_exists($this->model, $method)) { |
@@ -539,16 +539,16 @@ discard block |
||
539 | 539 | //Si es una relación múltiple |
540 | 540 | if ($value instanceof ObjectCollection) { |
541 | 541 | $field = $this->computeModelFieldValue($field, $value, $type); |
542 | - } else { //O una relación unitaria |
|
542 | + }else { //O una relación unitaria |
|
543 | 543 | if (method_exists($value, "__toString")) { |
544 | 544 | $field["value"] = $value; |
545 | 545 | } elseif ($value instanceof \DateTime) { |
546 | 546 | $field["value"] = $value->format("Y-m-d H:i:s"); |
547 | - } else { |
|
547 | + }else { |
|
548 | 548 | $field["value"] = $value->getPrimaryKey(); |
549 | 549 | } |
550 | 550 | } |
551 | - } else { |
|
551 | + }else { |
|
552 | 552 | $field["value"] = $value; |
553 | 553 | } |
554 | 554 | } |
@@ -212,7 +212,9 @@ |
||
212 | 212 | //Validamos los campos del formulario |
213 | 213 | if ($valid && count($this->fields) > 0) { |
214 | 214 | foreach ($this->fields as $key => &$field) { |
215 | - if ($key === $token_field || $key === self::SEPARATOR) continue; |
|
215 | + if ($key === $token_field || $key === self::SEPARATOR) { |
|
216 | + continue; |
|
217 | + } |
|
216 | 218 | list($field, $valid) = $this->checkFieldValidation($field, $key); |
217 | 219 | } |
218 | 220 | } |
@@ -199,7 +199,7 @@ |
||
199 | 199 | |
200 | 200 | /** |
201 | 201 | * @param ColumnMap $column |
202 | - * @param ModelCriteria $quwuery |
|
202 | + * @param ModelCriteria $query |
|
203 | 203 | * @param mixed $value |
204 | 204 | */ |
205 | 205 | private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null) |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | } elseif ($mappedColumn->isText()) { |
41 | 41 | if ($mappedColumn->getSize() > 100) { |
42 | 42 | $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required); |
43 | - } else { |
|
43 | + }else { |
|
44 | 44 | $fDto = self::generateStringField($field, $required); |
45 | 45 | } |
46 | 46 | } elseif ($mappedColumn->getType() === PropelTypes::BOOLEAN) { |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $fDto->entity = $relatedModel; |
84 | 84 | $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName()); |
85 | 85 | $fDto->relatedField = $relatedField->getPhpName(); |
86 | - $fDto->url = Router::getInstance()->getRoute('api-' . $relatedModel); |
|
86 | + $fDto->url = Router::getInstance()->getRoute('api-'.$relatedModel); |
|
87 | 87 | return $fDto; |
88 | 88 | } |
89 | 89 | |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | { |
191 | 191 | try { |
192 | 192 | $column = $tableMap->getColumnByPhpName($field); |
193 | - } catch (\Exception $e) { |
|
193 | + }catch (\Exception $e) { |
|
194 | 194 | Logger::log($e->getMessage(), LOG_ERR); |
195 | 195 | $column = null; |
196 | 196 | } |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | * @param ModelCriteria $quwuery |
203 | 203 | * @param mixed $value |
204 | 204 | */ |
205 | - private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null) |
|
205 | + private static function addQueryFilter(ColumnMap $column, ModelCriteria & $query, $value = null) |
|
206 | 206 | { |
207 | 207 | $tableField = $column->getPhpName(); |
208 | 208 | if (preg_match('/^<=/', $value)) { |
@@ -216,8 +216,8 @@ discard block |
||
216 | 216 | } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) { |
217 | 217 | $text = preg_replace('/(\'|\")/', '', $value); |
218 | 218 | $text = preg_replace('/\ /', '%', $text); |
219 | - $query->filterBy($tableField, '%' . $text . '%', Criteria::LIKE); |
|
220 | - } else { |
|
219 | + $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE); |
|
220 | + }else { |
|
221 | 221 | $query->filterBy($tableField, $value, Criteria::EQUAL); |
222 | 222 | } |
223 | 223 | } |
@@ -228,24 +228,24 @@ discard block |
||
228 | 228 | * @param array $extraColumns |
229 | 229 | * @param mixed $value |
230 | 230 | */ |
231 | - public static function composerComboField(TableMap $tableMap, ModelCriteria &$query, array $extraColumns = [], $value = null) |
|
231 | + public static function composerComboField(TableMap $tableMap, ModelCriteria & $query, array $extraColumns = [], $value = null) |
|
232 | 232 | { |
233 | 233 | $exp = 'CONCAT('; |
234 | 234 | $sep = ''; |
235 | 235 | foreach ($tableMap->getColumns() as $column) { |
236 | 236 | if ($column->isText()) { |
237 | - $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
237 | + $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")'; |
|
238 | 238 | $sep = ', " ", '; |
239 | 239 | } |
240 | 240 | } |
241 | 241 | foreach ($extraColumns as $extra => $name) { |
242 | - $exp .= $sep . $extra; |
|
242 | + $exp .= $sep.$extra; |
|
243 | 243 | $sep = ', " ", '; |
244 | 244 | } |
245 | 245 | $exp .= ")"; |
246 | 246 | $text = preg_replace('/(\'|\")/', '', $value); |
247 | 247 | $text = preg_replace('/\ /', '%', $text); |
248 | - $query->where($exp . Criteria::LIKE . '"%' . $text . '%"'); |
|
248 | + $query->where($exp.Criteria::LIKE.'"%'.$text.'%"'); |
|
249 | 249 | } |
250 | 250 | |
251 | 251 | /** |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | * @param string $field |
256 | 256 | * @param mixed $value |
257 | 257 | */ |
258 | - public static function addModelField(TableMap $tableMap, ModelCriteria &$query, $field, $value = null) |
|
258 | + public static function addModelField(TableMap $tableMap, ModelCriteria & $query, $field, $value = null) |
|
259 | 259 | { |
260 | 260 | if ($column = self::checkFieldExists($tableMap, $field)) { |
261 | 261 | self::addQueryFilter($column, $query, $value); |
@@ -8,7 +8,13 @@ |
||
8 | 8 | */ |
9 | 9 | interface ControllerInterface |
10 | 10 | { |
11 | + /** |
|
12 | + * @return string|null |
|
13 | + */ |
|
11 | 14 | public function render($template, array $vars = [], $cookies = []); |
12 | 15 | |
16 | + /** |
|
17 | + * @return void |
|
18 | + */ |
|
13 | 19 | public function response($response, $type = 'text/html'); |
14 | 20 | } |
@@ -4,7 +4,6 @@ |
||
4 | 4 | use PSFS\base\config\Config; |
5 | 5 | use PSFS\base\Security; |
6 | 6 | use PSFS\base\Service; |
7 | -use PSFS\controller\Admin; |
|
8 | 7 | use Symfony\Component\Finder\Finder; |
9 | 8 | |
10 | 9 | class AdminServices extends Service |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | { |
35 | 35 | $platform = trim(Config::getInstance()->get("platform_name")); |
36 | 36 | header('HTTP/1.1 401 Unauthorized'); |
37 | - header('WWW-Authenticate: Basic Realm="' . $platform . '"'); |
|
37 | + header('WWW-Authenticate: Basic Realm="'.$platform.'"'); |
|
38 | 38 | echo _("Zona restringida"); |
39 | 39 | exit(); |
40 | 40 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $admin['class'] = 'primary'; |
76 | 76 | break; |
77 | 77 | } |
78 | - } else { |
|
78 | + }else { |
|
79 | 79 | $admin["class"] = "primary"; |
80 | 80 | } |
81 | 81 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | $logs = array(); |
93 | 93 | /** @var \SplFileInfo $file */ |
94 | 94 | foreach ($files as $file) { |
95 | - $size = $file->getSize() / 8 / 1024; |
|
95 | + $size = $file->getSize()/8/1024; |
|
96 | 96 | $time = date("c", $file->getMTime()); |
97 | 97 | $dateTime = new \DateTime($time); |
98 | 98 | if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array(); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | $time = date("c", $file->getMTime()); |
129 | 129 | $dateTime = new \DateTime($time); |
130 | 130 | $monthOpen = $dateTime->format("m"); |
131 | - $content = file($file->getPath() . DIRECTORY_SEPARATOR . $file->getFilename()); |
|
131 | + $content = file($file->getPath().DIRECTORY_SEPARATOR.$file->getFilename()); |
|
132 | 132 | krsort($content); |
133 | 133 | $detailLog = array(); |
134 | 134 | foreach ($content as &$line) { |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | break; |
182 | 182 | } |
183 | 183 | |
184 | - } catch (\Exception $e) { |
|
184 | + }catch (\Exception $e) { |
|
185 | 185 | $detail = array( |
186 | 186 | "type" => "danger", |
187 | 187 | ); |
@@ -61,11 +61,13 @@ discard block |
||
61 | 61 | */ |
62 | 62 | private function parseAdmins(&$admins) |
63 | 63 | { |
64 | - if (!empty($admins)) foreach ($admins as &$admin) { |
|
64 | + if (!empty($admins)) { |
|
65 | + foreach ($admins as &$admin) { |
|
65 | 66 | if (isset($admin["profile"])) { |
66 | 67 | switch ($admin["profile"]) { |
67 | 68 | case Security::MANAGER_ID_TOKEN: |
68 | 69 | $admin['class'] = 'warning'; |
70 | + } |
|
69 | 71 | break; |
70 | 72 | case Security::ADMIN_ID_TOKEN: |
71 | 73 | $admin['class'] = 'info'; |
@@ -95,7 +97,9 @@ discard block |
||
95 | 97 | $size = $file->getSize() / 8 / 1024; |
96 | 98 | $time = date("c", $file->getMTime()); |
97 | 99 | $dateTime = new \DateTime($time); |
98 | - if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array(); |
|
100 | + if (!isset($logs[$dateTime->format("Y")])) { |
|
101 | + $logs[$dateTime->format("Y")] = array(); |
|
102 | + } |
|
99 | 103 | $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array( |
100 | 104 | "filename" => $file->getFilename(), |
101 | 105 | "size" => round($size, 3) |
@@ -136,7 +140,9 @@ discard block |
||
136 | 140 | $detailLog[] = array_merge(array( |
137 | 141 | "log" => $line, |
138 | 142 | ), $detail); |
139 | - if (count($detailLog) >= 1000) break; |
|
143 | + if (count($detailLog) >= 1000) { |
|
144 | + break; |
|
145 | + } |
|
140 | 146 | } |
141 | 147 | $log = $detailLog; |
142 | 148 | } |
@@ -160,7 +166,9 @@ discard block |
||
160 | 166 | |
161 | 167 | $detail = json_decode($match[0][0], TRUE); |
162 | 168 | } |
163 | - if (empty($detail)) $detail = array(); |
|
169 | + if (empty($detail)) { |
|
170 | + $detail = array(); |
|
171 | + } |
|
164 | 172 | preg_match_all('/\>\ (.*):/i', $line, $match); |
165 | 173 | |
166 | 174 | $type = (isset($match[1][0])) ? $match[1][0] : ''; |
@@ -360,7 +360,7 @@ |
||
360 | 360 | * Translator from php types to swagger types |
361 | 361 | * @param string $format |
362 | 362 | * |
363 | - * @return array |
|
363 | + * @return string[] |
|
364 | 364 | */ |
365 | 365 | public static function translateSwaggerFormats($format) |
366 | 366 | { |
@@ -39,10 +39,10 @@ discard block |
||
39 | 39 | if (!preg_match('/^ROOT/i', $module)) { |
40 | 40 | $modules[] = [ |
41 | 41 | 'name' => $module, |
42 | - 'path' => realpath($info['template'] . DIRECTORY_SEPARATOR . '..'), |
|
42 | + 'path' => realpath($info['template'].DIRECTORY_SEPARATOR.'..'), |
|
43 | 43 | ]; |
44 | 44 | } |
45 | - } catch (\Exception $e) { |
|
45 | + }catch (\Exception $e) { |
|
46 | 46 | $modules[] = $e->getMessage(); |
47 | 47 | } |
48 | 48 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | */ |
61 | 61 | public function extractApiEndpoints(array $module) |
62 | 62 | { |
63 | - $module_path = $module['path'] . DIRECTORY_SEPARATOR . 'Api'; |
|
63 | + $module_path = $module['path'].DIRECTORY_SEPARATOR.'Api'; |
|
64 | 64 | $module_name = $module['name']; |
65 | 65 | $endpoints = []; |
66 | 66 | if (file_exists($module_path)) { |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | if (count($finder)) { |
70 | 70 | /** @var \SplFileInfo $file */ |
71 | 71 | foreach ($finder as $file) { |
72 | - $namespace = "\\{$module_name}\\Api\\" . str_replace('.php', '', $file->getFilename()); |
|
72 | + $namespace = "\\{$module_name}\\Api\\".str_replace('.php', '', $file->getFilename()); |
|
73 | 73 | $info = $this->extractApiInfo($namespace, $module_name); |
74 | 74 | if (!empty($info)) { |
75 | 75 | $endpoints[$namespace] = $info; |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | if (NULL !== $mInfo) { |
99 | 99 | $info[] = $mInfo; |
100 | 100 | } |
101 | - } catch (\Exception $e) { |
|
101 | + }catch (\Exception $e) { |
|
102 | 102 | Logger::getInstance()->errorLog($e->getMessage()); |
103 | 103 | } |
104 | 104 | } |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) { |
310 | 310 | $payload = $this->extractDtoProperties($namespace); |
311 | 311 | } |
312 | - } catch (\Exception $e) { |
|
312 | + }catch (\Exception $e) { |
|
313 | 313 | Logger::getInstance()->errorLog($e->getMessage()); |
314 | 314 | } |
315 | 315 | |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | if (in_array($methodInfo['method'], ['POST', 'PUT'])) { |
347 | 347 | $methodInfo['payload'] = $this->extractPayload($modelNamespace, $docComments); |
348 | 348 | } |
349 | - } catch (\Exception $e) { |
|
349 | + }catch (\Exception $e) { |
|
350 | 350 | jpre($e->getMessage()); |
351 | 351 | Logger::getInstance()->errorLog($e->getMessage()); |
352 | 352 | } |
@@ -425,13 +425,13 @@ discard block |
||
425 | 425 | ]]); |
426 | 426 | if (array_key_exists($subDtoName, $subDto)) { |
427 | 427 | $definitions = $subDto; |
428 | - } else { |
|
428 | + }else { |
|
429 | 429 | $definitions[$subDtoName] = $subDto; |
430 | 430 | } |
431 | 431 | $dto['properties'][$field] = [ |
432 | - '$ref' => "#/definitions/" . $subDtoName, |
|
432 | + '$ref' => "#/definitions/".$subDtoName, |
|
433 | 433 | ]; |
434 | - } else { |
|
434 | + }else { |
|
435 | 435 | list($type, $format) = self::translateSwaggerFormats($format); |
436 | 436 | $dto['properties'][$field] = [ |
437 | 437 | "type" => $type, |
@@ -489,7 +489,7 @@ discard block |
||
489 | 489 | protected function extractDtoName($dto, $isArray = false) |
490 | 490 | { |
491 | 491 | $dto = explode('\\', $dto); |
492 | - $modelDto = array_pop($dto) . "Dto"; |
|
492 | + $modelDto = array_pop($dto)."Dto"; |
|
493 | 493 | if ($isArray) { |
494 | 494 | $modelDto .= "List"; |
495 | 495 | } |