@@ -21,11 +21,11 @@ |
||
| 21 | 21 | $path = str_replace("\\", DIRECTORY_SEPARATOR, $class); |
| 22 | 22 | |
| 23 | 23 | // filepath |
| 24 | - $abs_path = SOURCE_DIR . DIRECTORY_SEPARATOR . $path . ".php"; |
|
| 24 | + $abs_path = SOURCE_DIR.DIRECTORY_SEPARATOR.$path.".php"; |
|
| 25 | 25 | if (!file_exists($abs_path)) { |
| 26 | - pre('→ ' . $class); |
|
| 27 | - pre('→ ' . $path); |
|
| 28 | - pre('→ ' . $abs_path); |
|
| 26 | + pre('→ '.$class); |
|
| 27 | + pre('→ '.$path); |
|
| 28 | + pre('→ '.$abs_path); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | // require the file |
@@ -38,8 +38,8 @@ |
||
| 38 | 38 | //Generating the templates translations |
| 39 | 39 | $translations = $this->tpl->regenerateTemplates(); |
| 40 | 40 | |
| 41 | - $locale_path = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
| 42 | - $locale_path .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR; |
|
| 41 | + $locale_path = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
| 42 | + $locale_path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR; |
|
| 43 | 43 | |
| 44 | 44 | //xgettext localizations |
| 45 | 45 | $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale)); |
@@ -35,7 +35,9 @@ |
||
| 35 | 35 | public function getTranslations($locale) |
| 36 | 36 | { |
| 37 | 37 | //Default locale |
| 38 | - if (null === $locale) $locale = $this->config->get("default.language", 'es_ES'); |
|
| 38 | + if (null === $locale) { |
|
| 39 | + $locale = $this->config->get("default.language", 'es_ES'); |
|
| 40 | + } |
|
| 39 | 41 | |
| 40 | 42 | //Generating the templates translations |
| 41 | 43 | $translations = $this->tpl->regenerateTemplates(); |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * @param string $msg |
| 89 | 89 | * @param array $context |
| 90 | 90 | * |
| 91 | - * @return bool |
|
| 91 | + * @return boolean|null |
|
| 92 | 92 | */ |
| 93 | 93 | public function debugLog($msg = '', $context = []) |
| 94 | 94 | { |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | /** |
| 99 | 99 | * Método que escribe un log de Error |
| 100 | - * @param $msg |
|
| 100 | + * @param string $msg |
|
| 101 | 101 | * @param array $context |
| 102 | 102 | * |
| 103 | 103 | * @return bool |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | |
| 110 | 110 | /** |
| 111 | 111 | * Método que escribe un log de Warning |
| 112 | - * @param $msg |
|
| 112 | + * @param string $msg |
|
| 113 | 113 | * @param array $context |
| 114 | 114 | * @return bool |
| 115 | 115 | */ |
@@ -14,8 +14,8 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | |
| 16 | 16 | if (!defined("LOG_DIR")) { |
| 17 | - GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'logs'); |
|
| 18 | - define("LOG_DIR", BASE_DIR . DIRECTORY_SEPARATOR . 'logs'); |
|
| 17 | + GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'logs'); |
|
| 18 | + define("LOG_DIR", BASE_DIR.DIRECTORY_SEPARATOR.'logs'); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | /** |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | $config = Config::getInstance(); |
| 49 | 49 | $args = func_get_args(); |
| 50 | 50 | list($logger, $debug, $path) = $this->setup($config, $args); |
| 51 | - $this->stream = fopen($path . DIRECTORY_SEPARATOR . date("Ymd") . ".log", "a+"); |
|
| 51 | + $this->stream = fopen($path.DIRECTORY_SEPARATOR.date("Ymd").".log", "a+"); |
|
| 52 | 52 | $this->addPushLogger($logger, $debug, $config); |
| 53 | 53 | $this->log_level = Config::getParam('log.level', 'info'); |
| 54 | 54 | } |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | private function createLoggerPath(Config $config) |
| 203 | 203 | { |
| 204 | 204 | $logger = $this->setLoggerName($config); |
| 205 | - $path = LOG_DIR . DIRECTORY_SEPARATOR . $logger . DIRECTORY_SEPARATOR . date('Y') . DIRECTORY_SEPARATOR . date('m'); |
|
| 205 | + $path = LOG_DIR.DIRECTORY_SEPARATOR.$logger.DIRECTORY_SEPARATOR.date('Y').DIRECTORY_SEPARATOR.date('m'); |
|
| 206 | 206 | GeneratorHelper::createDir($path); |
| 207 | 207 | |
| 208 | 208 | return $path; |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | */ |
| 262 | 262 | private function addMinimalContext($context = []) |
| 263 | 263 | { |
| 264 | - if(!is_array($context)) { |
|
| 264 | + if (!is_array($context)) { |
|
| 265 | 265 | $context = []; |
| 266 | 266 | } |
| 267 | 267 | $context['uri'] = null !== $_SERVER && array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : 'Unknow'; |
@@ -393,8 +393,10 @@ |
||
| 393 | 393 | throw new RouterException(_("No existe la ruta especificada")); |
| 394 | 394 | } |
| 395 | 395 | $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug]; |
| 396 | - if (!empty($params)) foreach ($params as $key => $value) { |
|
| 396 | + if (!empty($params)) { |
|
| 397 | + foreach ($params as $key => $value) { |
|
| 397 | 398 | $url = str_replace("{" . $key . "}", $value, $url); |
| 399 | + } |
|
| 398 | 400 | } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) { |
| 399 | 401 | $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"]; |
| 400 | 402 | } |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | public function init() |
| 64 | 64 | { |
| 65 | - list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", $this->cacheType, TRUE); |
|
| 66 | - $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", $this->cacheType, TRUE); |
|
| 65 | + list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", $this->cacheType, TRUE); |
|
| 66 | + $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", $this->cacheType, TRUE); |
|
| 67 | 67 | if (empty($this->routing) || Config::getInstance()->getDebugMode()) { |
| 68 | 68 | $this->debugLoad(); |
| 69 | 69 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | "success" => FALSE, |
| 102 | 102 | "error" => $e->getMessage(), |
| 103 | 103 | )), 'application/json'); |
| 104 | - } else { |
|
| 104 | + }else { |
|
| 105 | 105 | return $template->render('error.html.twig', array( |
| 106 | 106 | 'exception' => $e, |
| 107 | 107 | 'trace' => $e->getTraceAsString(), |
@@ -159,12 +159,12 @@ discard block |
||
| 159 | 159 | SecurityHelper::checkRestrictedAccess($route); |
| 160 | 160 | //Search action and execute |
| 161 | 161 | $this->searchAction($route); |
| 162 | - } catch (AccessDeniedException $e) { |
|
| 162 | + }catch (AccessDeniedException $e) { |
|
| 163 | 163 | Logger::log(_('Solicitamos credenciales de acceso a zona restringida')); |
| 164 | 164 | return Admin::staticAdminLogon($route); |
| 165 | - } catch (RouterException $r) { |
|
| 165 | + }catch (RouterException $r) { |
|
| 166 | 166 | Logger::log($r->getMessage(), LOG_WARNING); |
| 167 | - } catch (\Exception $e) { |
|
| 167 | + }catch (\Exception $e) { |
|
| 168 | 168 | Logger::log($e->getMessage(), LOG_ERR); |
| 169 | 169 | throw $e; |
| 170 | 170 | } |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | */ |
| 182 | 182 | protected function searchAction($route) |
| 183 | 183 | { |
| 184 | - Logger::log('Searching action to execute: ' . $route, LOG_INFO); |
|
| 184 | + Logger::log('Searching action to execute: '.$route, LOG_INFO); |
|
| 185 | 185 | //Revisamos si tenemos la ruta registrada |
| 186 | 186 | $parts = parse_url($route); |
| 187 | 187 | $path = (array_key_exists('path', $parts)) ? $parts['path'] : $route; |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | $class = RouterHelper::getClassToCall($action); |
| 196 | 196 | try { |
| 197 | 197 | $this->executeCachedRoute($route, $action, $class, $get); |
| 198 | - } catch (\Exception $e) { |
|
| 198 | + }catch (\Exception $e) { |
|
| 199 | 199 | Logger::log($e->getMessage(), LOG_ERR); |
| 200 | 200 | throw new \RuntimeException($e->getMessage(), 404, $e); |
| 201 | 201 | } |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | */ |
| 219 | 219 | private function getExternalModules() { |
| 220 | 220 | $externalModules = Config::getParam('modules.extend', ''); |
| 221 | - if(Config::getParam('psfs.auth', false)) { |
|
| 221 | + if (Config::getParam('psfs.auth', false)) { |
|
| 222 | 222 | $externalModules .= ',psfs/auth'; |
| 223 | 223 | } |
| 224 | 224 | return $externalModules; |
@@ -235,17 +235,17 @@ discard block |
||
| 235 | 235 | $externalModules = explode(',', $externalModules); |
| 236 | 236 | foreach ($externalModules as &$module) { |
| 237 | 237 | $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module); |
| 238 | - $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src'; |
|
| 238 | + $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src'; |
|
| 239 | 239 | if (file_exists($externalModulePath)) { |
| 240 | 240 | $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0); |
| 241 | 241 | if (!empty($externalModule)) { |
| 242 | 242 | foreach ($externalModule as $modulePath) { |
| 243 | 243 | $extModule = $modulePath->getBasename(); |
| 244 | - $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php'); |
|
| 244 | + $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php'); |
|
| 245 | 245 | if (file_exists($moduleAutoloader)) { |
| 246 | 246 | @include $moduleAutoloader; |
| 247 | 247 | if ($hydrateRoute) { |
| 248 | - $this->routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $this->routing); |
|
| 248 | + $this->routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $this->routing); |
|
| 249 | 249 | } |
| 250 | 250 | } |
| 251 | 251 | } |
@@ -268,10 +268,10 @@ discard block |
||
| 268 | 268 | $modules = $this->finder->directories()->in($modulesPath)->depth(0); |
| 269 | 269 | foreach ($modules as $modulePath) { |
| 270 | 270 | $module = $modulePath->getBasename(); |
| 271 | - $this->routing = $this->inspectDir($modulesPath . DIRECTORY_SEPARATOR . $module, $module, $this->routing); |
|
| 271 | + $this->routing = $this->inspectDir($modulesPath.DIRECTORY_SEPARATOR.$module, $module, $this->routing); |
|
| 272 | 272 | } |
| 273 | 273 | } |
| 274 | - $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", $this->domains, Cache::JSON, TRUE); |
|
| 274 | + $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", $this->domains, Cache::JSON, TRUE); |
|
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | /** |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | $home_params = NULL; |
| 287 | 287 | foreach ($this->routing as $pattern => $params) { |
| 288 | 288 | list($method, $route) = RouterHelper::extractHttpRoute($pattern); |
| 289 | - if (preg_match("/" . preg_quote($route, "/") . "$/i", "/" . $home)) { |
|
| 289 | + if (preg_match("/".preg_quote($route, "/")."$/i", "/".$home)) { |
|
| 290 | 290 | $home_params = $params; |
| 291 | 291 | } |
| 292 | 292 | } |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->depth(1)->name("*.php"); |
| 312 | 312 | foreach ($files as $file) { |
| 313 | 313 | $filename = str_replace("/", '\\', str_replace($origen, '', $file->getPathname())); |
| 314 | - $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing, $namespace); |
|
| 314 | + $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing, $namespace); |
|
| 315 | 315 | } |
| 316 | 316 | $this->finder = new Finder(); |
| 317 | 317 | |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | if (!$this->domains) { |
| 382 | 382 | $this->domains = []; |
| 383 | 383 | } |
| 384 | - $domain = "@" . $class->getConstant("DOMAIN") . "/"; |
|
| 384 | + $domain = "@".$class->getConstant("DOMAIN")."/"; |
|
| 385 | 385 | if (!array_key_exists($domain, $this->domains)) { |
| 386 | 386 | $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain); |
| 387 | 387 | } |
@@ -396,11 +396,11 @@ discard block |
||
| 396 | 396 | */ |
| 397 | 397 | public function simpatize() |
| 398 | 398 | { |
| 399 | - $translationFileName = "translations" . DIRECTORY_SEPARATOR . "routes_translations.php"; |
|
| 400 | - $absoluteTranslationFileName = CACHE_DIR . DIRECTORY_SEPARATOR . $translationFileName; |
|
| 399 | + $translationFileName = "translations".DIRECTORY_SEPARATOR."routes_translations.php"; |
|
| 400 | + $absoluteTranslationFileName = CACHE_DIR.DIRECTORY_SEPARATOR.$translationFileName; |
|
| 401 | 401 | $this->generateSlugs($absoluteTranslationFileName); |
| 402 | 402 | GeneratorHelper::createDir(CONFIG_DIR); |
| 403 | - Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE); |
|
| 403 | + Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE); |
|
| 404 | 404 | |
| 405 | 405 | return $this; |
| 406 | 406 | } |
@@ -418,16 +418,16 @@ discard block |
||
| 418 | 418 | public function getRoute($slug = '', $absolute = FALSE, $params = []) |
| 419 | 419 | { |
| 420 | 420 | if (strlen($slug) === 0) { |
| 421 | - return ($absolute) ? Request::getInstance()->getRootUrl() . '/' : '/'; |
|
| 421 | + return ($absolute) ? Request::getInstance()->getRootUrl().'/' : '/'; |
|
| 422 | 422 | } |
| 423 | 423 | if (!is_array($this->slugs) || !array_key_exists($slug, $this->slugs)) { |
| 424 | 424 | throw new RouterException(_("No existe la ruta especificada")); |
| 425 | 425 | } |
| 426 | - $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug]; |
|
| 426 | + $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->slugs[$slug] : $this->slugs[$slug]; |
|
| 427 | 427 | if (!empty($params)) foreach ($params as $key => $value) { |
| 428 | - $url = str_replace("{" . $key . "}", $value, $url); |
|
| 428 | + $url = str_replace("{".$key."}", $value, $url); |
|
| 429 | 429 | } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) { |
| 430 | - $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"]; |
|
| 430 | + $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"]; |
|
| 431 | 431 | } |
| 432 | 432 | |
| 433 | 433 | return preg_replace('/(GET|POST|PUT|DELETE|ALL)\#\|\#/', '', $url); |
@@ -472,18 +472,18 @@ discard block |
||
| 472 | 472 | */ |
| 473 | 473 | protected function executeCachedRoute($route, $action, $class, $params = NULL) |
| 474 | 474 | { |
| 475 | - Logger::log('Executing route ' . $route, LOG_INFO); |
|
| 475 | + Logger::log('Executing route '.$route, LOG_INFO); |
|
| 476 | 476 | Security::getInstance()->setSessionKey("__CACHE__", $action); |
| 477 | 477 | $cache = Cache::needCache(); |
| 478 | 478 | $execute = TRUE; |
| 479 | 479 | if (FALSE !== $cache && Config::getInstance()->getDebugMode() === FALSE) { |
| 480 | 480 | list($path, $cacheDataName) = $this->cache->getRequestCacheHash(); |
| 481 | - $cachedData = $this->cache->readFromCache("json" . DIRECTORY_SEPARATOR . $path . $cacheDataName, |
|
| 482 | - $cache, function () { |
|
| 481 | + $cachedData = $this->cache->readFromCache("json".DIRECTORY_SEPARATOR.$path.$cacheDataName, |
|
| 482 | + $cache, function() { |
|
| 483 | 483 | }); |
| 484 | 484 | if (NULL !== $cachedData) { |
| 485 | - $headers = $this->cache->readFromCache("json" . DIRECTORY_SEPARATOR . $path . $cacheDataName . ".headers", |
|
| 486 | - $cache, function () { |
|
| 485 | + $headers = $this->cache->readFromCache("json".DIRECTORY_SEPARATOR.$path.$cacheDataName.".headers", |
|
| 486 | + $cache, function() { |
|
| 487 | 487 | }, Cache::JSON); |
| 488 | 488 | Template::getInstance()->renderCache($cachedData, $headers); |
| 489 | 489 | $execute = FALSE; |
@@ -56,8 +56,10 @@ discard block |
||
| 56 | 56 | $_route = explode("/", $url['path']); |
| 57 | 57 | $_pattern = explode("/", $pattern); |
| 58 | 58 | $get = array(); |
| 59 | - if (!empty($_pattern)) foreach ($_pattern as $index => $component) { |
|
| 59 | + if (!empty($_pattern)) { |
|
| 60 | + foreach ($_pattern as $index => $component) { |
|
| 60 | 61 | $_get = array(); |
| 62 | + } |
|
| 61 | 63 | preg_match_all('/^\{(.*)\}$/i', $component, $_get); |
| 62 | 64 | if (!empty($_get[1]) && isset($_route[$index])) { |
| 63 | 65 | $get[array_pop($_get[1])] = $_route[$index]; |
@@ -151,12 +153,16 @@ discard block |
||
| 151 | 153 | $params = []; |
| 152 | 154 | $parameters = $method->getParameters(); |
| 153 | 155 | /** @var \ReflectionParameter $param */ |
| 154 | - if (count($parameters) > 0) foreach ($parameters as $param) { |
|
| 156 | + if (count($parameters) > 0) { |
|
| 157 | + foreach ($parameters as $param) { |
|
| 155 | 158 | if ($param->isOptional() && !is_array($param->getDefaultValue())) { |
| 156 | 159 | $params[$param->getName()] = $param->getDefaultValue(); |
| 160 | + } |
|
| 157 | 161 | $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex); |
| 158 | 162 | } |
| 159 | - } else $default = $regex; |
|
| 163 | + } else { |
|
| 164 | + $default = $regex; |
|
| 165 | + } |
|
| 160 | 166 | |
| 161 | 167 | return array($regex, $default, $params); |
| 162 | 168 | } |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | /** |
| 141 | 141 | * Método que extrae los parámetros de una función |
| 142 | 142 | * |
| 143 | - * @param array $sr |
|
| 143 | + * @param string[] $sr |
|
| 144 | 144 | * @param \ReflectionMethod $method |
| 145 | 145 | * |
| 146 | 146 | * @return array |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | * |
| 208 | 208 | * @param string $docComments |
| 209 | 209 | * |
| 210 | - * @return bool |
|
| 210 | + * @return string |
|
| 211 | 211 | */ |
| 212 | 212 | public static function extractReflectionCacheability($docComments) |
| 213 | 213 | { |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | public static function getClassToCall($action) |
| 23 | 23 | { |
| 24 | 24 | Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action); |
| 25 | - $actionClass = class_exists($action["class"]) ? $action["class"] : "\\" . $action["class"]; |
|
| 25 | + $actionClass = class_exists($action["class"]) ? $action["class"] : "\\".$action["class"]; |
|
| 26 | 26 | $class = (method_exists($actionClass, "getInstance")) ? $actionClass::getInstance() : new $actionClass; |
| 27 | 27 | return $class; |
| 28 | 28 | } |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | $expr = preg_quote($expr, '/'); |
| 109 | 109 | $expr = str_replace('###', '(.*)', $expr); |
| 110 | 110 | $expr2 = preg_replace('/\(\.\*\)$/', '', $expr); |
| 111 | - $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path); |
|
| 111 | + $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path); |
|
| 112 | 112 | return $matched; |
| 113 | 113 | } |
| 114 | 114 | |
@@ -119,8 +119,8 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | public static function extractDomainInfo(\ReflectionClass $class, $domain) |
| 121 | 121 | { |
| 122 | - $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR; |
|
| 123 | - $path = realpath($path) . DIRECTORY_SEPARATOR; |
|
| 122 | + $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR; |
|
| 123 | + $path = realpath($path).DIRECTORY_SEPARATOR; |
|
| 124 | 124 | $tpl_path = "templates"; |
| 125 | 125 | $public_path = "public"; |
| 126 | 126 | $model_path = "models"; |
@@ -130,13 +130,13 @@ discard block |
||
| 130 | 130 | $model_path = ucfirst($model_path); |
| 131 | 131 | } |
| 132 | 132 | if ($class->hasConstant("TPL")) { |
| 133 | - $tpl_path .= DIRECTORY_SEPARATOR . $class->getConstant("TPL"); |
|
| 133 | + $tpl_path .= DIRECTORY_SEPARATOR.$class->getConstant("TPL"); |
|
| 134 | 134 | } |
| 135 | 135 | return [ |
| 136 | 136 | "base" => $path, |
| 137 | - "template" => $path . $tpl_path, |
|
| 138 | - "model" => $path . $model_path, |
|
| 139 | - "public" => $path . $public_path, |
|
| 137 | + "template" => $path.$tpl_path, |
|
| 138 | + "model" => $path.$model_path, |
|
| 139 | + "public" => $path.$public_path, |
|
| 140 | 140 | ]; |
| 141 | 141 | } |
| 142 | 142 | |
@@ -158,9 +158,9 @@ discard block |
||
| 158 | 158 | if (count($parameters) > 0) foreach ($parameters as $param) { |
| 159 | 159 | if ($param->isOptional() && !is_array($param->getDefaultValue())) { |
| 160 | 160 | $params[$param->getName()] = $param->getDefaultValue(); |
| 161 | - $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex); |
|
| 161 | + $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex); |
|
| 162 | 162 | } |
| 163 | - } else $default = $regex; |
|
| 163 | + }else $default = $regex; |
|
| 164 | 164 | |
| 165 | 165 | return array($regex, $default, $params); |
| 166 | 166 | } |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | $default = str_replace('{__DOMAIN__}', $module, $default); |
| 241 | 241 | $httpMethod = RouterHelper::extractReflectionHttpMethod($docComments); |
| 242 | 242 | $label = RouterHelper::extractReflectionLabel(str_replace('{__API__}', $api, $docComments)); |
| 243 | - $route = $httpMethod . "#|#" . $regex; |
|
| 243 | + $route = $httpMethod."#|#".$regex; |
|
| 244 | 244 | $route = preg_replace('/(\\r|\\f|\\t|\\n)/', '', $route); |
| 245 | 245 | $info = [ |
| 246 | 246 | "method" => $method->getName(), |
@@ -54,13 +54,13 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public static function constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass) |
| 56 | 56 | { |
| 57 | - Logger::log('Create inyectable instance for ' . $classNameSpace); |
|
| 57 | + Logger::log('Create inyectable instance for '.$classNameSpace); |
|
| 58 | 58 | $reflector = new \ReflectionClass($calledClass); |
| 59 | 59 | $property = $reflector->getProperty($variable); |
| 60 | 60 | $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace; |
| 61 | 61 | if (true === $singleton && method_exists($varInstanceType, "getInstance")) { |
| 62 | 62 | $instance = $varInstanceType::getInstance(); |
| 63 | - } else { |
|
| 63 | + }else { |
|
| 64 | 64 | $instance = new $varInstanceType(); |
| 65 | 65 | } |
| 66 | 66 | return $instance; |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | public static function getClassProperties($class) |
| 75 | 75 | { |
| 76 | 76 | $properties = []; |
| 77 | - Logger::log('Extracting annotations properties from class ' . $class); |
|
| 77 | + Logger::log('Extracting annotations properties from class '.$class); |
|
| 78 | 78 | $selfReflector = new \ReflectionClass($class); |
| 79 | 79 | if (false !== $selfReflector->getParentClass()) { |
| 80 | 80 | $properties = self::getClassProperties($selfReflector->getParentClass()->getName()); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | unset($_SERVER["PHP_AUTH_USER"]); |
| 39 | 39 | unset($_SERVER["PHP_AUTH_PW"]); |
| 40 | 40 | header_remove("Authorization"); |
| 41 | - } else { |
|
| 41 | + }else { |
|
| 42 | 42 | header('Authorization:'); |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -66,9 +66,9 @@ discard block |
||
| 66 | 66 | Logger::log('Adding debug headers to render response'); |
| 67 | 67 | $vars["__DEBUG__"]["includes"] = get_included_files(); |
| 68 | 68 | $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 69 | - header('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s'); |
|
| 70 | - header('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes'); |
|
| 71 | - header('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened'); |
|
| 69 | + header('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s'); |
|
| 70 | + header('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes'); |
|
| 71 | + header('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened'); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | return $vars; |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | * @route /admin/config/params |
| 23 | 23 | * @label Parámetros de configuración de PSGS |
| 24 | 24 | * @visible false |
| 25 | - * @return mixed |
|
| 25 | + * @return string|null |
|
| 26 | 26 | */ |
| 27 | 27 | public function getConfigParams() |
| 28 | 28 | { |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | foreach ($domains as $domain => $routes) { |
| 32 | 32 | $pDomain = str_replace('@', '', $domain); |
| 33 | 33 | $pDomain = str_replace('/', '', $pDomain); |
| 34 | - $response[] = strtolower($pDomain) . '.api.secret'; |
|
| 34 | + $response[] = strtolower($pDomain).'.api.secret'; |
|
| 35 | 35 | } |
| 36 | 36 | return $this->json($response); |
| 37 | 37 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function config() |
| 47 | 47 | { |
| 48 | - Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri()); |
|
| 48 | + Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri()); |
|
| 49 | 49 | /* @var $form \PSFS\base\config\ConfigForm */ |
| 50 | 50 | $form = new ConfigForm(Router::getInstance()->getRoute('admin-config'), Config::$required, Config::$optional, Config::getInstance()->dumpConfig()); |
| 51 | 51 | $form->build(); |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | Security::getInstance()->setFlash("callback_message", _("Configuración actualizada correctamente")); |
| 84 | 84 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-config", true)); |
| 85 | - } else { |
|
| 85 | + }else { |
|
| 86 | 86 | throw new \HttpException(_('Error al guardar la configuración, prueba a cambiar los permisos'), 403); |
| 87 | 87 | } |
| 88 | 88 | } |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | * @route /admin/routes/show |
| 31 | 31 | * @label Servicio de rutas del sistema |
| 32 | 32 | * @visible false |
| 33 | - * @return mixed |
|
| 33 | + * @return string|null |
|
| 34 | 34 | */ |
| 35 | 35 | public function getRouting() |
| 36 | 36 | { |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | $router->simpatize(); |
| 56 | 56 | Security::getInstance()->setFlash("callback_message", _("Rutas generadas correctamente")); |
| 57 | 57 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true)); |
| 58 | - } catch (\Exception $e) { |
|
| 58 | + }catch (\Exception $e) { |
|
| 59 | 59 | Logger::log($e->getMessage(), LOG_ERR); |
| 60 | 60 | Security::getInstance()->setFlash("callback_message", _("Algo no ha salido bien, revisa los logs")); |
| 61 | 61 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true)); |