psfs / core

src/base/types/helpers/ResponseHelper.php

Spacing +6 added lines, -6 removed lines

@@ -76,9 +76,9 @@ 
             Logger::log('Adding debug headers to render response');
             $vars["__DEBUG__"]["includes"] = get_included_files();
             $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            header('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s');
-            header('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes');
-            header('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened');
+            header('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s');
+            header('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes');
+            header('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened');
         }
 
         return $vars;
@@ -93,7 +93,7 @@ 
      */
     public static function httpNotFound(Exception $exception = NULL, $isJson = false)
     {
-        if(self::isTest()) {
+        if (self::isTest()) {
             return 404;
         }
         Inspector::stats('[Router] Throw not found exception', Inspector::SCOPE_DEBUG);
@@ -108,9 +108,9 @@ 
         }
 
         $notFoundRoute = Config::getParam('route.404');
-        if(null !== $notFoundRoute) {
+        if (null !== $notFoundRoute) {
             Request::getInstance()->redirect(Router::getInstance()->getRoute($notFoundRoute, true));
-        } else {
+        }else {
             return $template->render('error.html.twig', array(
                 'exception' => $exception,
                 'trace' => $exception->getTraceAsString(),

src/base/types/helpers/RouterHelper.php

Spacing +12 added lines, -12 removed lines

@@ -24,11 +24,11 @@ 
     {
         Inspector::stats('[RouterHelper] Getting class to call for executing the request action', Inspector::SCOPE_DEBUG);
         Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action);
-        $actionClass = class_exists($action['class']) ? $action['class'] : "\\" . $action['class'];
+        $actionClass = class_exists($action['class']) ? $action['class'] : "\\".$action['class'];
         $reflectionClass = new ReflectionClass($actionClass);
         if ($reflectionClass->hasMethod('getInstance')) {
             $class = $reflectionClass->getMethod('getInstance')->invoke(null, $action['method']);
-        } else {
+        }else {
             $class = new $actionClass;
         }
         return $class;
@@ -62,7 +62,7 @@ 
     public static function extractComponents($route, $pattern)
     {
         Inspector::stats('[RouterHelper] Extracting parts for the request to execute', Inspector::SCOPE_DEBUG);
-        if(Config::getParam('allow.double.slashes', true)) {
+        if (Config::getParam('allow.double.slashes', true)) {
             $route = preg_replace("/\/\//", '/', $route);
         }
         $url = parse_url($route);
@@ -120,7 +120,7 @@ 
         $expr = preg_quote($expr, '/');
         $expr = str_replace('###', '(.*)', $expr);
         $expr2 = preg_replace('/\(\.\*\)$/', '', $expr);
-        $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path);
+        $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path);
         return $matched;
     }
 
@@ -131,7 +131,7 @@ 
      */
     public static function extractDomainInfo(ReflectionClass $class, $domain)
     {
-        $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
+        $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
         $templatesPath = 'templates';
         $publicPath = 'public';
         $modelsPath = 'models';
@@ -141,13 +141,13 @@ 
             $modelsPath = ucfirst($modelsPath);
         }
         if ($class->hasConstant('TPL')) {
-            $templatesPath .= DIRECTORY_SEPARATOR . $class->getConstant('TPL');
+            $templatesPath .= DIRECTORY_SEPARATOR.$class->getConstant('TPL');
         }
         return [
             'base' => $path,
-            'template' => $path . $templatesPath,
-            'model' => $path . $modelsPath,
-            'public' => $path . $publicPath,
+            'template' => $path.$templatesPath,
+            'model' => $path.$modelsPath,
+            'public' => $path.$publicPath,
         ];
     }
 
@@ -168,12 +168,12 @@ 
             foreach ($parameters as $param) {
                 if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                     $params[$param->getName()] = $param->getDefaultValue();
-                    $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
+                    $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex);
                 } elseif (!$param->isOptional()) {
                     $requirements[] = $param->getName();
                 }
             }
-        } else {
+        }else {
             $default = $regex;
         }
 
