@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $this->setStatusCode(Template::STATUS_OK); |
| 122 | 122 | break; |
| 123 | 123 | default: |
| 124 | - $this->setStatusCode('HTTP/1.0 ' .($status ?: 200)); |
|
| 124 | + $this->setStatusCode('HTTP/1.0 '.($status ?: 200)); |
|
| 125 | 125 | break; |
| 126 | 126 | } |
| 127 | 127 | return $this; |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | ResponseHelper::setStatusHeader($this->getStatusCode()); |
| 140 | 140 | ResponseHelper::setAuthHeaders($this->isPublicZone()); |
| 141 | 141 | ResponseHelper::setCookieHeaders($cookies); |
| 142 | - header('Content-type: ' . $contentType); |
|
| 142 | + header('Content-type: '.$contentType); |
|
| 143 | 143 | |
| 144 | 144 | } |
| 145 | 145 | |
@@ -152,20 +152,20 @@ discard block |
||
| 152 | 152 | */ |
| 153 | 153 | public function output($output = '', $contentType = 'text/html', array $cookies = array()) |
| 154 | 154 | { |
| 155 | - if(!self::isTest()) { |
|
| 155 | + if (!self::isTest()) { |
|
| 156 | 156 | Logger::log('Start output response'); |
| 157 | 157 | ob_start(); |
| 158 | 158 | $this->setReponseHeaders($contentType, $cookies); |
| 159 | - header('Content-length: ' . strlen($output)); |
|
| 160 | - header('CRC: ' . crc32($output)); |
|
| 159 | + header('Content-length: '.strlen($output)); |
|
| 160 | + header('CRC: '.crc32($output)); |
|
| 161 | 161 | |
| 162 | 162 | $needCache = Cache::needCache(); |
| 163 | 163 | $cache = Cache::getInstance(); |
| 164 | 164 | list($path, $cacheDataName) = $cache->getRequestCacheHash(); |
| 165 | 165 | if (null !== $cacheDataName && false !== $needCache && $this->getStatusCode() === Template::STATUS_OK) { |
| 166 | 166 | Logger::log('Saving output response into cache'); |
| 167 | - $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $output); |
|
| 168 | - $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', headers_list(), Cache::JSON); |
|
| 167 | + $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $output); |
|
| 168 | + $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', headers_list(), Cache::JSON); |
|
| 169 | 169 | } elseif (Request::getInstance()->getMethod() !== 'GET') { |
| 170 | 170 | $cache->flushCache(); |
| 171 | 171 | } |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | ob_end_clean(); |
| 176 | 176 | Logger::log('End output response'); |
| 177 | 177 | $this->closeRender(); |
| 178 | - } else { |
|
| 178 | + }else { |
|
| 179 | 179 | return $output; |
| 180 | 180 | } |
| 181 | 181 | } |
@@ -188,11 +188,11 @@ discard block |
||
| 188 | 188 | Logger::log('Close template render'); |
| 189 | 189 | $uri = Request::requestUri(); |
| 190 | 190 | Security::getInstance()->setSessionKey('lastRequest', array( |
| 191 | - 'url' => Request::getInstance()->getRootUrl() . $uri, |
|
| 191 | + 'url' => Request::getInstance()->getRootUrl().$uri, |
|
| 192 | 192 | 'ts' => microtime(true), |
| 193 | 193 | )); |
| 194 | 194 | Security::getInstance()->updateSession(); |
| 195 | - Logger::log('End request: ' . $uri, LOG_INFO); |
|
| 195 | + Logger::log('End request: '.$uri, LOG_INFO); |
|
| 196 | 196 | exit; |
| 197 | 197 | } |
| 198 | 198 | |
@@ -230,17 +230,17 @@ discard block |
||
| 230 | 230 | ///////////////////////////////////////////////////////////// |
| 231 | 231 | // Date in the past sets the value to already have been expired. |
| 232 | 232 | header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); |
| 233 | - header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
| 233 | + header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
| 234 | 234 | header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1 |
| 235 | 235 | header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 |
| 236 | 236 | header('Pragma: no-cache'); |
| 237 | 237 | header('Expires: 0'); |
| 238 | 238 | header('Content-Transfer-Encoding: binary'); |
| 239 | - header('Content-type: ' . $content); |
|
| 240 | - header('Content-length: ' . strlen($data)); |
|
| 241 | - header('Content-Disposition: attachment; filename="' . $filename . '"'); |
|
| 239 | + header('Content-type: '.$content); |
|
| 240 | + header('Content-length: '.strlen($data)); |
|
| 241 | + header('Content-Disposition: attachment; filename="'.$filename.'"'); |
|
| 242 | 242 | header('Access-Control-Expose-Headers: Filename'); |
| 243 | - header('Filename: ' . $filename); |
|
| 243 | + header('Filename: '.$filename); |
|
| 244 | 244 | echo $data; |
| 245 | 245 | ob_flush(); |
| 246 | 246 | ob_end_clean(); |
@@ -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; |
@@ -75,11 +75,11 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | public function init() |
| 77 | 77 | { |
| 78 | - list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', $this->cacheType, TRUE); |
|
| 78 | + list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', $this->cacheType, TRUE); |
|
| 79 | 79 | if (empty($this->routing) || Config::getInstance()->getDebugMode()) { |
| 80 | 80 | $this->debugLoad(); |
| 81 | - } else { |
|
| 82 | - $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->cacheType, TRUE); |
|
| 81 | + }else { |
|
| 82 | + $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->cacheType, TRUE); |
|
| 83 | 83 | } |
| 84 | 84 | $this->checkExternalModules(false); |
| 85 | 85 | $this->setLoaded(); |
@@ -117,9 +117,9 @@ discard block |
||
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | $notFoundRoute = Config::getParam('route.404'); |
| 120 | - if(null !== $notFoundRoute) { |
|
| 120 | + if (null !== $notFoundRoute) { |
|
| 121 | 121 | Request::getInstance()->redirect($this->getRoute($notFoundRoute, true)); |
| 122 | - } else { |
|
| 122 | + }else { |
|
| 123 | 123 | return $template->render('error.html.twig', array( |
| 124 | 124 | 'exception' => $exception, |
| 125 | 125 | 'trace' => $exception->getTraceAsString(), |
@@ -170,12 +170,12 @@ discard block |
||
| 170 | 170 | try { |
| 171 | 171 | //Search action and execute |
| 172 | 172 | return $this->searchAction($route); |
| 173 | - } catch (AccessDeniedException $e) { |
|
| 174 | - Logger::log(_('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile() . '[' . $e->getLine() . ']']); |
|
| 173 | + }catch (AccessDeniedException $e) { |
|
| 174 | + Logger::log(_('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile().'['.$e->getLine().']']); |
|
| 175 | 175 | return Admin::staticAdminLogon($route); |
| 176 | - } catch (RouterException $r) { |
|
| 176 | + }catch (RouterException $r) { |
|
| 177 | 177 | Logger::log($r->getMessage(), LOG_WARNING); |
| 178 | - } catch (\Exception $e) { |
|
| 178 | + }catch (\Exception $e) { |
|
| 179 | 179 | Logger::log($e->getMessage(), LOG_ERR); |
| 180 | 180 | throw $e; |
| 181 | 181 | } |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | */ |
| 194 | 194 | protected function searchAction($route) |
| 195 | 195 | { |
| 196 | - Logger::log('Searching action to execute: ' . $route, LOG_INFO); |
|
| 196 | + Logger::log('Searching action to execute: '.$route, LOG_INFO); |
|
| 197 | 197 | //Revisamos si tenemos la ruta registrada |
| 198 | 198 | $parts = parse_url($route); |
| 199 | 199 | $path = array_key_exists('path', $parts) ? $parts['path'] : $route; |
@@ -208,12 +208,12 @@ discard block |
||
| 208 | 208 | /** @var $class \PSFS\base\types\Controller */ |
| 209 | 209 | $class = RouterHelper::getClassToCall($action); |
| 210 | 210 | try { |
| 211 | - if($this->checkRequirements($action, $get)) { |
|
| 211 | + if ($this->checkRequirements($action, $get)) { |
|
| 212 | 212 | return $this->executeCachedRoute($route, $action, $class, $get); |
| 213 | - } else { |
|
| 213 | + }else { |
|
| 214 | 214 | throw new RouterException(_('La ruta no es válida'), 400); |
| 215 | 215 | } |
| 216 | - } catch (\Exception $e) { |
|
| 216 | + }catch (\Exception $e) { |
|
| 217 | 217 | Logger::log($e->getMessage(), LOG_ERR); |
| 218 | 218 | throw $e; |
| 219 | 219 | } |
@@ -228,15 +228,15 @@ discard block |
||
| 228 | 228 | * @return bool |
| 229 | 229 | */ |
| 230 | 230 | private function checkRequirements(array $action, $params = []) { |
| 231 | - if(!empty($params) && !empty($action['requirements'])) { |
|
| 231 | + if (!empty($params) && !empty($action['requirements'])) { |
|
| 232 | 232 | $checked = 0; |
| 233 | - foreach(array_keys($params) as $key) { |
|
| 234 | - if(in_array($key, $action['requirements'], true)) { |
|
| 233 | + foreach (array_keys($params) as $key) { |
|
| 234 | + if (in_array($key, $action['requirements'], true)) { |
|
| 235 | 235 | $checked++; |
| 236 | 236 | } |
| 237 | 237 | } |
| 238 | 238 | $valid = count($action['requirements']) === $checked; |
| 239 | - } else { |
|
| 239 | + }else { |
|
| 240 | 240 | $valid = true; |
| 241 | 241 | } |
| 242 | 242 | return $valid; |
@@ -286,14 +286,14 @@ discard block |
||
| 286 | 286 | $this->checkExternalModules(); |
| 287 | 287 | if (file_exists($modulesPath)) { |
| 288 | 288 | $modules = $this->finder->directories()->in($modulesPath)->depth(0); |
| 289 | - if($modules->hasResults()) { |
|
| 289 | + if ($modules->hasResults()) { |
|
| 290 | 290 | foreach ($modules->getIterator() as $modulePath) { |
| 291 | 291 | $module = $modulePath->getBasename(); |
| 292 | - $this->routing = $this->inspectDir($modulesPath . DIRECTORY_SEPARATOR . $module, $module, $this->routing); |
|
| 292 | + $this->routing = $this->inspectDir($modulesPath.DIRECTORY_SEPARATOR.$module, $module, $this->routing); |
|
| 293 | 293 | } |
| 294 | 294 | } |
| 295 | 295 | } |
| 296 | - $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->domains, Cache::JSON, TRUE); |
|
| 296 | + $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->domains, Cache::JSON, TRUE); |
|
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | /** |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | $home_params = NULL; |
| 310 | 310 | foreach ($this->routing as $pattern => $params) { |
| 311 | 311 | list($method, $route) = RouterHelper::extractHttpRoute($pattern); |
| 312 | - if (preg_match('/' . preg_quote($route, '/') . '$/i', '/' . $home)) { |
|
| 312 | + if (preg_match('/'.preg_quote($route, '/').'$/i', '/'.$home)) { |
|
| 313 | 313 | $home_params = $params; |
| 314 | 314 | } |
| 315 | 315 | unset($method); |
@@ -331,14 +331,14 @@ discard block |
||
| 331 | 331 | private function inspectDir($origen, $namespace = 'PSFS', $routing = []) |
| 332 | 332 | { |
| 333 | 333 | $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->depth(1)->name('*.php'); |
| 334 | - if($files->hasResults()) { |
|
| 334 | + if ($files->hasResults()) { |
|
| 335 | 335 | foreach ($files->getIterator() as $file) { |
| 336 | - if($namespace !== 'PSFS' && method_exists($file, 'getRelativePathname')) { |
|
| 337 | - $filename = '\\' . str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname())); |
|
| 338 | - } else { |
|
| 336 | + if ($namespace !== 'PSFS' && method_exists($file, 'getRelativePathname')) { |
|
| 337 | + $filename = '\\'.str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname())); |
|
| 338 | + }else { |
|
| 339 | 339 | $filename = str_replace('/', '\\', str_replace($origen, '', $file->getPathname())); |
| 340 | 340 | } |
| 341 | - $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing, $namespace); |
|
| 341 | + $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing, $namespace); |
|
| 342 | 342 | } |
| 343 | 343 | } |
| 344 | 344 | $this->finder = new Finder(); |
@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | private function addRouting($namespace, &$routing, $module = 'PSFS') |
| 368 | 368 | { |
| 369 | 369 | if (self::exists($namespace)) { |
| 370 | - if(I18nHelper::checkI18Class($namespace)) { |
|
| 370 | + if (I18nHelper::checkI18Class($namespace)) { |
|
| 371 | 371 | return $routing; |
| 372 | 372 | } |
| 373 | 373 | $reflection = new \ReflectionClass($namespace); |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | if (!$this->domains) { |
| 410 | 410 | $this->domains = []; |
| 411 | 411 | } |
| 412 | - $domain = '@' . $class->getConstant('DOMAIN') . '/'; |
|
| 412 | + $domain = '@'.$class->getConstant('DOMAIN').'/'; |
|
| 413 | 413 | if (!array_key_exists($domain, $this->domains)) { |
| 414 | 414 | $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain); |
| 415 | 415 | } |
@@ -425,11 +425,11 @@ discard block |
||
| 425 | 425 | */ |
| 426 | 426 | public function simpatize() |
| 427 | 427 | { |
| 428 | - $translationFileName = 'translations' . DIRECTORY_SEPARATOR . 'routes_translations.php'; |
|
| 429 | - $absoluteTranslationFileName = CACHE_DIR . DIRECTORY_SEPARATOR . $translationFileName; |
|
| 428 | + $translationFileName = 'translations'.DIRECTORY_SEPARATOR.'routes_translations.php'; |
|
| 429 | + $absoluteTranslationFileName = CACHE_DIR.DIRECTORY_SEPARATOR.$translationFileName; |
|
| 430 | 430 | $this->generateSlugs($absoluteTranslationFileName); |
| 431 | 431 | GeneratorHelper::createDir(CONFIG_DIR); |
| 432 | - Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', array($this->routing, $this->slugs), Cache::JSON, TRUE); |
|
| 432 | + Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', array($this->routing, $this->slugs), Cache::JSON, TRUE); |
|
| 433 | 433 | |
| 434 | 434 | return $this; |
| 435 | 435 | } |
@@ -445,18 +445,18 @@ discard block |
||
| 445 | 445 | public function getRoute($slug = '', $absolute = FALSE, array $params = []) |
| 446 | 446 | { |
| 447 | 447 | if ('' === $slug) { |
| 448 | - return $absolute ? Request::getInstance()->getRootUrl() . '/' : '/'; |
|
| 448 | + return $absolute ? Request::getInstance()->getRootUrl().'/' : '/'; |
|
| 449 | 449 | } |
| 450 | 450 | if (!is_array($this->slugs) || !array_key_exists($slug, $this->slugs)) { |
| 451 | 451 | throw new RouterException(_('No existe la ruta especificada')); |
| 452 | 452 | } |
| 453 | - $url = $absolute ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug]; |
|
| 453 | + $url = $absolute ? Request::getInstance()->getRootUrl().$this->slugs[$slug] : $this->slugs[$slug]; |
|
| 454 | 454 | if (!empty($params)) { |
| 455 | 455 | foreach ($params as $key => $value) { |
| 456 | - $url = str_replace('{' . $key . '}', $value, $url); |
|
| 456 | + $url = str_replace('{'.$key.'}', $value, $url); |
|
| 457 | 457 | } |
| 458 | 458 | } elseif (!empty($this->routing[$this->slugs[$slug]]['default'])) { |
| 459 | - $url = $absolute ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]['default'] : $this->routing[$this->slugs[$slug]]['default']; |
|
| 459 | + $url = $absolute ? Request::getInstance()->getRootUrl().$this->routing[$this->slugs[$slug]]['default'] : $this->routing[$this->slugs[$slug]]['default']; |
|
| 460 | 460 | } |
| 461 | 461 | |
| 462 | 462 | return preg_replace('/(GET|POST|PUT|DELETE|ALL)\#\|\#/', '', $url); |
@@ -475,15 +475,15 @@ discard block |
||
| 475 | 475 | * @param string $method |
| 476 | 476 | */ |
| 477 | 477 | private function checkPreActions($class, $method) { |
| 478 | - $preAction = 'pre' . ucfirst($method); |
|
| 479 | - if(method_exists($class, $preAction)) { |
|
| 478 | + $preAction = 'pre'.ucfirst($method); |
|
| 479 | + if (method_exists($class, $preAction)) { |
|
| 480 | 480 | Logger::log(_('Pre action invoked')); |
| 481 | 481 | try { |
| 482 | - if(false === call_user_func_array([$class, $preAction])) { |
|
| 482 | + if (false === call_user_func_array([$class, $preAction])) { |
|
| 483 | 483 | Logger::log(_('Pre action failed'), LOG_ERR, [error_get_last()]); |
| 484 | 484 | error_clear_last(); |
| 485 | 485 | } |
| 486 | - } catch (\Exception $e) { |
|
| 486 | + }catch (\Exception $e) { |
|
| 487 | 487 | Logger::log($e->getMessage(), LOG_ERR, [$class, $method]); |
| 488 | 488 | } |
| 489 | 489 | } |
@@ -500,7 +500,7 @@ discard block |
||
| 500 | 500 | */ |
| 501 | 501 | protected function executeCachedRoute($route, $action, $class, $params = NULL) |
| 502 | 502 | { |
| 503 | - Logger::log('Executing route ' . $route, LOG_INFO); |
|
| 503 | + Logger::log('Executing route '.$route, LOG_INFO); |
|
| 504 | 504 | $action['params'] = array_merge($action['params'], $params, Request::getInstance()->getQueryParams()); |
| 505 | 505 | Security::getInstance()->setSessionKey(Cache::CACHE_SESSION_VAR, $action); |
| 506 | 506 | $cache = Cache::needCache(); |
@@ -508,9 +508,9 @@ discard block |
||
| 508 | 508 | $return = null; |
| 509 | 509 | if (FALSE !== $cache && $action['http'] === 'GET' && Config::getParam('debug') === FALSE) { |
| 510 | 510 | list($path, $cacheDataName) = $this->cache->getRequestCacheHash(); |
| 511 | - $cachedData = $this->cache->readFromCache('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $cache); |
|
| 511 | + $cachedData = $this->cache->readFromCache('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $cache); |
|
| 512 | 512 | if (NULL !== $cachedData) { |
| 513 | - $headers = $this->cache->readFromCache('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', $cache, null, Cache::JSON); |
|
| 513 | + $headers = $this->cache->readFromCache('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', $cache, null, Cache::JSON); |
|
| 514 | 514 | Template::getInstance()->renderCache($cachedData, $headers); |
| 515 | 515 | $execute = FALSE; |
| 516 | 516 | } |
@@ -555,11 +555,11 @@ discard block |
||
| 555 | 555 | private function loadExternalAutoloader($hydrateRoute, SplFileInfo $modulePath, $externalModulePath) |
| 556 | 556 | { |
| 557 | 557 | $extModule = $modulePath->getBasename(); |
| 558 | - $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php'); |
|
| 559 | - if(file_exists($moduleAutoloader)) { |
|
| 558 | + $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php'); |
|
| 559 | + if (file_exists($moduleAutoloader)) { |
|
| 560 | 560 | include_once $moduleAutoloader; |
| 561 | 561 | if ($hydrateRoute) { |
| 562 | - $this->routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $this->routing); |
|
| 562 | + $this->routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $this->routing); |
|
| 563 | 563 | } |
| 564 | 564 | } |
| 565 | 565 | } |
@@ -573,16 +573,16 @@ discard block |
||
| 573 | 573 | { |
| 574 | 574 | try { |
| 575 | 575 | $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module); |
| 576 | - $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src'; |
|
| 577 | - if(file_exists($externalModulePath)) { |
|
| 576 | + $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src'; |
|
| 577 | + if (file_exists($externalModulePath)) { |
|
| 578 | 578 | $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0); |
| 579 | - if($externalModule->hasResults()) { |
|
| 579 | + if ($externalModule->hasResults()) { |
|
| 580 | 580 | foreach ($externalModule->getIterator() as $modulePath) { |
| 581 | 581 | $this->loadExternalAutoloader($hydrateRoute, $modulePath, $externalModulePath); |
| 582 | 582 | } |
| 583 | 583 | } |
| 584 | 584 | } |
| 585 | - } catch (\Exception $e) { |
|
| 585 | + }catch (\Exception $e) { |
|
| 586 | 586 | Logger::log($e->getMessage(), LOG_WARNING); |
| 587 | 587 | $module = null; |
| 588 | 588 | } |
@@ -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; |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | protected function init() |
| 81 | 81 | { |
| 82 | - if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE)) { |
|
| 82 | + if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) { |
|
| 83 | 83 | $this->loadConfigData(); |
| 84 | 84 | } |
| 85 | 85 | return $this; |
@@ -195,10 +195,10 @@ discard block |
||
| 195 | 195 | $final_data = array_filter($final_data, function($key, $value) { |
| 196 | 196 | return in_array($key, self::$required, true) || !empty($value); |
| 197 | 197 | }, ARRAY_FILTER_USE_BOTH); |
| 198 | - $saved = (false !== file_put_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE, json_encode($final_data, JSON_PRETTY_PRINT))); |
|
| 198 | + $saved = (false !== file_put_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, json_encode($final_data, JSON_PRETTY_PRINT))); |
|
| 199 | 199 | self::getInstance()->loadConfigData(); |
| 200 | 200 | $saved = true; |
| 201 | - } catch (ConfigException $e) { |
|
| 201 | + }catch (ConfigException $e) { |
|
| 202 | 202 | Logger::log($e->getMessage(), LOG_ERR); |
| 203 | 203 | } |
| 204 | 204 | return $saved; |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | */ |
| 231 | 231 | public function loadConfigData() |
| 232 | 232 | { |
| 233 | - self::$config = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE), true) ?: []; |
|
| 233 | + self::$config = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE), true) ?: []; |
|
| 234 | 234 | $this->debug = array_key_exists('debug', self::$config) ? (bool)self::$config['debug'] : FALSE; |
| 235 | 235 | } |
| 236 | 236 | |
@@ -251,8 +251,8 @@ discard block |
||
| 251 | 251 | */ |
| 252 | 252 | public static function getParam($key, $defaultValue = null, $module = null) |
| 253 | 253 | { |
| 254 | - if(null !== $module) { |
|
| 255 | - return self::getParam(strtolower($module) . '.' . $key, self::getParam($key, $defaultValue)); |
|
| 254 | + if (null !== $module) { |
|
| 255 | + return self::getParam(strtolower($module).'.'.$key, self::getParam($key, $defaultValue)); |
|
| 256 | 256 | } |
| 257 | 257 | return array_key_exists($key, self::$config) ? self::$config[$key] : $defaultValue; |
| 258 | 258 | } |