psfs / core

src/base/Router.php

Doc Comments +2 added lines, -2 removed lines

@@ -617,7 +617,7 @@ 
     /**
      * Método que extrae los parámetros de una función
      *
-     * @param array $sr
+     * @param string[] $sr
      * @param \ReflectionMethod $method
      *
      * @return array
@@ -670,7 +670,7 @@ 
      *
      * @param string $docComments
      *
-     * @return bool
+     * @return string
      */
     private function extractReflectionCacheability($docComments)
     {

Spacing +38 added lines, -38 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 previus exception');
                 $e = new \Exception(_('Page not found'), 404);
@@ -125,24 +125,24 @@ 
             $this->checkRestrictedAccess($route);
             //Search action and execute
             return $this->searchAction($route);
-        } catch (AccessDeniedException $e) {
+        }catch (AccessDeniedException $e) {
             Logger::log(_('Solicitamos credenciales de acceso a zona restringida'));
             if ('login' === Config::getInstance()->get('admin_login')) {
                 return $this->redirectLogin($route);
-            } else {
+            }else {
                 return $this->sentAuthHeader();
             }
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             if (FALSE !== preg_match('/\/$/', $route)) {
                 if (preg_match('/admin/', $route)) {
                     $default = Config::getInstance()->get('admin_action');
-                } else {
+                }else {
                     $default = Config::getInstance()->get('home_action');
                 }
 
                 return $this->execute($this->getRoute($default));
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -219,7 +219,7 @@ 
                 $class = $this->getClassToCall($action);
                 try {
                     return $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);
                 }
@@ -309,13 +309,13 @@ 
         if (file_exists($modules)) {
             $this->routing = $this->inspectDir($modules, "", $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);
         $home = Config::getInstance()->get('home_action');
         if (NULL !== $home || $home !== '') {
             $home_params = NULL;
             foreach ($this->routing as $pattern => $params) {
                 list($method, $route) = $this->extractHttpRoute($pattern);
-                if (preg_match("/" . preg_quote($route, "/") . "$/i", "/" . $home)) {
+                if (preg_match("/".preg_quote($route, "/")."$/i", "/".$home)) {
                     $home_params = $params;
                 }
             }
@@ -340,7 +340,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();
 
@@ -381,7 +381,7 @@ 
                             $httpMethod = $this->extractReflectionHttpMethod($docComments);
                             $visible = $this->extractReflectionVisibility($docComments);
                             $expiration = $this->extractReflectionCacheability($docComments);
-                            $routing[$httpMethod . "#|#" . $regex] = array(
+                            $routing[$httpMethod."#|#".$regex] = array(
                                 "class" => $namespace,
                                 "method" => $method->getName(),
                                 "params" => $params,
@@ -411,9 +411,9 @@ 
     {
         //Calculamos los dominios para las plantillas
         if ($class->hasConstant("DOMAIN")) {
-            $domain = "@" . $class->getConstant("DOMAIN") . "/";
-            $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-            $path = realpath($path) . DIRECTORY_SEPARATOR;
+            $domain = "@".$class->getConstant("DOMAIN")."/";
+            $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
+            $path = realpath($path).DIRECTORY_SEPARATOR;
             $tpl_path = "templates";
             $public_path = "public";
             $model_path = "models";
@@ -423,12 +423,12 @@ 
                 $model_path = ucfirst($model_path);
             }
             if ($class->hasConstant("TPL")) {
-                $tpl_path .= DIRECTORY_SEPARATOR . $class->getConstant("TPL");
+                $tpl_path .= DIRECTORY_SEPARATOR.$class->getConstant("TPL");
             }
             $this->domains[$domain] = array(
-                "template" => $path . $tpl_path,
-                "model" => $path . $model_path,
-                "public" => $path . $public_path,
+                "template" => $path.$tpl_path,
+                "model" => $path.$model_path,
+                "public" => $path.$public_path,
             );
         }
 
@@ -441,11 +441,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;
     }
@@ -496,16 +496,16 @@ 
     public function getRoute($slug = '', $absolute = FALSE, $params = NULL)
     {
         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);
@@ -523,7 +523,7 @@ 
             if (preg_match('/^\/admin(\/|$)/', $routePattern)) {
                 if (preg_match('/^PSFS/', $params["class"])) {
                     $profile = "superadmin";
-                } else {
+                }else {
                     $profile = "admin";
                 }
                 if (!empty($params["default"]) && preg_match('/(GET|ALL)/i', $httpMethod)) {
@@ -575,7 +575,7 @@ 
     protected function getClassToCall($action)
     {
         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"];
         $class = (method_exists($actionClass, "getInstance")) ? $actionClass::getInstance() : new $actionClass;
         return $class;
     }
@@ -594,7 +594,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;
     }
 
@@ -631,9 +631,9 @@ 
         if (count($parameters) > 0) 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);
             }
-        } else $default = $regex;
+        }else $default = $regex;
 
         return array($regex, $default, $params);
     }
@@ -689,16 +689,16 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Logger::log('Executing route ' . $route);
+        Logger::log('Executing route '.$route);
         $this->session->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 () {
+                $headers = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName.".headers", $cache, function() {
                 }, Cache::JSON);
                 Template::getInstance()->renderCache($cachedData, $headers);
                 $execute = FALSE;
@@ -747,7 +747,7 @@ 
         $translations = array();
         if (file_exists($absoluteTranslationFileName)) {
             include($absoluteTranslationFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }
 

Braces +12 added lines, -4 removed lines

@@ -286,8 +286,10 @@ 
         $_route = explode("/", $url['path']);
         $_pattern = explode("/", $pattern);
         $get = array();
-        if (!empty($_pattern)) foreach ($_pattern as $index => $component) {
+        if (!empty($_pattern)) {
+            foreach ($_pattern as $index => $component) {
             $_get = array();
+        }
             preg_match_all('/^\{(.*)\}$/i', $component, $_get);
             if (!empty($_get[1]) && isset($_route[$index])) {
                 $get[array_pop($_get[1])] = $_route[$index];
@@ -502,8 +504,10 @@ 
             throw new RouterException(_("No existe la ruta especificada"));
         }
         $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
-        if (!empty($params)) foreach ($params as $key => $value) {
+        if (!empty($params)) {
+            foreach ($params as $key => $value) {
             $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"];
         }
@@ -628,12 +632,16 @@ 
         $default = '';
         $params = array();
         $parameters = $method->getParameters();
-        if (count($parameters) > 0) foreach ($parameters as $param) {
+        if (count($parameters) > 0) {
+            foreach ($parameters as $param) {
             if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                 $params[$param->getName()] = $param->getDefaultValue();
+        }
                 $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
             }
-        } else $default = $regex;
+        } else {
+            $default = $regex;
+        }
 
         return array($regex, $default, $params);
     }

src/base/Security.php

Doc Comments +1 added lines, -1 removed lines

@@ -415,7 +415,7 @@
      * @param array $parts
      * @param int $partLength
      *
-     * @return array
+     * @return string[]
      */
     private static function extractTsAndMod(array &$parts, $partLength)
     {

Spacing +16 added lines, -16 removed lines

@@ -105,13 +105,13 @@ 
     public static function save($user)
     {
         $admins = array();
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
-            $admins = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json'), TRUE);
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
+            $admins = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json'), TRUE);
         }
-        $admins[$user['username']]['hash'] = sha1($user['username'] . $user['password']);
+        $admins[$user['username']]['hash'] = sha1($user['username'].$user['password']);
         $admins[$user['username']]['profile'] = $user['profile'];
 
-        return (FALSE !== file_put_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', json_encode($admins, JSON_PRETTY_PRINT)));
+        return (FALSE !== file_put_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', json_encode($admins, JSON_PRETTY_PRINT)));
     }
 
     /**
@@ -145,8 +145,8 @@ 
     public function getAdmins()
     {
         $admins = array();
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
-            $admins = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json'), TRUE);
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
+            $admins = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json'), TRUE);
         }
 
         return $admins;
@@ -166,7 +166,7 @@ 
         Logger::log('Checking admin session');
         if (!$this->authorized) {
             $request = Request::getInstance();
-            if (!file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
+            if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
                 //Si no hay fichero de usuarios redirigimos directamente al gestor
                 return Router::getInstance()->getAdmin()->adminers();
             }
@@ -179,7 +179,7 @@ 
             }
             if (!empty($user) && !empty($admins[$user])) {
                 $auth = $admins[$user]['hash'];
-                $this->authorized = ($auth == sha1($user . $pass));
+                $this->authorized = ($auth == sha1($user.$pass));
                 $this->admin = array(
                     'alias' => $user,
                     'profile' => $admins[$user]['profile'],
@@ -398,12 +398,12 @@ 
         $axis = 0;
         $parts = array();
         try {
-            $partLength = floor(strlen($token) / 10);
-            for ($i = 0, $ct = ceil(strlen($token) / $partLength); $i < $ct; $i++) {
+            $partLength = floor(strlen($token)/10);
+            for ($i = 0, $ct = ceil(strlen($token)/$partLength); $i < $ct; $i++) {
                 $parts[] = substr($token, $axis, $partLength);
                 $axis += $partLength;
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $partLength = 0;
         }
 
@@ -443,7 +443,7 @@ 
         $decoded = NULL;
         list($partLength, $parts) = self::extractTokenParts($token);
         list($ts, $mod) = self::extractTsAndMod($parts, $partLength);
-        $hashMod = substr(strtoupper(sha1($module)), strlen($ts) / 2, strlen($ts) * 2);
+        $hashMod = substr(strtoupper(sha1($module)), strlen($ts)/2, strlen($ts)*2);
         if (time() - (integer)$ts < 300 && $hashMod === $mod) {
             $decoded = implode('', $parts);
         }
@@ -460,16 +460,16 @@ 
     public static function generateToken($secret, $module = 'PSFS')
     {
         $ts = time();
-        $hashModule = substr(strtoupper(sha1($module)), strlen($ts) / 2, strlen($ts) * 2);
+        $hashModule = substr(strtoupper(sha1($module)), strlen($ts)/2, strlen($ts)*2);
         $hash = hash('sha256', $secret);
-        $insert = floor(strlen($hash) / strlen($ts));
+        $insert = floor(strlen($hash)/strlen($ts));
         $j = 0;
         $token = '';
         for ($i = 0, $ct = strlen($ts); $i < $ct; $i++) {
-            $token .= substr($ts, $i, 1) . substr($hash, $j, $insert) . substr($hashModule, $i, 2);
+            $token .= substr($ts, $i, 1).substr($hash, $j, $insert).substr($hashModule, $i, 2);
             $j += $insert;
         }
-        $token .= substr($hash, ($insert * strlen($ts)), strlen($hash) - ($insert * strlen($ts)));
+        $token .= substr($hash, ($insert*strlen($ts)), strlen($hash) - ($insert*strlen($ts)));
         return $token;
     }
 

src/base/Service.php

Doc Comments +2 added lines, -2 removed lines

@@ -125,8 +125,8 @@
     }
 
     /**
-     * @param $header
-     * @param null $content
+     * @param string $header
+     * @param string $content
      *
      * @return $this
      */

Spacing +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
         $this->url = NULL;
         $this->params = array();
         $this->headers = array();
-        Logger::log("Context service for " . get_called_class() . " cleared!");
+        Logger::log("Context service for ".get_called_class()." cleared!");
     }
 
     /**

src/base/Singleton.php

Spacing +11 added lines, -11 removed lines

@@ -19,7 +19,7 @@ 
 
     public function __construct()
     {
-        Logger::log(get_class($this) . ' constructor invoked');
+        Logger::log(get_class($this).' constructor invoked');
     }
 
     /**
@@ -106,14 +106,14 @@ 
         $calledClass = get_called_class();
         try {
             $instance = $this->constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass);
-            $setter = "set" . ucfirst($variable);
+            $setter = "set".ucfirst($variable);
             if (method_exists($calledClass, $setter)) {
                 $this->$setter($instance);
-            } else {
+            }else {
                 $this->$variable = $instance;
             }
-        } catch (\Exception $e) {
-            Logger::log($e->getMessage() . ': ' . $e->getFile() . ' [' . $e->getLine() . ']', LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log($e->getMessage().': '.$e->getFile().' ['.$e->getLine().']', LOG_ERR);
         }
         return $this;
     }
@@ -124,7 +124,7 @@ 
     public function init()
     {
         if (!$this->isLoaded()) {
-            $cacheFilename = "reflections" . DIRECTORY_SEPARATOR . sha1(get_class($this)) . ".json";
+            $cacheFilename = "reflections".DIRECTORY_SEPARATOR.sha1(get_class($this)).".json";
             /** @var \PSFS\base\Cache $cacheService */
             $cacheService = Cache::getInstance();
             /** @var \PSFS\base\config\Config $configService */
@@ -139,8 +139,8 @@ 
                 $this->load($property, true, $class);
             }
             $this->setLoaded();
-        } else {
-            Logger::log(get_class($this) . ' already loaded', LOG_INFO);
+        }else {
+            Logger::log(get_class($this).' already loaded', LOG_INFO);
         }
     }
 
@@ -155,7 +155,7 @@ 
         if (null === $class) {
             $class = get_class($this);
         }
-        Logger::log('Extracting annotations properties from class ' . $class);
+        Logger::log('Extracting annotations properties from class '.$class);
         $selfReflector = new \ReflectionClass($class);
         if (false !== $selfReflector->getParentClass()) {
             $properties = $this->getClassProperties($selfReflector->getParentClass()->getName());
@@ -196,13 +196,13 @@ 
      */
     private function constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass)
     {
-        Logger::log('Create inyectable instance for ' . $classNameSpace . ' into ' . get_class($this));
+        Logger::log('Create inyectable instance for '.$classNameSpace.' into '.get_class($this));
         $reflector = new \ReflectionClass($calledClass);
         $property = $reflector->getProperty($variable);
         $varInstanceType = (null === $classNameSpace) ? $this->extractVarType($property->getDocComment()) : $classNameSpace;
         if (true === $singleton && method_exists($varInstanceType, "getInstance")) {
             $instance = $varInstanceType::getInstance();
-        } else {
+        }else {
             $instance = new $varInstanceType();
         }
         return $instance;

Braces +3 added lines, -1 removed lines

@@ -135,9 +135,11 @@
                 $cacheService->storeData($cacheFilename, $properties, Cache::JSON);
             }
             /** @var \ReflectionProperty $property */
-            if (!empty($properties) && is_array($properties)) foreach ($properties as $property => $class) {
+            if (!empty($properties) && is_array($properties)) {
+                foreach ($properties as $property => $class) {
                 $this->load($property, true, $class);
             }
+            }
             $this->setLoaded();
         } else {
             Logger::log(get_class($this) . ' already loaded', LOG_INFO);

src/base/config/Config.php

Spacing +12 added lines, -12 removed lines

@@ -46,7 +46,7 @@ 
      */
     protected function init()
     {
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . "config.json")) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json")) {
             $this->loadConfigData();
         }
         return $this;
@@ -116,7 +116,7 @@ 
      */
     public function getTemplatePath()
     {
-        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+        $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR;
         return realpath($path);
     }
 
@@ -163,10 +163,10 @@ 
         $final_data = self::saveExtraParams($data);
         $saved = false;
         try {
-            Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "config.json", $final_data, Cache::JSON, true);
+            Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json", $final_data, Cache::JSON, true);
             Config::getInstance()->loadConfigData();
             $saved = true;
-        } catch (ConfigException $e) {
+        }catch (ConfigException $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $saved;
@@ -198,7 +198,7 @@ 
      */
     public function getPropelParams()
     {
-        return Cache::getInstance()->getDataFromFile(__DIR__ . DIRECTORY_SEPARATOR . 'properties.json', Cache::JSON, true);
+        return Cache::getInstance()->getDataFromFile(__DIR__.DIRECTORY_SEPARATOR.'properties.json', Cache::JSON, true);
     }
 
     /**
@@ -210,12 +210,12 @@ 
     {
         try {
             if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) {
-                throw new \Exception(_('Can\'t create directory ') . $dir);
+                throw new \Exception(_('Can\'t create directory ').$dir);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
             if (!file_exists(dirname($dir))) {
-                throw new ConfigException($e->getMessage() . $dir);
+                throw new ConfigException($e->getMessage().$dir);
             }
         }
     }
@@ -227,10 +227,10 @@ 
     {
         $rootDirs = array("css", "js", "media", "font");
         foreach ($rootDirs as $dir) {
-            if (file_exists(WEB_DIR . DIRECTORY_SEPARATOR . $dir)) {
+            if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) {
                 try {
-                    @shell_exec("rm -rf " . WEB_DIR . DIRECTORY_SEPARATOR . $dir);
-                } catch (\Exception $e) {
+                    @shell_exec("rm -rf ".WEB_DIR.DIRECTORY_SEPARATOR.$dir);
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage());
                 }
             }
@@ -242,7 +242,7 @@ 
      */
     public function loadConfigData()
     {
-        $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "config.json", Cache::JSON, TRUE) ?: array();
+        $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."config.json", Cache::JSON, TRUE) ?: array();
         $this->debug = (array_key_exists('debug', $this->config)) ? (bool)$this->config['debug'] : FALSE;
     }
 

src/base/Logger.php

Spacing +4 added lines, -4 removed lines

@@ -13,8 +13,8 @@ 
 
 
 if (!defined("LOG_DIR")) {
-    Config::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-    define("LOG_DIR", BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+    Config::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+    define("LOG_DIR", BASE_DIR.DIRECTORY_SEPARATOR.'logs');
 }
 
 /**
@@ -43,7 +43,7 @@ 
         $config = Config::getInstance();
         $args = func_get_args();
         list($logger, $debug, $path) = $this->setup($config, $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, $config);
     }
 
@@ -185,7 +185,7 @@ 
     private function createLoggerPath(Config $config)
     {
         $logger = $this->setLoggerName($config);
-        $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');
         Config::createDir($path);
 
         return $path;

src/base/Template.php

Spacing +14 added lines, -14 removed lines

@@ -132,7 +132,7 @@ 
         $this->setStatusHeader();
         $this->setAuthHeaders();
         $this->setCookieHeaders($cookies);
-        header('Content-type: ' . $contentType);
+        header('Content-type: '.$contentType);
 
     }
 
@@ -148,14 +148,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 === 200 && $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;
 
@@ -172,7 +172,7 @@ 
     {
         Logger::log('Close template render');
         $this->security->setSessionKey("lastRequest", array(
-            "url" => Request::getInstance()->getRootUrl() . Request::requestUri(),
+            "url" => Request::getInstance()->getRootUrl().Request::requestUri(),
             "ts" => microtime(true),
         ));
         $this->security->updateSession();
@@ -224,8 +224,8 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        } catch (\Exception $e) {
-            echo $e->getMessage() . "<pre>" . $e->getTraceAsString() . "</pre>";
+        }catch (\Exception $e) {
+            echo $e->getMessage()."<pre>".$e->getTraceAsString()."</pre>";
         }
         return $dump;
     }
@@ -338,7 +338,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);
@@ -360,8 +360,8 @@ 
             // force compilation
             if ($file->isFile()) {
                 try {
-                    $this->tpl->loadTemplate(str_replace($tplDir . '/', '', $file));
-                } catch (\Exception $e) {
+                    $this->tpl->loadTemplate(str_replace($tplDir.'/', '', $file));
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                 }
             }
@@ -431,7 +431,7 @@ 
             unset($_SERVER["PHP_AUTH_USER"]);
             unset($_SERVER["PHP_AUTH_PW"]);
             header_remove("Authorization");
-        } else {
+        }else {
             header('Authorization:');
         }
     }
@@ -458,9 +458,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;

src/autoload.php

Spacing +4 added lines, -4 removed lines

@@ -21,11 +21,11 @@
             $path = str_replace("\\", DIRECTORY_SEPARATOR, $class);
 
             // filepath
-            $abs_path = SOURCE_DIR . DIRECTORY_SEPARATOR . $path . ".php";
+            $abs_path = SOURCE_DIR.DIRECTORY_SEPARATOR.$path.".php";
             if (!file_exists($abs_path)) {
-                pre('→ ' . $class);
-                pre('→ ' . $path);
-                pre('→ ' . $abs_path);
+                pre('→ '.$class);
+                pre('→ '.$path);
+                pre('→ '.$abs_path);
             }
 
             // require the file

src/bootstrap.php

Spacing +9 added lines, -9 removed lines

@@ -4,16 +4,16 @@
 
 if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'src');
+}else {
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'modules');
 }
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'cache');
+if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'config');
+if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'html');
 
 //Cargamos en memoria la función de desarrollo PRE
 if (!function_exists('pre')) {

Braces +32 added lines, -12 removed lines

@@ -1,19 +1,39 @@
 <?php
-if (defined('PSFS_BOOTSTRAP_LOADED')) return;
+if (defined('PSFS_BOOTSTRAP_LOADED')) {
+    return;
+}
 use Symfony\Component\Finder\Finder;
 
-if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
+if (!defined('SOURCE_DIR')) {
+    define('SOURCE_DIR', __DIR__);
+}
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
-}
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
+    }
+    } else {
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    }
+    }
+if (!defined('LOG_DIR')) {
+    define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+}
+if (!defined('CACHE_DIR')) {
+    define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
+}
+if (!defined('CONFIG_DIR')) {
+    define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
+}
+if (!defined('WEB_DIR')) {
+    define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+}
 
 //Cargamos en memoria la función de desarrollo PRE
 if (!function_exists('pre')) {