@@ -203,7 +203,7 @@ 
             $httpMethod = AnnotationHelper::extractReflectionHttpMethod($docComments);
             $icon = AnnotationHelper::extractDocIcon($docComments);
             $label = AnnotationHelper::extractReflectionLabel(str_replace('{__API__}', $api, $docComments));
-            $route = $httpMethod . "#|#" . $regex;
+            $route = $httpMethod."#|#".$regex;
             $route = preg_replace('/(\\r|\\f|\\t|\\n)/', '', $route);
             $info = [
                 'method' => $method->getName(),

src/base/types/traits/Router/ModulesTrait.php

Spacing +10 added lines, -10 removed lines

@@ -52,11 +52,11 @@ 
         if ($files->hasResults()) {
             foreach ($files->getIterator() as $file) {
                 if ($namespace !== Router::PSFS_BASE_NAMESPACE && method_exists($file, 'getRelativePathname')) {
-                    $filename = '\\' . str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname()));
-                } else {
+                    $filename = '\\'.str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname()));
+                }else {
                     $filename = str_replace('/', '\\', str_replace($origen, '', $file->getPathname()));
                 }
-                $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing, $namespace);
+                $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing, $namespace);
             }
         }
         $this->initializeFinder();
@@ -109,7 +109,7 @@ 
             if (!is_array($this->domains)) {
                 $this->domains = [];
             }
-            $domain = '@' . $class->getConstant('DOMAIN') . '/';
+            $domain = '@'.$class->getConstant('DOMAIN').'/';
             if (!array_key_exists($domain, $this->domains)) {
                 $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain);
             }
@@ -136,11 +136,11 @@ 
     private function loadExternalAutoloader($hydrateRoute, SplFileInfo $modulePath, $externalModulePath, &$routing = [])
     {
         $extModule = $modulePath->getBasename();
-        $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php');
+        $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php');
         if (file_exists($moduleAutoloader)) {
             include_once $moduleAutoloader;
             if ($hydrateRoute) {
-                $routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $routing);
+                $routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $routing);
             }
         }
     }
@@ -155,7 +155,7 @@ 
     {
         try {
             $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module);
-            $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src';
+            $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src';
             if (file_exists($externalModulePath)) {
                 $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0);
                 if ($externalModule->hasResults()) {
@@ -164,7 +164,7 @@ 
                     }
                 }
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
         }
     }
@@ -176,9 +176,9 @@ 
     public function domainExists($domainToCheck) {
         $exists = false;
         $domains = array_keys($this->getDomains());
-        foreach($domains as $domain) {
+        foreach ($domains as $domain) {
             $cleanDomain = strtolower(str_replace('@', '', $domain));
-            if($cleanDomain === strtolower($domainToCheck)) {
+            if ($cleanDomain === strtolower($domainToCheck)) {
                 $exists = true;
                 break;
             }

src/base/types/helpers/SecurityHelper.php

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
             && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false))
         ) {
             if (!self::isTest() &&
-                null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) {
+                null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) {
                 throw new AdminCredentialsException();
             }
             if (!Security::getInstance()->checkAdmin()) {
@@ -54,8 +54,8 @@ 
         $token = '';
         $length = strlen($timestamp);
         for ($i = 0; $i < $length; $i++) {
-            $token = substr($hash, $i, 1) .
-                substr($timestamp, $i, 1) .
+            $token = substr($hash, $i, 1).
+                substr($timestamp, $i, 1).
                 $token;
         }
         return $token;
@@ -74,16 +74,16 @@ 
         $charsLength = strlen(self::RAND_SEP) - 1;
         $tsLength = strlen($timestamp);
         $i = 0;
-        $partCount = ceil($hashRest / 4);
-        $part = substr($hash, $tsLength + $partCount * $i, $partCount);
+        $partCount = ceil($hashRest/4);
+        $part = substr($hash, $tsLength + $partCount*$i, $partCount);
         while (false !== $part) {
-            $mixedToken .= $part .
-                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) .
+            $mixedToken .= $part.
+                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1).
                 substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1);
-            $part = substr($hash, $tsLength + $partCount * $i, $partCount);
+            $part = substr($hash, $tsLength + $partCount*$i, $partCount);
             $i++;
         }
