@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | $download = $this->getRequest()->get('download') ?: false; |
| 34 | 34 | |
| 35 | 35 | $module = $this->srv->getModules($domain); |
| 36 | - if(empty($module)) { |
|
| 36 | + if (empty($module)) { |
|
| 37 | 37 | return Router::getInstance()->httpNotFound(null, true); |
| 38 | 38 | } |
| 39 | 39 | switch (strtolower($type)) { |
@@ -53,10 +53,10 @@ discard block |
||
| 53 | 53 | ini_restore('max_execution_time'); |
| 54 | 54 | ini_restore('memory_limit'); |
| 55 | 55 | |
| 56 | - if($download && $type === ApiController::SWAGGER_DOC) { |
|
| 56 | + if ($download && $type === ApiController::SWAGGER_DOC) { |
|
| 57 | 57 | return $this->download(json_encode($doc), 'application/json', 'swagger.json'); |
| 58 | 58 | } |
| 59 | - if($type === ApiController::HTML_DOC) { |
|
| 59 | + if ($type === ApiController::HTML_DOC) { |
|
| 60 | 60 | return $this->render('documentation.html.twig', ["data" => json_encode($doc)]); |
| 61 | 61 | } |
| 62 | 62 | return $this->json($doc, 200); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | unset($_SERVER["PHP_AUTH_USER"]); |
| 41 | 41 | unset($_SERVER["PHP_AUTH_PW"]); |
| 42 | 42 | header_remove("Authorization"); |
| 43 | - } elseif(!self::isTest()) { |
|
| 43 | + } elseif (!self::isTest()) { |
|
| 44 | 44 | header('Authorization:'); |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -68,9 +68,9 @@ discard block |
||
| 68 | 68 | Logger::log('Adding debug headers to render response'); |
| 69 | 69 | $vars["__DEBUG__"]["includes"] = get_included_files(); |
| 70 | 70 | $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 71 | - header('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s'); |
|
| 72 | - header('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes'); |
|
| 73 | - header('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened'); |
|
| 71 | + header('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s'); |
|
| 72 | + header('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes'); |
|
| 73 | + header('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened'); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | return $vars; |
@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | |
| 18 | 18 | if (!defined('LOG_DIR')) { |
| 19 | - GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'logs'); |
|
| 20 | - define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs'); |
|
| 19 | + GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'logs'); |
|
| 20 | + define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs'); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | { |
| 55 | 55 | $args = func_get_args(); |
| 56 | 56 | list($logger, $debug, $path) = $this->setup($args); |
| 57 | - $this->stream = fopen($path . DIRECTORY_SEPARATOR . date('Ymd') . '.log', 'a+'); |
|
| 57 | + $this->stream = fopen($path.DIRECTORY_SEPARATOR.date('Ymd').'.log', 'a+'); |
|
| 58 | 58 | $this->addPushLogger($logger, $debug); |
| 59 | 59 | $this->logLevel = Config::getParam('log.level', 'NOTICE'); |
| 60 | 60 | } |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | private function createLoggerPath() |
| 137 | 137 | { |
| 138 | 138 | $logger = $this->setLoggerName(); |
| 139 | - $path = LOG_DIR . DIRECTORY_SEPARATOR . $logger . DIRECTORY_SEPARATOR . date('Y') . DIRECTORY_SEPARATOR . date('m'); |
|
| 139 | + $path = LOG_DIR.DIRECTORY_SEPARATOR.$logger.DIRECTORY_SEPARATOR.date('Y').DIRECTORY_SEPARATOR.date('m'); |
|
| 140 | 140 | GeneratorHelper::createDir($path); |
| 141 | 141 | |
| 142 | 142 | return $path; |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | * @return bool |
| 159 | 159 | */ |
| 160 | 160 | private function checkLogLevel($level = \Monolog\Logger::NOTICE) { |
| 161 | - switch($this->logLevel) { |
|
| 161 | + switch ($this->logLevel) { |
|
| 162 | 162 | case 'DEBUG': $logPass = Monolog::DEBUG; break; |
| 163 | 163 | case 'INFO': $logPass = Monolog::INFO; break; |
| 164 | 164 | default: |
@@ -178,10 +178,10 @@ discard block |
||
| 178 | 178 | */ |
| 179 | 179 | public static function log($msg, $type = LOG_DEBUG, array $context = null, $force = false) |
| 180 | 180 | { |
| 181 | - if(null === $context) { |
|
| 181 | + if (null === $context) { |
|
| 182 | 182 | $context = []; |
| 183 | 183 | } |
| 184 | - if(Config::getParam('profiling.enable') && 'DEBUG' === Config::getParam('log.level', 'NOTICE')) { |
|
| 184 | + if (Config::getParam('profiling.enable') && 'DEBUG' === Config::getParam('log.level', 'NOTICE')) { |
|
| 185 | 185 | Inspector::stats($msg); |
| 186 | 186 | } |
| 187 | 187 | switch ($type) { |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | self::getInstance()->addLog($msg, \Monolog\Logger::WARNING, $context, $force); |
| 193 | 193 | break; |
| 194 | 194 | case LOG_CRIT: |
| 195 | - if(Config::getParam('log.slack.hook')) { |
|
| 195 | + if (Config::getParam('log.slack.hook')) { |
|
| 196 | 196 | SlackHelper::getInstance()->trace($msg, '', '', $context, $force); |
| 197 | 197 | } |
| 198 | 198 | self::getInstance()->addLog($msg, \Monolog\Logger::CRITICAL, $context, $force); |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | { |
| 236 | 236 | $context['uri'] = null !== $_SERVER && array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : 'Unknow'; |
| 237 | 237 | $context['method'] = null !== $_SERVER && array_key_exists('REQUEST_METHOD', $_SERVER) ? $_SERVER['REQUEST_METHOD'] : 'Unknow'; |
| 238 | - if(null !== $_SERVER && array_key_exists('HTTP_X_PSFS_UID', $_SERVER)) { |
|
| 238 | + if (null !== $_SERVER && array_key_exists('HTTP_X_PSFS_UID', $_SERVER)) { |
|
| 239 | 239 | $context['uid'] = $_SERVER['HTTP_X_PSFS_UID']; |
| 240 | 240 | } |
| 241 | 241 | return $context; |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false)) |
| 34 | 34 | ) { |
| 35 | 35 | if (!self::isTest() && |
| 36 | - null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) { |
|
| 36 | + null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) { |
|
| 37 | 37 | throw new AdminCredentialsException(); |
| 38 | 38 | } |
| 39 | 39 | if (!Security::getInstance()->checkAdmin()) { |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | $token = ''; |
| 54 | 54 | $ct = strlen($ts); |
| 55 | 55 | for ($i = 0; $i < $ct; $i++) { |
| 56 | - $token = substr($hash, $i, 1) . |
|
| 57 | - substr($ts, $i, 1) . |
|
| 56 | + $token = substr($hash, $i, 1). |
|
| 57 | + substr($ts, $i, 1). |
|
| 58 | 58 | $token; |
| 59 | 59 | } |
| 60 | 60 | return $token; |
@@ -72,16 +72,16 @@ discard block |
||
| 72 | 72 | $charsLength = strlen(self::RAND_SEP) - 1; |
| 73 | 73 | $tsLength = strlen($ts); |
| 74 | 74 | $i = 0; |
| 75 | - $ct = ceil($hashRest / 4); |
|
| 76 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
| 77 | - while(false !== $part) { |
|
| 78 | - $mixedToken .= $part . |
|
| 79 | - substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) . |
|
| 75 | + $ct = ceil($hashRest/4); |
|
| 76 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
| 77 | + while (false !== $part) { |
|
| 78 | + $mixedToken .= $part. |
|
| 79 | + substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1). |
|
| 80 | 80 | substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1); |
| 81 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
| 81 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
| 82 | 82 | $i++; |
| 83 | 83 | } |
| 84 | - return $mixedToken . $token; |
|
| 84 | + return $mixedToken.$token; |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | /** |
@@ -90,10 +90,10 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | private static function getTs($isOdd = null) { |
| 92 | 92 | $ts = time(); |
| 93 | - $tsIsOdd = (bool)((int)substr($ts, -1) % 2); |
|
| 94 | - if(false === $isOdd && !$tsIsOdd) { |
|
| 93 | + $tsIsOdd = (bool)((int)substr($ts, -1)%2); |
|
| 94 | + if (false === $isOdd && !$tsIsOdd) { |
|
| 95 | 95 | $ts--; |
| 96 | - } elseif(true === $isOdd && !$tsIsOdd) { |
|
| 96 | + } elseif (true === $isOdd && !$tsIsOdd) { |
|
| 97 | 97 | $ts--; |
| 98 | 98 | } |
| 99 | 99 | return $ts; |
@@ -125,10 +125,10 @@ discard block |
||
| 125 | 125 | $partToken = ''; |
| 126 | 126 | $ts = ''; |
| 127 | 127 | $part = strrev($part); |
| 128 | - for($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
| 129 | - if($i % 2 == 0) { |
|
| 128 | + for ($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
| 129 | + if ($i%2 == 0) { |
|
| 130 | 130 | $ts .= substr($part, $i, 1); |
| 131 | - } else { |
|
| 131 | + }else { |
|
| 132 | 132 | $partToken .= substr($part, $i, 1); |
| 133 | 133 | } |
| 134 | 134 | } |
@@ -143,11 +143,11 @@ discard block |
||
| 143 | 143 | private static function parseTokenParts(array $parts) { |
| 144 | 144 | $token = ''; |
| 145 | 145 | list($partToken, $ts) = self::extractTs(array_pop($parts)); |
| 146 | - if($ts > 0) { |
|
| 147 | - foreach($parts as $part) { |
|
| 146 | + if ($ts > 0) { |
|
| 147 | + foreach ($parts as $part) { |
|
| 148 | 148 | $token .= $part; |
| 149 | 149 | } |
| 150 | - $token = $partToken . $token; |
|
| 150 | + $token = $partToken.$token; |
|
| 151 | 151 | } |
| 152 | 152 | return [$token, $ts]; |
| 153 | 153 | } |
@@ -175,8 +175,8 @@ discard block |
||
| 175 | 175 | * @return array |
| 176 | 176 | */ |
| 177 | 177 | private static function extractTokenParts($token) { |
| 178 | - for($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
| 179 | - $token = str_replace(substr(self::RAND_SEP,$i,1), "|", $token); |
|
| 178 | + for ($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
| 179 | + $token = str_replace(substr(self::RAND_SEP, $i, 1), "|", $token); |
|
| 180 | 180 | } |
| 181 | 181 | return array_unique(explode('||', $token)); |
| 182 | 182 | } |
@@ -73,18 +73,18 @@ |
||
| 73 | 73 | if (!Request::getInstance()->isFile()) { |
| 74 | 74 | return $this->router->execute($uri ?: $this->actualUri); |
| 75 | 75 | } |
| 76 | - } else { |
|
| 76 | + }else { |
|
| 77 | 77 | return ConfigController::getInstance()->config(); |
| 78 | 78 | } |
| 79 | - } catch (AdminCredentialsException $a) { |
|
| 79 | + }catch (AdminCredentialsException $a) { |
|
| 80 | 80 | return UserController::showAdminManager(); |
| 81 | - } catch (SecurityException $s) { |
|
| 81 | + }catch (SecurityException $s) { |
|
| 82 | 82 | return $this->security->notAuthorized($this->actualUri); |
| 83 | - } catch (RouterException $r) { |
|
| 83 | + }catch (RouterException $r) { |
|
| 84 | 84 | return $this->router->httpNotFound($r); |
| 85 | - } catch(ApiException $a) { |
|
| 85 | + }catch (ApiException $a) { |
|
| 86 | 86 | return $this->router->httpNotFound($a, true); |
| 87 | - } catch (\Exception $e) { |
|
| 87 | + }catch (\Exception $e) { |
|
| 88 | 88 | return $this->dumpException($e); |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | //Generating the templates translations |
| 43 | 43 | $translations = $this->tpl->regenerateTemplates(); |
| 44 | 44 | |
| 45 | - $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
| 46 | - $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR; |
|
| 45 | + $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
| 46 | + $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR; |
|
| 47 | 47 | |
| 48 | 48 | //xgettext localizations |
| 49 | 49 | $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale)); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | $translations = array_merge($translations, GeneratorService::findTranslations(CACHE_DIR, $locale)); |
| 52 | 52 | |
| 53 | 53 | $translations[] = "msgfmt {$localePath}translations.po -o {$localePath}translations.mo"; |
| 54 | - $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '. $localePath . 'translations.po -o ' . $localePath . 'translations.mo'); |
|
| 54 | + $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '.$localePath.'translations.po -o '.$localePath.'translations.mo'); |
|
| 55 | 55 | return $this->render('translations.html.twig', array( |
| 56 | 56 | 'translations' => $translations, |
| 57 | 57 | )); |
@@ -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 ('' !== $hashOrig) { |
| 135 | 135 | $this->crfs = sha1($hashOrig); |
| 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 | - $tokenField = $this->getName() . '_token'; |
|
| 205 | + $tokenField = $this->getName().'_token'; |
|
| 206 | 206 | //Controlamos CSRF token |
| 207 | 207 | if (!$this->existsFormToken($tokenField)) { |
| 208 | 208 | $this->errors[$tokenField] = t('Formulario no válido'); |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | $data = array(); |
| 277 | 277 | if (count($this->fields) > 0) { |
| 278 | 278 | foreach ($this->fields as $key => $field) { |
| 279 | - if (self::SEPARATOR !== $key && $key !== ($this->getName() . '_token')) { |
|
| 279 | + if (self::SEPARATOR !== $key && $key !== ($this->getName().'_token')) { |
|
| 280 | 280 | $data[$key] = array_key_exists('value', $field) ? $field['value'] : null; |
| 281 | 281 | } |
| 282 | 282 | } |
@@ -390,8 +390,8 @@ discard block |
||
| 390 | 390 | $model = $this->getHydratedModel(); |
| 391 | 391 | $model->save(); |
| 392 | 392 | $save = true; |
| 393 | - Logger::log(get_class($this->model) . ' guardado con id ' . $this->model->getPrimaryKey(), LOG_INFO); |
|
| 394 | - } catch (\Exception $e) { |
|
| 393 | + Logger::log(get_class($this->model).' guardado con id '.$this->model->getPrimaryKey(), LOG_INFO); |
|
| 394 | + }catch (\Exception $e) { |
|
| 395 | 395 | Logger::log($e->getMessage(), LOG_ERR); |
| 396 | 396 | throw new FormException($e->getMessage(), $e->getCode(), $e); |
| 397 | 397 | } |
@@ -410,10 +410,10 @@ discard block |
||
| 410 | 410 | if (null === $value) { |
| 411 | 411 | $isEmpty = true; |
| 412 | 412 | // Empty Array check |
| 413 | - } else if (is_array($value) && 0 === count($value)) { |
|
| 413 | + }else if (is_array($value) && 0 === count($value)) { |
|
| 414 | 414 | $isEmpty = true; |
| 415 | 415 | // Empty string check |
| 416 | - } else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
| 416 | + }else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
| 417 | 417 | $isEmpty = true; |
| 418 | 418 | } |
| 419 | 419 | |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | && array_key_exists($key, $field) |
| 441 | 441 | && !array_key_exists('error', $field[$key]) |
| 442 | 442 | && !empty($field['value']) |
| 443 | - && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0 |
|
| 443 | + && preg_match('/'.$field['pattern'].'/', $field['value']) === 0 |
|
| 444 | 444 | ) { |
| 445 | 445 | $this->setError($key, str_replace('%s', "<strong>{$key}</strong>", t('El campo %s no tiene un formato válido'))); |
| 446 | 446 | $field['error'] = $this->getError($key); |
@@ -462,10 +462,10 @@ discard block |
||
| 462 | 462 | if (array_key_exists($key, $data[$formName])) { |
| 463 | 463 | if (preg_match('/id/i', $key) && ($data[$formName][$key] === 0 || $data[$formName][$key] === '%' || $data[$formName][$key] === '')) { |
| 464 | 464 | $field['value'] = null; |
| 465 | - } else { |
|
| 465 | + }else { |
|
| 466 | 466 | $field['value'] = $data[$formName][$key]; |
| 467 | 467 | } |
| 468 | - } else { |
|
| 468 | + }else { |
|
| 469 | 469 | unset($field['value']); |
| 470 | 470 | } |
| 471 | 471 | return array($data, $field); |
@@ -479,8 +479,8 @@ discard block |
||
| 479 | 479 | */ |
| 480 | 480 | private function hydrateModelField($key, $value) |
| 481 | 481 | { |
| 482 | - $setter = 'set' . ucfirst($key); |
|
| 483 | - $getter = 'get' . ucfirst($key); |
|
| 482 | + $setter = 'set'.ucfirst($key); |
|
| 483 | + $getter = 'get'.ucfirst($key); |
|
| 484 | 484 | if (method_exists($this->model, $setter)) { |
| 485 | 485 | if (method_exists($this->model, $getter)) { |
| 486 | 486 | $tmp = $this->model->$getter(); |
@@ -505,16 +505,16 @@ discard block |
||
| 505 | 505 | { |
| 506 | 506 | //Extraemos el dato del modelo relacionado si existe el getter |
| 507 | 507 | $method = null; |
| 508 | - if (array_key_exists('class_data', $field) && method_exists($val, 'get' . $field['class_data'])) { |
|
| 509 | - $classMethod = 'get' . $field['class_data']; |
|
| 508 | + if (array_key_exists('class_data', $field) && method_exists($val, 'get'.$field['class_data'])) { |
|
| 509 | + $classMethod = 'get'.$field['class_data']; |
|
| 510 | 510 | $class = $val->$classMethod(); |
| 511 | - if (array_key_exists('class_id', $field) && method_exists($class, 'get' . $field['class_id'])) { |
|
| 512 | - $method = 'get' . $field['class_id']; |
|
| 511 | + if (array_key_exists('class_id', $field) && method_exists($class, 'get'.$field['class_id'])) { |
|
| 512 | + $method = 'get'.$field['class_id']; |
|
| 513 | 513 | $data[] = $class->$method(); |
| 514 | - } else { |
|
| 514 | + }else { |
|
| 515 | 515 | $data[] = $class->getPrimaryKey(); |
| 516 | 516 | } |
| 517 | - } else { |
|
| 517 | + }else { |
|
| 518 | 518 | $data[] = $val; |
| 519 | 519 | } |
| 520 | 520 | |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | private function extractModelFieldValue($key, $field) |
| 531 | 531 | { |
| 532 | 532 | //Extraemos el valor del campo del modelo |
| 533 | - $method = 'get' . ucfirst($key); |
|
| 533 | + $method = 'get'.ucfirst($key); |
|
| 534 | 534 | $type = (array_key_exists('type', $field)) ? $field['type'] : 'text'; |
| 535 | 535 | //Extraemos los campos del modelo |
| 536 | 536 | if (method_exists($this->model, $method)) { |
@@ -540,16 +540,16 @@ discard block |
||
| 540 | 540 | //Si es una relación múltiple |
| 541 | 541 | if ($value instanceof ObjectCollection) { |
| 542 | 542 | $field = $this->computeModelFieldValue($field, $value, $type); |
| 543 | - } else { //O una relación unitaria |
|
| 543 | + }else { //O una relación unitaria |
|
| 544 | 544 | if (method_exists($value, '__toString')) { |
| 545 | 545 | $field['value'] = $value; |
| 546 | 546 | } elseif ($value instanceof \DateTime) { |
| 547 | 547 | $field['value'] = $value->format('Y-m-d H:i:s'); |
| 548 | - } else { |
|
| 548 | + }else { |
|
| 549 | 549 | $field['value'] = $value->getPrimaryKey(); |
| 550 | 550 | } |
| 551 | 551 | } |
| 552 | - } else { |
|
| 552 | + }else { |
|
| 553 | 553 | $field['value'] = $value; |
| 554 | 554 | } |
| 555 | 555 | } |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | if ($module === $requestModule && !preg_match('/^ROOT/i', $module)) { |
| 57 | 57 | $modules = [ |
| 58 | 58 | 'name' => $module, |
| 59 | - 'path' => dirname($info['base'] . DIRECTORY_SEPARATOR . '..'), |
|
| 59 | + 'path' => dirname($info['base'].DIRECTORY_SEPARATOR.'..'), |
|
| 60 | 60 | ]; |
| 61 | 61 | } |
| 62 | - } catch (\Exception $e) { |
|
| 62 | + }catch (\Exception $e) { |
|
| 63 | 63 | $modules[] = $e->getMessage(); |
| 64 | 64 | } |
| 65 | 65 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | public function extractApiEndpoints(array $module) |
| 79 | 79 | { |
| 80 | - $modulePath = $module['path'] . DIRECTORY_SEPARATOR . 'Api'; |
|
| 80 | + $modulePath = $module['path'].DIRECTORY_SEPARATOR.'Api'; |
|
| 81 | 81 | $moduleName = $module['name']; |
| 82 | 82 | $endpoints = []; |
| 83 | 83 | if (file_exists($modulePath)) { |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | if (count($finder)) { |
| 87 | 87 | /** @var \SplFileInfo $file */ |
| 88 | 88 | foreach ($finder as $file) { |
| 89 | - $namespace = "\\{$moduleName}\\Api\\" . str_replace('.php', '', $file->getFilename()); |
|
| 89 | + $namespace = "\\{$moduleName}\\Api\\".str_replace('.php', '', $file->getFilename()); |
|
| 90 | 90 | $info = $this->extractApiInfo($namespace, $moduleName); |
| 91 | 91 | if (!empty($info)) { |
| 92 | 92 | $endpoints[$namespace] = $info; |
@@ -109,14 +109,14 @@ discard block |
||
| 109 | 109 | if (Router::exists($namespace) && !I18nHelper::checkI18Class($namespace)) { |
| 110 | 110 | $reflection = new \ReflectionClass($namespace); |
| 111 | 111 | $visible = InjectorHelper::checkIsVisible($reflection->getDocComment()); |
| 112 | - if($visible) { |
|
| 112 | + if ($visible) { |
|
| 113 | 113 | foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) { |
| 114 | 114 | try { |
| 115 | 115 | $mInfo = $this->extractMethodInfo($namespace, $method, $reflection, $module); |
| 116 | 116 | if (NULL !== $mInfo) { |
| 117 | 117 | $info[] = $mInfo; |
| 118 | 118 | } |
| 119 | - } catch (\Exception $e) { |
|
| 119 | + }catch (\Exception $e) { |
|
| 120 | 120 | Logger::log($e->getMessage(), LOG_ERR); |
| 121 | 121 | } |
| 122 | 122 | } |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | $payload = $this->extractModelFields($namespace); |
| 250 | 250 | $reflector = new \ReflectionClass($namespace); |
| 251 | 251 | $shortName = $reflector->getShortName(); |
| 252 | - } else { |
|
| 252 | + }else { |
|
| 253 | 253 | $namespace = $model; |
| 254 | 254 | $shortName = $model; |
| 255 | 255 | } |
@@ -338,10 +338,10 @@ discard block |
||
| 338 | 338 | "required" => $field->isNotNull(), |
| 339 | 339 | 'format' => $format, |
| 340 | 340 | ]; |
| 341 | - if(count($field->getValueSet())) { |
|
| 341 | + if (count($field->getValueSet())) { |
|
| 342 | 342 | $info['enum'] = array_values($field->getValueSet()); |
| 343 | 343 | } |
| 344 | - if(null !== $field->getDefaultValue()) { |
|
| 344 | + if (null !== $field->getDefaultValue()) { |
|
| 345 | 345 | $info['default'] = $field->getDefaultValue(); |
| 346 | 346 | } |
| 347 | 347 | $payload[ApiHelper::getColumnMapName($field)] = $info; |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) { |
| 350 | 350 | $payload = $this->extractDtoProperties($namespace); |
| 351 | 351 | } |
| 352 | - } catch (\Exception $e) { |
|
| 352 | + }catch (\Exception $e) { |
|
| 353 | 353 | Logger::log($e->getMessage(), LOG_ERR); |
| 354 | 354 | } |
| 355 | 355 | |
@@ -380,7 +380,7 @@ discard block |
||
| 380 | 380 | $return = $this->extractReturn($modelNamespace, $docComments); |
| 381 | 381 | $url = array_pop($route); |
| 382 | 382 | $methodInfo = [ |
| 383 | - 'url' => str_replace('/' . $module . '/api', '', $url), |
|
| 383 | + 'url' => str_replace('/'.$module.'/api', '', $url), |
|
| 384 | 384 | 'method' => $info['http'], |
| 385 | 385 | 'description' => $info['label'], |
| 386 | 386 | 'return' => $return, |
@@ -391,7 +391,7 @@ discard block |
||
| 391 | 391 | $this->setRequestParams($method, $methodInfo, $modelNamespace, $docComments); |
| 392 | 392 | $this->setQueryParams($method, $methodInfo); |
| 393 | 393 | $this->setRequestHeaders($reflection, $methodInfo); |
| 394 | - } catch (\Exception $e) { |
|
| 394 | + }catch (\Exception $e) { |
|
| 395 | 395 | Logger::log($e->getMessage(), LOG_ERR); |
| 396 | 396 | } |
| 397 | 397 | } |
@@ -460,10 +460,10 @@ discard block |
||
| 460 | 460 | $formatted = [ |
| 461 | 461 | "swagger" => "2.0", |
| 462 | 462 | "host" => preg_replace('/^(http|https)\:\/\/(.*)\/$/i', '$2', Router::getInstance()->getRoute('', true)), |
| 463 | - "basePath" => '/' . $module['name'] . '/api', |
|
| 463 | + "basePath" => '/'.$module['name'].'/api', |
|
| 464 | 464 | "schemes" => [Request::getInstance()->getServer('HTTPS') === 'on' ? 'https' : 'http'], |
| 465 | 465 | "info" => [ |
| 466 | - "title" => t('Documentación API módulo ') . $module['name'], |
|
| 466 | + "title" => t('Documentación API módulo ').$module['name'], |
|
| 467 | 467 | "version" => Config::getParam('api.version', '1.0.0'), |
| 468 | 468 | "contact" => [ |
| 469 | 469 | "name" => Config::getParam("author", "Fran López"), |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | foreach ($endpoints as $model) { |
| 477 | 477 | foreach ($model as $endpoint) { |
| 478 | 478 | if (!preg_match('/^\/(admin|api)\//i', $endpoint['url']) && strlen($endpoint['url'])) { |
| 479 | - $url = preg_replace('/\/' . $module['name'] . '\/api/i', '', $endpoint['url']); |
|
| 479 | + $url = preg_replace('/\/'.$module['name'].'\/api/i', '', $endpoint['url']); |
|
| 480 | 480 | $description = $endpoint['description']; |
| 481 | 481 | $method = strtolower($endpoint['method']); |
| 482 | 482 | $paths[$url][$method] = [ |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | protected function extractDtoName($dto, $isArray = false) |
| 538 | 538 | { |
| 539 | 539 | $dto = explode('\\', $dto); |
| 540 | - $modelDto = array_pop($dto) . "Dto"; |
|
| 540 | + $modelDto = array_pop($dto)."Dto"; |
|
| 541 | 541 | if ($isArray) { |
| 542 | 542 | $modelDto .= "List"; |
| 543 | 543 | } |
@@ -587,10 +587,10 @@ discard block |
||
| 587 | 587 | { |
| 588 | 588 | |
| 589 | 589 | $methodInfo['headers'] = []; |
| 590 | - foreach($reflection->getProperties() as $property) { |
|
| 590 | + foreach ($reflection->getProperties() as $property) { |
|
| 591 | 591 | $doc = $property->getDocComment(); |
| 592 | 592 | preg_match('/@header\ (.*)\n/i', $doc, $headers); |
| 593 | - if(count($headers)) { |
|
| 593 | + if (count($headers)) { |
|
| 594 | 594 | $header = [ |
| 595 | 595 | "name" => $headers[1], |
| 596 | 596 | "in" => "header", |
@@ -635,7 +635,7 @@ discard block |
||
| 635 | 635 | foreach ($method->getParameters() as $parameter) { |
| 636 | 636 | $parameterName = $parameter->getName(); |
| 637 | 637 | $types = []; |
| 638 | - preg_match_all('/\@param\ (.*)\ \$' . $parameterName . '$/im', $docComments, $types); |
|
| 638 | + preg_match_all('/\@param\ (.*)\ \$'.$parameterName.'$/im', $docComments, $types); |
|
| 639 | 639 | if (count($types) > 1 && count($types[1]) > 0) { |
| 640 | 640 | $methodInfo['parameters'][$parameterName] = $types[1][0]; |
| 641 | 641 | } |
@@ -657,21 +657,21 @@ discard block |
||
| 657 | 657 | $modelDto['objects'][$dtoName][$param] = [ |
| 658 | 658 | 'type' => 'array', |
| 659 | 659 | 'items' => [ |
| 660 | - '$ref' => '#/definitions/' . $info['type'], |
|
| 660 | + '$ref' => '#/definitions/'.$info['type'], |
|
| 661 | 661 | ] |
| 662 | 662 | ]; |
| 663 | - } else { |
|
| 663 | + }else { |
|
| 664 | 664 | $modelDto['objects'][$dtoName][$param] = [ |
| 665 | 665 | 'type' => 'object', |
| 666 | - '$ref' => '#/definitions/' . $info['type'], |
|
| 666 | + '$ref' => '#/definitions/'.$info['type'], |
|
| 667 | 667 | ]; |
| 668 | 668 | } |
| 669 | 669 | $modelDto['objects'][$info['class']] = $info['properties']; |
| 670 | 670 | $paramDto = $this->checkDtoAttributes($info['properties'], $info['properties'], $info['class']); |
| 671 | - if(array_key_exists('objects', $paramDto)) { |
|
| 671 | + if (array_key_exists('objects', $paramDto)) { |
|
| 672 | 672 | $modelDto['objects'] = array_merge($modelDto['objects'], $paramDto['objects']); |
| 673 | 673 | } |
| 674 | - } else { |
|
| 674 | + }else { |
|
| 675 | 675 | $modelDto['objects'][$dtoName][$param] = $info; |
| 676 | 676 | } |
| 677 | 677 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | public function __construct() |
| 24 | 24 | { |
| 25 | - Logger::log(static::class . ' constructor invoked'); |
|
| 25 | + Logger::log(static::class.' constructor invoked'); |
|
| 26 | 26 | $this->init(); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -81,14 +81,14 @@ discard block |
||
| 81 | 81 | $calledClass = static::class; |
| 82 | 82 | try { |
| 83 | 83 | $instance = InjectorHelper::constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass); |
| 84 | - $setter = 'set' . ucfirst($variable); |
|
| 84 | + $setter = 'set'.ucfirst($variable); |
|
| 85 | 85 | if (method_exists($calledClass, $setter)) { |
| 86 | 86 | $this->$setter($instance); |
| 87 | - } else { |
|
| 87 | + }else { |
|
| 88 | 88 | $this->$variable = $instance; |
| 89 | 89 | } |
| 90 | - } catch (\Exception $e) { |
|
| 91 | - Logger::log($e->getMessage() . ': ' . $e->getFile() . ' [' . $e->getLine() . ']', LOG_ERR); |
|
| 90 | + }catch (\Exception $e) { |
|
| 91 | + Logger::log($e->getMessage().': '.$e->getFile().' ['.$e->getLine().']', LOG_ERR); |
|
| 92 | 92 | throw $e; |
| 93 | 93 | } |
| 94 | 94 | return $this; |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | { |
| 104 | 104 | if (!$this->isLoaded()) { |
| 105 | 105 | $filename = sha1(get_class($this)); |
| 106 | - $cacheFilename = 'reflections' . DIRECTORY_SEPARATOR . substr($filename, 0, 2) . DIRECTORY_SEPARATOR . substr($filename, 2, 2) . DIRECTORY_SEPARATOR . $filename . '.json'; |
|
| 106 | + $cacheFilename = 'reflections'.DIRECTORY_SEPARATOR.substr($filename, 0, 2).DIRECTORY_SEPARATOR.substr($filename, 2, 2).DIRECTORY_SEPARATOR.$filename.'.json'; |
|
| 107 | 107 | /** @var \PSFS\base\Cache $cacheService */ |
| 108 | 108 | $cacheService = Cache::getInstance(); |
| 109 | 109 | /** @var \PSFS\base\config\Config $configService */ |
@@ -121,8 +121,8 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | $this->setLoaded(); |
| 124 | - } else { |
|
| 125 | - Logger::log(get_class($this) . ' already loaded', LOG_INFO); |
|
| 124 | + }else { |
|
| 125 | + Logger::log(get_class($this).' already loaded', LOG_INFO); |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | } |