psfs / core

src/base/Template.php

Spacing +14 added lines, -14 removed lines

@@ -130,7 +130,7 @@ 
         ResponseHelper::setStatusHeader($this->status_code);
         ResponseHelper::setAuthHeaders($this->public_zone);
         ResponseHelper::setCookieHeaders($cookies);
-        header('Content-type: ' . $contentType);
+        header('Content-type: '.$contentType);
 
     }
 
@@ -146,14 +146,14 @@ 
         Logger::log('Start output response');
         ob_start();
         $this->setReponseHeaders($contentType, $cookies);
-        header('Content-length: ' . strlen($output));
+        header('Content-length: '.strlen($output));
 
         $cache = Cache::needCache();
         if (false !== $cache && $this->status_code === Template::STATUS_OK && $this->debug === false) {
             Logger::log('Saving output response into cache');
             $cacheName = $this->cache->getRequestCacheHash();
-            $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $cacheName, $output);
-            $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $cacheName . ".headers", headers_list(), Cache::JSON);
+            $this->cache->storeData("json".DIRECTORY_SEPARATOR.$cacheName, $output);
+            $this->cache->storeData("json".DIRECTORY_SEPARATOR.$cacheName.".headers", headers_list(), Cache::JSON);
         }
         echo $output;
 
@@ -170,11 +170,11 @@ 
     {
         Logger::log('Close template render');
         Security::getInstance()->setSessionKey("lastRequest", array(
-            "url" => Request::getInstance()->getRootUrl() . Request::requestUri(),
+            "url" => Request::getInstance()->getRootUrl().Request::requestUri(),
             "ts" => microtime(true),
         ));
         Security::getInstance()->updateSession();
-        Logger::log('End request: ' . Request::requestUri(), LOG_INFO);
+        Logger::log('End request: '.Request::requestUri(), LOG_INFO);
         exit;
     }
 
@@ -223,7 +223,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $dump;
@@ -337,7 +337,7 @@ 
     public function regenerateTemplates()
     {
         $this->generateTemplatesCache();
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, true);
         $translations = [];
         if (is_array($domains)) {
             $translations = $this->parsePathTranslations($domains);
@@ -359,8 +359,8 @@ 
             // force compilation
             if ($file->isFile()) {
                 try {
-                    $this->tpl->load(str_replace($tplDir . '/', '', $file));
-                } catch (\Exception $e) {
+                    $this->tpl->load(str_replace($tplDir.'/', '', $file));
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR, ['file' => $e->getFile(), 'line' => $e->getLine()]);
                 }
             }
@@ -434,9 +434,9 @@ 
      */
     private function loadDomains()
     {
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true);
-        if(null !== $domains) {
-            foreach($domains as $domain => $paths) {
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true);
+        if (null !== $domains) {
+            foreach ($domains as $domain => $paths) {
                 $this->addPath($paths['template'], preg_replace('/(@|\/)/', '', $domain));
             }
         }
@@ -451,7 +451,7 @@ 
         $this->cache = Cache::getInstance();
         $loader = new \Twig_Loader_Filesystem(Config::getInstance()->getTemplatePath());
         $this->tpl = new \Twig_Environment($loader, array(
-            'cache' => Config::getInstance()->getCachePath() . DIRECTORY_SEPARATOR . 'twig',
+            'cache' => Config::getInstance()->getCachePath().DIRECTORY_SEPARATOR.'twig',
             'debug' => (bool)$this->debug,
             'auto_reload' => Config::getParam('twig.auto_reload', TRUE),
         ));

src/base/Router.php

Spacing +34 added lines, -34 removed lines

@@ -59,12 +59,12 @@ 
      */
     public function init()
     {
-        if (!file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json") || Config::getInstance()->getDebugMode()) {
+        if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json") || Config::getInstance()->getDebugMode()) {
             $this->hydrateRouting();
             $this->simpatize();
-        } else {
-            list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", Cache::JSON, TRUE);
-            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, TRUE);
+        }else {
+            list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", Cache::JSON, TRUE);
+            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, TRUE);
         }
     }
 
@@ -84,7 +84,7 @@ 
                 "success" => FALSE,
                 "error" => $e->getMessage(),
             )), 'application/json');
-        } else {
+        }else {
             if (NULL === $e) {
                 Logger::log('Not found page throwed without previous exception', LOG_WARNING);
                 $e = new \Exception(_('Page not found'), 404);
@@ -113,8 +113,8 @@ 
      */
     public function getAllRoutes() {
         $routes = [];
-        foreach($this->routing as $path => $route) {
-            if(array_key_exists('slug', $route)) {
+        foreach ($this->routing as $path => $route) {
+            if (array_key_exists('slug', $route)) {
                 $routes[$route['slug']] = $path;
             }
         }
@@ -139,15 +139,15 @@ 
             SecurityHelper::checkRestrictedAccess($route);
             //Search action and execute
             $this->searchAction($route);
-        } catch (AccessDeniedException $e) {
+        }catch (AccessDeniedException $e) {
             Logger::log(_('Solicitamos credenciales de acceso a zona restringida'));
             return Admin::staticAdminLogon($route);
-        } catch (RouterException $r) {
-            if(null === RouterHelper::checkDefaultRoute($route)) {
+        }catch (RouterException $r) {
+            if (null === RouterHelper::checkDefaultRoute($route)) {
                 Logger::log($r->getMessage(), LOG_WARNING);
                 throw $r;
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -164,7 +164,7 @@ 
      */
     protected function searchAction($route)
     {
-        Logger::log('Searching action to execute: ' . $route, LOG_INFO);
+        Logger::log('Searching action to execute: '.$route, LOG_INFO);
         //Revisamos si tenemos la ruta registrada
         $parts = parse_url($route);
         $path = (array_key_exists('path', $parts)) ? $parts['path'] : $route;
@@ -178,7 +178,7 @@ 
                 $class = RouterHelper::getClassToCall($action);
                 try {
                     $this->executeCachedRoute($route, $action, $class, $get);
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw new RouterException($e->getMessage(), 404, $e);
                 }
@@ -206,13 +206,13 @@ 
         $this->routing = $this->inspectDir($base, "PSFS", array());
         if (file_exists($modules)) {
             $module = "";
-            if(file_exists($modules . DIRECTORY_SEPARATOR . 'module.json')) {
-                $mod_cfg = json_decode(file_get_contents($modules . DIRECTORY_SEPARATOR . 'module.json'), true);
+            if (file_exists($modules.DIRECTORY_SEPARATOR.'module.json')) {
+                $mod_cfg = json_decode(file_get_contents($modules.DIRECTORY_SEPARATOR.'module.json'), true);
                 $module = $mod_cfg['module'];
             }
             $this->routing = $this->inspectDir($modules, $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);
     }
 
     /**
@@ -227,7 +227,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;
                 }
             }
@@ -252,7 +252,7 @@ 
         $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->name("*.php");
         foreach ($files as $file) {
             $filename = str_replace("/", '\\', str_replace($origen, '', $file->getPathname()));
-            $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing);
+            $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing);
         }
         $this->finder = new Finder();
 
@@ -291,7 +291,7 @@ 
                 }
                 foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
                     list($route, $info) = RouterHelper::extractRouteInfo($method, $api);
-                    if(null !== $route && null !== $info) {
+                    if (null !== $route && null !== $info) {
                         $info['class'] = $namespace;
                         $routing[$route] = $info;
                     }
@@ -314,11 +314,11 @@ 
     {
         //Calculamos los dominios para las plantillas
         if ($class->hasConstant("DOMAIN") && !$class->isAbstract()) {
-            if(!$this->domains) {
+            if (!$this->domains) {
                 $this->domains = [];
             }
-            $domain = "@" . $class->getConstant("DOMAIN") . "/";
-            if(!array_key_exists($domain, $this->domains)) {
+            $domain = "@".$class->getConstant("DOMAIN")."/";
+            if (!array_key_exists($domain, $this->domains)) {
                 $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain);
             }
         }
@@ -332,11 +332,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);
         Config::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;
     }
@@ -354,16 +354,16 @@ 
     public function getRoute($slug = '', $absolute = FALSE, $params = [])
     {
         if (strlen($slug) === 0) {
-            return ($absolute) ? Request::getInstance()->getRootUrl() . '/' : '/';
+            return ($absolute) ? Request::getInstance()->getRootUrl().'/' : '/';
         }
         if (NULL === $slug || !array_key_exists($slug, $this->slugs)) {
             throw new RouterException(_("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);
@@ -406,17 +406,17 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Logger::log('Executing route ' . $route, LOG_INFO);
+        Logger::log('Executing route '.$route, LOG_INFO);
         Security::getInstance()->setSessionKey("__CACHE__", $action);
         $cache = Cache::needCache();
         $execute = TRUE;
         if (FALSE !== $cache && Config::getInstance()->getDebugMode() === FALSE) {
             $cacheDataName = $this->cache->getRequestCacheHash();
-            $cachedData = $this->cache->readFromCache("templates" . DIRECTORY_SEPARATOR . $cacheDataName,
-                $cache, function () {});
+            $cachedData = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName,
+                $cache, function() {});
             if (NULL !== $cachedData) {
-                $headers = $this->cache->readFromCache("templates" . DIRECTORY_SEPARATOR . $cacheDataName . ".headers",
-                    $cache, function () {}, Cache::JSON);
+                $headers = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName.".headers",
+                    $cache, function() {}, Cache::JSON);
                 Template::getInstance()->renderCache($cachedData, $headers);
                 $execute = FALSE;
             }