-        return $mixedToken . $token;
+        return $mixedToken.$token;
     }
 
     /**
@@ -93,7 +93,7 @@ 
     private static function getTs($isOdd = null)
     {
         $timestamp = time();
-        $tsIsOdd = (bool)((int)substr($timestamp, -1) % 2);
+        $tsIsOdd = (bool)((int)substr($timestamp, -1)%2);
         if (false === $isOdd && !$tsIsOdd) {
             $timestamp--;
         } elseif (true === $isOdd && !$tsIsOdd) {
@@ -130,9 +130,9 @@ 
         $timestamp = '';
         $part = strrev($part);
         for ($i = 0, $ct = strlen($part); $i < $ct; $i++) {
-            if ($i % 2 == 0) {
+            if ($i%2 == 0) {
                 $timestamp .= substr($part, $i, 1);
-            } else {
+            }else {
                 $partToken .= substr($part, $i, 1);
             }
         }
@@ -152,7 +152,7 @@ 
             foreach ($parts as $part) {
                 $token .= $part;
             }
-            $token = $partToken . $token;
+            $token = $partToken.$token;
         }
         return [$token, $timestamp];
     }

src/base/Router.php

Spacing +23 added lines, -23 removed lines

@@ -62,8 +62,8 @@ 
      */
     public function init()
     {
-        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', $this->cacheType, TRUE);
-        $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->cacheType, TRUE);
+        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', $this->cacheType, TRUE);
+        $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->cacheType, TRUE);
         if (empty($this->routing) || Config::getParam('debug', true)) {
             $this->debugLoad();
         }
@@ -98,13 +98,13 @@ 
         try {
             //Search action and execute
             return $this->searchAction($route);
-        } catch (AccessDeniedException $e) {
-            Logger::log(t('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile() . '[' . $e->getLine() . ']']);
+        }catch (AccessDeniedException $e) {
+            Logger::log(t('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile().'['.$e->getLine().']']);
             return Admin::staticAdminLogon();
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             Logger::log($r->getMessage(), LOG_WARNING);
             $code = $r->getCode();
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -122,7 +122,7 @@ 
      */
     protected function searchAction($route)
     {
-        Inspector::stats('[Router] Searching action to execute: ' . $route, Inspector::SCOPE_DEBUG);
+        Inspector::stats('[Router] Searching action to execute: '.$route, Inspector::SCOPE_DEBUG);
         //Revisamos si tenemos la ruta registrada
         $parts = parse_url($route);
         $path = array_key_exists('path', $parts) ? $parts['path'] : $route;
@@ -139,10 +139,10 @@ 
                 try {
                     if ($this->checkRequirements($action, $get)) {
                         return $this->executeCachedRoute($route, $action, $class, $get);
-                    } else {
+                    }else {
                         throw new RouterException(t('Preconditions failed'), 412);
                     }
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw $e;
                 }
@@ -167,7 +167,7 @@ 
                 }
             }
             $valid = count($action['requirements']) === $checked;
-        } else {
+        }else {
             $valid = true;
         }
         return $valid;
@@ -190,11 +190,11 @@ 
             if ($modules->hasResults()) {
                 foreach ($modules->getIterator() as $modulePath) {
                     $module = $modulePath->getBasename();
-                    $this->routing = $this->inspectDir($modulesPath . DIRECTORY_SEPARATOR . $module, $module, $this->routing);
+                    $this->routing = $this->inspectDir($modulesPath.DIRECTORY_SEPARATOR.$module, $module, $this->routing);
                 }
             }
         }
-        $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->domains, Cache::JSON, TRUE);
+        $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->domains, Cache::JSON, TRUE);
     }
 
     /**
@@ -211,7 +211,7 @@ 
             $homeParams = NULL;
             foreach ($this->routing as $pattern => $params) {
                 list($method, $route) = RouterHelper::extractHttpRoute($pattern);
-                if (preg_match('/' . preg_quote($route, '/') . '$/i', '/' . $home)) {
+                if (preg_match('/'.preg_quote($route, '/').'$/i', '/'.$home)) {
                     $homeParams = $params;
                 }
                 unset($method);
@@ -243,18 +243,18 @@ 
     {
         $baseUrl = $absolute ? Request::getInstance()->getRootUrl() : '';
         if ('' === $slug) {
-            return $baseUrl . '/';
+            return $baseUrl.'/';
         }
         if (!is_array($this->slugs) || !array_key_exists($slug, $this->slugs)) {
             throw new RouterException(t('No existe la ruta especificada'));
         }
-        $url = $baseUrl . $this->slugs[$slug];
+        $url = $baseUrl.$this->slugs[$slug];
         if (!empty($params)) {
             foreach ($params as $key => $value) {
-                $url = str_replace('{' . $key . '}', $value, $url);
+                $url = str_replace('{'.$key.'}', $value, $url);
             }
         } elseif (!empty($this->routing[$this->slugs[$slug]]['default'])) {
-            $url = $baseUrl . $this->routing[$this->slugs[$slug]]['default'];
+            $url = $baseUrl.$this->routing[$this->slugs[$slug]]['default'];
         }
 
         return preg_replace('/(GET|POST|PUT|DELETE|ALL|HEAD|PATCH)\#\|\#/', '', $url);
@@ -266,7 +266,7 @@ 
      */
     private function checkPreActions($class, $method)
     {
-        $preAction = 'pre' . ucfirst($method);
+        $preAction = 'pre'.ucfirst($method);
         if (method_exists($class, $preAction)) {
             Inspector::stats('[Router] Pre action invoked', Inspector::SCOPE_DEBUG);
             try {
@@ -274,7 +274,7 @@ 
                     Logger::log(t('Pre action failed'), LOG_ERR, [error_get_last()]);
                     error_clear_last();
                 }
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR, [$class, $method]);
             }
         }
