psfs / core

src/base/types/traits/SystemTrait.php

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
                 $use /= 1024;
                 break;
             case "MBytes":
-                $use /= (1024 * 1024);
+                $use /= (1024*1024);
                 break;
             case "Bytes":
             default:
@@ -61,34 +61,34 @@ 
     protected function bindWarningAsExceptions()
     {
         Inspector::stats('[SystemTrait] Added handlers for errors', Inspector::SCOPE_DEBUG);
-        if(Config::getParam('debug')) {
+        if (Config::getParam('debug')) {
             Logger::log('Setting error_reporting as E_ALL');
             ini_set('error_reporting', E_ALL);
             ini_set('display_errors', 1);
         }
         //Warning & Notice handler
-        set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+        set_error_handler(function($errno, $errstr, $errfile, $errline) {
             Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]);
             return true;
         }, E_ALL | E_STRICT | E_DEPRECATED | E_USER_DEPRECATED | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR);
 
-        register_shutdown_function(function () {
+        register_shutdown_function(function() {
             $error = error_get_last() or json_last_error() or preg_last_error() or \DateTime::getLastErrors();
-            if( $error !== NULL) {
+            if ($error !== NULL) {
                 $errno   = $error["type"];
                 $errfile = $error["file"];
                 $errline = $error["line"];
                 $errstr  = $error["message"];
                 Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]);
-                if(null !== Config::getParam('log.slack.hook')) {
+                if (null !== Config::getParam('log.slack.hook')) {
                     SlackHelper::getInstance()->trace($errstr, $errfile, $errline, $error);
                 }
             }
 
-            if(self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) {
+            if (self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) {
                 SlackHelper::getInstance()->trace('Slow service endpoint', '', '', [
-                    'time' => round(self::getTs(), 3) . ' secs',
-                    'memory' => round(self::getMem('MBytes'), 3) . ' Mb',
+                    'time' => round(self::getTs(), 3).' secs',
+                    'memory' => round(self::getMem('MBytes'), 3).' Mb',
                 ]);
             }
             return false;
@@ -103,7 +103,7 @@ 
         Inspector::stats('[SystemTrait] Initializing stats (mem + ts)');
         if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) {
             $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT'];
-        } else {
+        }else {
             $this->ts = PSFS_START_TS;
         }
         $this->mem = PSFS_START_MEM;

src/base/types/traits/JsonTrait.php

Spacing +7 added lines, -7 removed lines

@@ -25,10 +25,10 @@ 
      */
     public function json($response, $statusCode = 200)
     {
-        if(Config::getParam('profiling.enable')) {
-            if(is_array($response)) {
+        if (Config::getParam('profiling.enable')) {
+            if (is_array($response)) {
                 $response['profiling'] = Inspector::getStats();
-            } elseif($response instanceof JsonResponse) {
+            } elseif ($response instanceof JsonResponse) {
                 $response = ProfilingJsonResponse::createFromPrevious($response, Inspector::getStats(Config::getParam('log.level')));
             }
         }
@@ -36,17 +36,17 @@ 
         $this->decodeJsonResponse($response);
 
         $mask = JSON_UNESCAPED_LINE_TERMINATORS | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING;
-        if(Config::getParam('output.json.strict_numbers')) {
+        if (Config::getParam('output.json.strict_numbers')) {
             $mask = JSON_UNESCAPED_LINE_TERMINATORS | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING | JSON_NUMERIC_CHECK;
         }
 
         $data = json_encode($response, $mask);
-        if(json_last_error() !== JSON_ERROR_NONE) {
+        if (json_last_error() !== JSON_ERROR_NONE) {
             Logger::log(json_last_error_msg(), LOG_CRIT);
         }
 
-        if(Config::getParam('angular.protection', false)) {
-            $data = ")]}',\n" . $data;
+        if (Config::getParam('angular.protection', false)) {
+            $data = ")]}',\n".$data;
         }
         $this->setStatus($statusCode);
         ResponseHelper::setDebugHeaders([]);

src/base/types/helpers/Inspector.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
      */
     public static function stats($name = null, $scope = self::SCOPE_PROFILE) {
         self::$debug[] = self::collect($name);
-        if($scope === self::SCOPE_PROFILE) {
+        if ($scope === self::SCOPE_PROFILE) {
             self::$profiling[] = self::collect($name);
         }
     }
@@ -47,7 +47,7 @@ 
     protected static function calculateStats(array $stats, $timestamp, $mem = 0, $files = 0) {
         return [
             'ts' => round($stats['ts'] - $timestamp, 4),
-            'mem' => round(($stats['mem'] - $mem) / 1024 / 1024, 4),
+            'mem' => round(($stats['mem'] - $mem)/1024/1024, 4),
             'files' => $stats['files'] - $files,
             'name' => $stats['name'],
         ];
@@ -63,7 +63,7 @@ 
         $mem = defined('PSFS_START_MEM') ? PSFS_START_MEM : 0;
         $files = 0;
         $scopeSelected = $scope === self::SCOPE_DEBUG ? self::$debug : self::$profiling;
-        foreach($scopeSelected as &$value) {
+        foreach ($scopeSelected as &$value) {
             $value = self::calculateStats($value, $timestamp, $mem, $files);
         }
         $scopeSelected[] = self::calculateStats(self::collect('Profiling collect ends'), $timestamp, $mem, $files);

src/base/types/helpers/I18nHelper.php

Spacing +13 added lines, -13 removed lines

@@ -28,7 +28,7 @@ 
         $locale = Request::header('X-API-LANG', $default);
         if (empty($locale)) {
             $locale = Security::getInstance()->getSessionKey(self::PSFS_SESSION_LANGUAGE_KEY);
-            if(empty($locale) && array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
+            if (empty($locale) && array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
                 $BrowserLocales = explode(",", str_replace("-", "_", $_SERVER["HTTP_ACCEPT_LANGUAGE"])); // brosers use en-US, Linux uses en_US
                 for ($i = 0, $ct = count($BrowserLocales); $i < $ct; $i++) {
                     list($BrowserLocales[$i]) = explode(";", $BrowserLocales[$i]); //trick for "en;q=0.8"
@@ -44,8 +44,8 @@ 
         // TODO check more en locales
         if (strtolower($locale) === 'en') {
             $locale = 'en_GB';
-        } else {
-            $locale = $locale . '_' . strtoupper($locale);
+        }else {
+            $locale = $locale.'_'.strtoupper($locale);
         }
         $default_locales = explode(',', Config::getParam('i18n.locales', ''));
         if (!in_array($locale, array_merge($default_locales, self::$langs))) {
@@ -66,7 +66,7 @@ 
         $translations = array();
         if (file_exists($absoluteTranslationFileName)) {
             @include($absoluteTranslationFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }
 
@@ -81,13 +81,13 @@ 
     public static function setLocale($default = null)
     {
         $locale = self::extractLocale($default);
-        Inspector::stats('[i18NHelper] Set locale to project [' . $locale . ']', Inspector::SCOPE_DEBUG);
+        Inspector::stats('[i18NHelper] Set locale to project ['.$locale.']', Inspector::SCOPE_DEBUG);
         // Load translations
-        putenv("LC_ALL=" . $locale);
+        putenv("LC_ALL=".$locale);
         setlocale(LC_ALL, $locale);
         // Load the locale path
-        $localePath = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
-        Logger::log('Set locale dir ' . $localePath);
+        $localePath = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
+        Logger::log('Set locale dir '.$localePath);
         GeneratorHelper::createDir($localePath);
         bindtextdomain('translations', $localePath);
         textdomain('translations');
@@ -123,9 +123,9 @@ 
      */
     public static function checkI18Class($namespace) {
         $isI18n = false;
-        if(preg_match('/I18n$/i', $namespace)) {
+        if (preg_match('/I18n$/i', $namespace)) {
             $parentClass = preg_replace('/I18n$/i', '', $namespace);
-            if(Router::exists($parentClass)) {
+            if (Router::exists($parentClass)) {
                 $isI18n = true;
             }
         }
@@ -151,12 +151,12 @@ 
             ['i', 'i', 'i', 'i', 'I', 'I', 'I', 'I'],
             ['o', 'o', 'o', 'o', 'O', 'O', 'O', 'O'],
             ['u', 'u', 'u', 'u', 'U', 'U', 'U', 'U'],
-            ['n', 'N', 'c', 'C',],
+            ['n', 'N', 'c', 'C', ],
         ];
 
         $text = filter_var($string, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
-        for($i = 0, $total = count($from); $i < $total; $i++) {
-            $text = str_replace($from[$i],$to[$i], $text);
+        for ($i = 0, $total = count($from); $i < $total; $i++) {
+            $text = str_replace($from[$i], $to[$i], $text);
         }
 
         return $text;

src/base/types/helpers/RouterHelper.php

Spacing +13 added lines, -13 removed lines

@@ -20,11 +20,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')) {
+        if ($reflectionClass->hasMethod('getInstance')) {
             $class = $reflectionClass->getMethod('getInstance')->invoke(null, $action['method']);
-        } else {
+        }else {
             $class = new $actionClass;
         }
         return $class;
@@ -113,7 +113,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;
     }
 
@@ -124,7 +124,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';
@@ -134,13 +134,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,
         ];
     }
 
@@ -164,12 +164,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);
-                } elseif(!$param->isOptional()) {
+                    $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex);
+                } elseif (!$param->isOptional()) {
                     $requirements[] = $param->getName();
                 }
             }
-        } else {
+        }else {
             $default = $regex;
         }
 
@@ -265,7 +265,7 @@ 
             $httpMethod = self::extractReflectionHttpMethod($docComments);
             $icon = self::extractDocIcon($docComments);
             $label = self::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/Cache.php

Spacing +13 added lines, -13 removed lines

@@ -55,7 +55,7 @@ 
     {
         GeneratorHelper::createDir(dirname($path));
         if (false === FileHelper::writeFile($path, $data)) {
-            throw new ConfigException(t('No se tienen los permisos suficientes para escribir en el fichero ') . $path);
+            throw new ConfigException(t('No se tienen los permisos suficientes para escribir en el fichero ').$path);
         }
     }
 
@@ -69,7 +69,7 @@ 
     {
         Inspector::stats('[Cache] Gathering data from cache', Inspector::SCOPE_DEBUG);
         $data = null;
-        $absolutePath = $absolute ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = $absolute ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         if (file_exists($absolutePath)) {
             $data = FileHelper::readFile($absolutePath);
         }
@@ -85,7 +85,7 @@ 
     private function hasExpiredCache($path, $expires = 300, $absolute = false)
     {
         Inspector::stats('[Cache] Checking expiration', Inspector::SCOPE_DEBUG);
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $lasModificationDate = filemtime($absolutePath);
         return ($lasModificationDate + $expires <= time());
     }
@@ -152,7 +152,7 @@ 
     {
         Inspector::stats('[Cache] Store data in cache', Inspector::SCOPE_DEBUG);
         $data = self::transformData($data, $transform);
-        $absolutePath = $absolute ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = $absolute ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $this->saveTextToFile($data, $absolutePath);
     }
 
@@ -168,12 +168,12 @@ 
     public function readFromCache($path, $expires = 300, $function = null, $transform = Cache::TEXT)
     {
         $data = null;
-        Inspector::stats('[Cache] Reading data from cache: ' . json_encode(['path' => $path]), Inspector::SCOPE_DEBUG);
-        if (file_exists(CACHE_DIR . DIRECTORY_SEPARATOR . $path)) {
+        Inspector::stats('[Cache] Reading data from cache: '.json_encode(['path' => $path]), Inspector::SCOPE_DEBUG);
+        if (file_exists(CACHE_DIR.DIRECTORY_SEPARATOR.$path)) {
             if (is_callable($function) && $this->hasExpiredCache($path, $expires)) {
                 $data = $function();
                 $this->storeData($path, $data, $transform, false, $expires);
-            } else {
+            }else {
                 $data = $this->getDataFromFile($path, $transform);
             }
         }
@@ -219,20 +219,20 @@ 
             $query[Api::HEADER_API_LANG] = Request::header(Api::HEADER_API_LANG, 'es');
             $filename = FileHelper::generateHashFilename($action['http'], $action['slug'], $query);
             $hashPath = FileHelper::generateCachePath($action, $query);
-            Inspector::stats('[Cache] Cache file calculated: ' . json_encode(['file' => $filename, 'hash' => $hashPath]), Inspector::SCOPE_DEBUG);
+            Inspector::stats('[Cache] Cache file calculated: '.json_encode(['file' => $filename, 'hash' => $hashPath]), Inspector::SCOPE_DEBUG);
             Logger::log('Cache file calculated', LOG_DEBUG, ['file' => $filename, 'hash' => $hashPath]);
         }
         return [$hashPath, $filename];
     }
 
     public function flushCache() {
-        if(Config::getParam('cache.data.enable', false)) {
+        if (Config::getParam('cache.data.enable', false)) {
             Inspector::stats('[Cache] Flushing cache', Inspector::SCOPE_DEBUG);
             $action = Security::getInstance()->getSessionKey(self::CACHE_SESSION_VAR);
-            if(is_array($action)) {
-                $hashPath = FileHelper::generateCachePath($action, $action['params']) . '..' . DIRECTORY_SEPARATOR . ' .. ' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-                if(!file_exists($hashPath)) {
-                    $hashPath = CACHE_DIR . DIRECTORY_SEPARATOR . $hashPath;
+            if (is_array($action)) {
+                $hashPath = FileHelper::generateCachePath($action, $action['params']).'..'.DIRECTORY_SEPARATOR.' .. '.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
+                if (!file_exists($hashPath)) {
+                    $hashPath = CACHE_DIR.DIRECTORY_SEPARATOR.$hashPath;
                 }
                 FileHelper::deleteDir($hashPath);
             }

src/base/Router.php

Spacing +50 added lines, -50 removed lines

@@ -75,11 +75,11 @@ 
      */
     public function init()
     {
-        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', $this->cacheType, TRUE);
+        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', $this->cacheType, TRUE);
         if (empty($this->routing) || Config::getParam('debug', true)) {
             $this->debugLoad();
-        } else {
-            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->cacheType, TRUE);
+        }else {
+            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->cacheType, TRUE);
         }
         $this->checkExternalModules(false);
         $this->setLoaded();
@@ -117,9 +117,9 @@ 
         }
 
         $notFoundRoute = Config::getParam('route.404');
-        if(null !== $notFoundRoute) {
+        if (null !== $notFoundRoute) {
             Request::getInstance()->redirect($this->getRoute($notFoundRoute, true));
-        } else {
+        }else {
             return $template->render('error.html.twig', array(
                 'exception' => $exception,
                 'trace' => $exception->getTraceAsString(),
@@ -170,12 +170,12 @@ 
         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($route);
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             Logger::log($r->getMessage(), LOG_WARNING);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -193,7 +193,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;
@@ -208,12 +208,12 @@ 
                 /** @var $class \PSFS\base\types\Controller */
                 $class = RouterHelper::getClassToCall($action);
                 try {
-                    if($this->checkRequirements($action, $get)) {
+                    if ($this->checkRequirements($action, $get)) {
                         return $this->executeCachedRoute($route, $action, $class, $get);
-                    } else {
+                    }else {
                         throw new RouterException(t('La ruta no es válida'), 400);
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw $e;
                 }
@@ -229,15 +229,15 @@ 
      */
     private function checkRequirements(array $action, $params = []) {
         Inspector::stats('[Router] Checking request requirements', Inspector::SCOPE_DEBUG);
-        if(!empty($params) && !empty($action['requirements'])) {
+        if (!empty($params) && !empty($action['requirements'])) {
             $checked = 0;
-            foreach(array_keys($params) as $key) {
-                if(in_array($key, $action['requirements'], true)) {
+            foreach (array_keys($params) as $key) {
+                if (in_array($key, $action['requirements'], true)) {
                     $checked++;
                 }
             }
             $valid = count($action['requirements']) === $checked;
-        } else {
+        }else {
             $valid = true;
         }
         return $valid;
@@ -287,14 +287,14 @@ 
         $this->checkExternalModules();
         if (file_exists($modulesPath)) {
             $modules = $this->finder->directories()->in($modulesPath)->depth(0);
-            if($modules->hasResults()) {
+            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);
     }
 
     /**
@@ -310,7 +310,7 @@ 
             $home_params = 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)) {
                     $home_params = $params;
                 }
                 unset($method);
@@ -332,14 +332,14 @@ 
     private function inspectDir($origen, $namespace = 'PSFS', $routing = [])
     {
         $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->depth(1)->name('*.php');
-        if($files->hasResults()) {
+        if ($files->hasResults()) {
             foreach ($files->getIterator() as $file) {
-                if($namespace !== 'PSFS' && method_exists($file, 'getRelativePathname')) {
-                    $filename = '\\' . str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname()));
-                } else {
+                if ($namespace !== 'PSFS' && method_exists($file, 'getRelativePathname')) {
+                    $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->finder = new Finder();
@@ -368,7 +368,7 @@ 
     private function addRouting($namespace, &$routing, $module = 'PSFS')
     {
         if (self::exists($namespace)) {
-            if(I18nHelper::checkI18Class($namespace)) {
+            if (I18nHelper::checkI18Class($namespace)) {
                 return $routing;
             }
             $reflection = new \ReflectionClass($namespace);
@@ -410,7 +410,7 @@ 
             if (!$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);
             }
@@ -426,11 +426,11 @@ 
      */
     public function simpatize()
     {
-        $translationFileName = 'translations' . DIRECTORY_SEPARATOR . 'routes_translations.php';
-        $absoluteTranslationFileName = CACHE_DIR . DIRECTORY_SEPARATOR . $translationFileName;
+        $translationFileName = 'translations'.DIRECTORY_SEPARATOR.'routes_translations.php';
+        $absoluteTranslationFileName = CACHE_DIR.DIRECTORY_SEPARATOR.$translationFileName;
         $this->generateSlugs($absoluteTranslationFileName);
         GeneratorHelper::createDir(CONFIG_DIR);
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', array($this->routing, $this->slugs), Cache::JSON, TRUE);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', array($this->routing, $this->slugs), Cache::JSON, TRUE);
 
         return $this;
     }
@@ -446,18 +446,18 @@ 
     public function getRoute($slug = '', $absolute = FALSE, array $params = [])
     {
         if ('' === $slug) {
-            return $absolute ? Request::getInstance()->getRootUrl() . '/' : '/';
+            return $absolute ? Request::getInstance()->getRootUrl().'/' : '/';
         }
         if (!is_array($this->slugs) || !array_key_exists($slug, $this->slugs)) {
             throw new RouterException(t('No existe la ruta especificada'));
         }
-        $url = $absolute ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
+        $url = $absolute ? Request::getInstance()->getRootUrl().$this->slugs[$slug] : $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 = $absolute ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]['default'] : $this->routing[$this->slugs[$slug]]['default'];
+            $url = $absolute ? Request::getInstance()->getRootUrl().$this->routing[$this->slugs[$slug]]['default'] : $this->routing[$this->slugs[$slug]]['default'];
         }
 
         return preg_replace('/(GET|POST|PUT|DELETE|ALL)\#\|\#/', '', $url);
@@ -476,15 +476,15 @@ 
      * @param string $method
      */
     private function checkPreActions($class, $method) {
-        $preAction = 'pre' . ucfirst($method);
-        if(method_exists($class, $preAction)) {
+        $preAction = 'pre'.ucfirst($method);
+        if (method_exists($class, $preAction)) {
             Inspector::stats('[Router] Pre action invoked', Inspector::SCOPE_DEBUG);
             try {
-                if(false === call_user_func_array([$class, $preAction])) {
+                if (false === call_user_func_array([$class, $preAction])) {
                     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]);
             }
         }
@@ -501,7 +501,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();
@@ -509,15 +509,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) {
@@ -556,11 +556,11 @@ 
     private function loadExternalAutoloader($hydrateRoute, SplFileInfo $modulePath, $externalModulePath)
     {
         $extModule = $modulePath->getBasename();
-        $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php');
-        if(file_exists($moduleAutoloader)) {
+        $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php');
+        if (file_exists($moduleAutoloader)) {
             include_once $moduleAutoloader;
             if ($hydrateRoute) {
-                $this->routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $this->routing);
+                $this->routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $this->routing);
             }
         }
     }
@@ -574,16 +574,16 @@ 
     {
         try {
             $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module);
-            $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src';
-            if(file_exists($externalModulePath)) {
+            $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src';
+            if (file_exists($externalModulePath)) {
                 $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0);
-                if($externalModule->hasResults()) {
+                if ($externalModule->hasResults()) {
                     foreach ($externalModule->getIterator() as $modulePath) {
                         $this->loadExternalAutoloader($hydrateRoute, $modulePath, $externalModulePath);
                     }
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
             $module = null;
         }

src/base/extension/CustomTranslateExtension.php

Spacing +11 added lines, -11 removed lines

@@ -49,33 +49,33 @@ 
     {
         $session = Security::getInstance();
         self::$locale = I18nHelper::extractLocale($session->getSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY));
-        $version = self::$locale . '_' . $session->getSessionKey(self::LOCALE_CACHED_VERSION);
-        $configVersion = self::$locale . '_' . $session->getSessionKey('config.cache.var');
+        $version = self::$locale.'_'.$session->getSessionKey(self::LOCALE_CACHED_VERSION);
+        $configVersion = self::$locale.'_'.$session->getSessionKey('config.cache.var');
         if ($forceReload) {
             self::dropInstance();
             $version = null;
         }
         self::$generate = (boolean)Config::getParam('i18n.autogenerate', false);
-        if(null !== $version && $version !== $configVersion) {
+        if (null !== $version && $version !== $configVersion) {
             self::$translations = $session->getSessionKey(self::LOCALE_CACHED_TAG);
-        } else {
+        }else {
             if (!$useBase) {
                 $customKey = $customKey ?: $session->getSessionKey(self::CUSTOM_LOCALE_SESSION_KEY);
             }
             // Gather always the base translations
             $standardTranslations = [];
-            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale . '.json']);
-            if(file_exists(self::$filename)) {
+            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale.'.json']);
+            if (file_exists(self::$filename)) {
                 $standardTranslations = json_decode(file_get_contents(self::$filename), true);
             }
             // If the project has custom translations, gather them
             if (null !== $customKey) {
-                Logger::log('[' . self::class . '] Custom key detected: ' . $customKey, LOG_INFO);
-                self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale . '.json']);
+                Logger::log('['.self::class.'] Custom key detected: '.$customKey, LOG_INFO);
+                self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale.'.json']);
             }
             // Finally we merge base and custom translations to complete all the i18n set
             if (file_exists(self::$filename)) {
-                Logger::log('[' . self::class . '] Custom locale detected: ' . $customKey . ' [' . self::$locale . ']', LOG_INFO);
+                Logger::log('['.self::class.'] Custom locale detected: '.$customKey.' ['.self::$locale.']', LOG_INFO);
                 self::$translations = array_merge($standardTranslations, json_decode(file_get_contents(self::$filename), true));
                 $session->setSessionKey(self::LOCALE_CACHED_TAG, self::$translations);
                 $session->setSessionKey(self::LOCALE_CACHED_VERSION, $configVersion);
@@ -100,7 +100,7 @@ 
     public function getFilters()
     {
         return array(
-            new TwigFilter('trans', function ($message) {
+            new TwigFilter('trans', function($message) {
                 return self::_($message);
             }),
         );
@@ -125,7 +125,7 @@ 
         self::checkLoad($customKey, $forceReload);
         if (is_array(self::$translations) && array_key_exists($message, self::$translations)) {
             $translation = self::$translations[$message];
-        } else {
+        }else {
             $translation = gettext($message);
         }
         if (self::$generate) {

src/base/Logger.php

Spacing +9 added lines, -9 removed lines

@@ -16,8 +16,8 @@ 
 
 
 if (!defined('LOG_DIR')) {
-    GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-    define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+    GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+    define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
 }
 
 /**
@@ -54,7 +54,7 @@ 
     {
         $args = func_get_args();
         list($logger, $debug, $path) = $this->setup($args);
-        $this->stream = fopen($path . DIRECTORY_SEPARATOR . date('Ymd') . '.log', 'a+');
+        $this->stream = fopen($path.DIRECTORY_SEPARATOR.date('Ymd').'.log', 'a+');
         $this->addPushLogger($logger, $debug);
         $this->logLevel = Config::getParam('log.level', 'NOTICE');
     }
@@ -136,7 +136,7 @@ 
     private function createLoggerPath()
     {
         $logger = $this->setLoggerName();
-        $path = LOG_DIR . DIRECTORY_SEPARATOR . $logger . DIRECTORY_SEPARATOR . date('Y') . DIRECTORY_SEPARATOR . date('m');
+        $path = LOG_DIR.DIRECTORY_SEPARATOR.$logger.DIRECTORY_SEPARATOR.date('Y').DIRECTORY_SEPARATOR.date('m');
         GeneratorHelper::createDir($path);
 
         return $path;
@@ -158,7 +158,7 @@ 
      * @return bool
      */
     private function checkLogLevel($level = \Monolog\Logger::NOTICE) {
-        switch($this->logLevel) {
+        switch ($this->logLevel) {
             case 'DEBUG': $logPass = Monolog::DEBUG; break;
             case 'INFO': $logPass = Monolog::INFO; break;
             default:
@@ -178,10 +178,10 @@ 
      */
     public static function log($msg, $type = LOG_DEBUG, array $context = null, $force = false)
     {
-        if(null === $context) {
+        if (null === $context) {
             $context = [];
         }
-        if(Config::getParam('profiling.enable') && 'DEBUG' === Config::getParam('log.level', 'NOTICE')) {
+        if (Config::getParam('profiling.enable') && 'DEBUG' === Config::getParam('log.level', 'NOTICE')) {
             Inspector::stats($msg, Inspector::SCOPE_DEBUG);
         }
         switch ($type) {
@@ -192,7 +192,7 @@ 
                 self::getInstance()->addLog($msg, \Monolog\Logger::WARNING, $context, $force);
                 break;
             case LOG_CRIT:
-                if(Config::getParam('log.slack.hook')) {
+                if (Config::getParam('log.slack.hook')) {
                     SlackHelper::getInstance()->trace($msg, '', '', $context, $force);
                 }
                 self::getInstance()->addLog($msg, \Monolog\Logger::CRITICAL, $context, $force);
@@ -235,7 +235,7 @@ 
     {
         $context['uri'] = null !== $_SERVER && array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : 'Unknow';
         $context['method'] = null !== $_SERVER && array_key_exists('REQUEST_METHOD', $_SERVER) ? $_SERVER['REQUEST_METHOD'] : 'Unknow';
-        if(null !== $_SERVER && array_key_exists('HTTP_X_PSFS_UID', $_SERVER)) {
+        if (null !== $_SERVER && array_key_exists('HTTP_X_PSFS_UID', $_SERVER)) {
             $context['uid'] = $_SERVER['HTTP_X_PSFS_UID'];
         }
         return $context;