@@ -291,7 +291,7 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Inspector::stats('[Router] Executing route ' . $route, Inspector::SCOPE_DEBUG);
+        Inspector::stats('[Router] Executing route '.$route, Inspector::SCOPE_DEBUG);
         $action['params'] = array_merge($action['params'], $params, Request::getInstance()->getQueryParams());
         Security::getInstance()->setSessionKey(Cache::CACHE_SESSION_VAR, $action);
         $cache = Cache::needCache();
@@ -299,15 +299,15 @@ 
         $return = null;
         if (FALSE !== $cache && $action['http'] === 'GET' && Config::getParam('debug') === FALSE) {
             list($path, $cacheDataName) = $this->cache->getRequestCacheHash();
-            $cachedData = $this->cache->readFromCache('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $cache);
+            $cachedData = $this->cache->readFromCache('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $cache);
             if (NULL !== $cachedData) {
-                $headers = $this->cache->readFromCache('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', $cache, null, Cache::JSON);
+                $headers = $this->cache->readFromCache('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', $cache, null, Cache::JSON);
                 Template::getInstance()->renderCache($cachedData, $headers);
                 $execute = FALSE;
             }
         }
         if ($execute) {
-            Inspector::stats('[Router] Start executing action ' . $route, Inspector::SCOPE_DEBUG);
+            Inspector::stats('[Router] Start executing action '.$route, Inspector::SCOPE_DEBUG);
             $this->checkPreActions($class, $action['method']);
             $return = call_user_func_array([$class, $action['method']], $params);
             if (false === $return) {

src/base/types/traits/Router/SluggerTrait.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     {
         $this->generateSlugs();
         GeneratorHelper::createDir(CONFIG_DIR);
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', [$this->routing, $this->getSlugs()], Cache::JSON, TRUE);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', [$this->routing, $this->getSlugs()], Cache::JSON, TRUE);
 
         return $this;
     }