psfs / core

src/base/Logger.php

Unused Use Statements -2 removed lines

@@ -6,10 +6,8 @@
     use Monolog\Handler\FirePHPHandler;
     use Monolog\Handler\StreamHandler;
     use Monolog\Logger as Monolog;
-    use Monolog\Processor\GitProcessor;
     use Monolog\Processor\MemoryUsageProcessor;
     use Monolog\Processor\UidProcessor;
-    use Monolog\Processor\WebProcessor;
     use PSFS\base\config\Config;
     use PSFS\base\types\SingletonTrait;
 

Spacing +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
          * @param array $context
          */
         public static function log($msg, $type = LOG_DEBUG, $context = []) {
-            switch($type) {
+            switch ($type) {
                 case LOG_DEBUG:
                     Logger::getInstance()->debugLog($msg, $context);
                     break;

src/base/Request.php

Doc Comments +4 added lines

@@ -95,6 +95,10 @@
      * @return string|null
      */
     public static function header($name) { return self::getInstance()->getHeader($name); }
+
+    /**
+     * @return string
+     */
     public function getHeader($name)
     {
         $header = null;

src/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?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__);

Braces +32 added lines, -12 removed lines

@@ -1,20 +1,40 @@
 <?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')) {

src/Dispatcher.php

Spacing +12 added lines, -12 removed lines

@@ -13,7 +13,7 @@ 
     use PSFS\base\Logger;
     use PSFS\base\Singleton;
 
-    require_once __DIR__ . DIRECTORY_SEPARATOR . "bootstrap.php";
+    require_once __DIR__.DIRECTORY_SEPARATOR."bootstrap.php";
 
     /**
      * Class Dispatcher
@@ -76,10 +76,10 @@ 
             Logger::log('Set locale to project');
             $this->locale = $this->config->get("default_language");
             // Load translations
-            putenv("LC_ALL=" . $this->locale);
+            putenv("LC_ALL=".$this->locale);
             setlocale(LC_ALL, $this->locale);
             // Load the locale path
-            $locale_path = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
+            $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
             Config::createDir($locale_path);
             bindtextdomain('translations', $locale_path);
             textdomain('translations');
@@ -99,16 +99,16 @@ 
                     if (!$this->parser->isFile()) {
                         return $this->router->execute($this->actualUri);
                     }
-                } else {
+                }else {
                     return $this->router->getAdmin()->config();
                 }
-            } catch (ConfigException $c) {
+            }catch (ConfigException $c) {
                 return $this->dumpException($c);
-            } catch (SecurityException $s) {
+            }catch (SecurityException $s) {
                 return $this->security->notAuthorized($this->actualUri);
-            } catch (RouterException $r) {
+            }catch (RouterException $r) {
                 return $this->router->httpNotFound($r);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 return $this->dumpException($e);
             }
         }
@@ -150,7 +150,7 @@ 
                     $use /= 1024;
                     break;
                 case "MBytes":
-                    $use /= (1024 * 1024);
+                    $use /= (1024*1024);
                     break;
                 case "Bytes":
                 default:
@@ -176,7 +176,7 @@ 
             if ($this->config->getDebugMode()) {
                 Logger::log('Added handlers for errors');
                 //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]);
                     throw new \Exception($errstr, 500);
                 });
@@ -189,9 +189,9 @@ 
         private function initiateStats()
         {
             Logger::log('Initialicing stats (mem + ts)');
-            if(null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) {
+            if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) {
                 $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT'];
-            } else {
+            }else {
                 $this->ts = $this->parser->getTs();
             }
             $this->mem = memory_get_usage();

src/base/Singleton.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 
     public function __construct()
     {
-        Logger::log(get_class($this) . ' constructor invoked');
+        Logger::log(get_class($this).' constructor invoked');
     }
 
     /**
@@ -41,7 +41,7 @@ 
      * @param $value
      */
     public function __set($variable, $value) {
-        if(property_exists(get_class($this), $variable)) {
+        if (property_exists(get_class($this), $variable)) {
             $this->$variable = $value;
         }
     }
@@ -98,11 +98,11 @@ 
             $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;
     }
@@ -128,7 +128,7 @@ 
             }
             $this->setLoaded();
         }else {
-            Logger::log(get_class($this) . ' already loaded', LOG_INFO);
+            Logger::log(get_class($this).' already loaded', LOG_INFO);
         }
     }
 
@@ -142,7 +142,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());
@@ -182,13 +182,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;

src/base/types/Api.php

Spacing +19 added lines, -19 removed lines

@@ -180,7 +180,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addOrders(ModelCriteria &$query)
+        private function addOrders(ModelCriteria & $query)
         {
             $orderAdded = FALSE;
             foreach ($this->order->getOrders() as $field => $direction) {
@@ -188,7 +188,7 @@ 
                     $orderAdded = TRUE;
                     if ($direction === Order::ASC) {
                         $query->addAscendingOrderByColumn($field);
-                    } else {
+                    }else {
                         $query->addDescendingOrderByColumn($field);
                     }
                 }
@@ -203,7 +203,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addExtraColumns(ModelCriteria &$query)
+        private function addExtraColumns(ModelCriteria & $query)
         {
             if (!empty($this->extraColumns)) {
                 foreach ($this->extraColumns as $expression => $columnName) {
@@ -217,7 +217,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        protected function joinTables(ModelCriteria &$query)
+        protected function joinTables(ModelCriteria & $query)
         {
             //TODO for specific implementations
         }
@@ -227,7 +227,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addFilters(ModelCriteria &$query)
+        private function addFilters(ModelCriteria & $query)
         {
             if (count($this->query) > 0) {
                 foreach ($this->query as $field => $value) {
@@ -245,7 +245,7 @@ 
                             $text = preg_replace('/(\'|\")/', '', $value);
                             $text = preg_replace('/\ /', '%', $text);
                             $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE);
-                        } else {
+                        }else {
                             $query->filterBy($tableField, $value, Criteria::EQUAL);
                         }
                     }
@@ -268,10 +268,10 @@ 
                 list($page, $limit) = $this->extractPagination();
                 if ($limit == -1) {
                     $this->list = $query->find($this->con);
-                } else {
+                }else {
                     $this->list = $query->paginate($page, $limit, $this->con);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -288,7 +288,7 @@ 
                 $this->joinTables($query);
                 $this->addExtraColumns($query);
                 $this->model = $query->findPk($pk);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -376,7 +376,7 @@ 
                     $saved = TRUE;
                     $model = $this->model->toArray();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 jpre($e->getMessage(), TRUE);
                 Logger::getInstance()->errorLog($e->getMessage());
             }
@@ -405,7 +405,7 @@ 
                         $this->model->delete($this->con);
                         $deleted = TRUE;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
                 }
             }
@@ -449,7 +449,7 @@ 
          */
         private function extractQuery()
         {
-            $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query");
+            $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query");
             /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
             $query = $queryReflector->getMethod('create')->invoke(NULL);
 
@@ -493,7 +493,7 @@ 
             if ($this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -537,7 +537,7 @@ 
             return $this->render('api.admin.html.twig', array(
                 "api"    => $this->getApi(),
                 "domain" => $this->domain,
-                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)),
+                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)),
             ));
         }
 
@@ -559,16 +559,16 @@ 
             /** @var TableMap $map */
             $map = $this->getModelTableMap();
             $fields = $map::getTableMap();
-            foreach($fields->getFieldNames() as $field) {
+            foreach ($fields->getFieldNames() as $field) {
                 $fDto = new Field($field, _($field));
                 /** @var ColumnMap $mappedColumn */
                 $mappedColumn = $fields->getColumn($field);
-                if($mappedColumn->isForeignKey()) {
+                if ($mappedColumn->isForeignKey()) {
                     $fDto->type = Field::COMBO_TYPE;
                     $fDto->required = $mappedColumn->isNotNull();
                     $relatedModel = strtolower($mappedColumn->getRelation()->getForeignTable()->getPhpName());
                     $fDto->entity = $relatedModel;
-                    $fDto->url = Router::getInstance()->getRoute('api-' . $relatedModel . '-pk');
+                    $fDto->url = Router::getInstance()->getRoute('api-'.$relatedModel.'-pk');
                 } elseif ($mappedColumn->isPrimaryKey()) {
                     $fDto->type = Field::HIDDEN_TYPE;
                     $fDto->required = false;
@@ -595,7 +595,7 @@ 
                 $return = $this->list->toArray();
                 $total = $this->list->getNbResults();
                 $pages = $this->list->getLastPage();
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
 
@@ -615,7 +615,7 @@ 
             $return = array();
             if (NULL === $model) {
                 $code = 404;
-            } else {
+            }else {
                 $return = $model->toArray();
             }
 

src/base/Service.php

Spacing +2 added lines, -2 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!");
         }
 
         /**
@@ -208,7 +208,7 @@ 
 
         protected function setOpts()
         {
-            switch(strtoupper($this->type)) {
+            switch (strtoupper($this->type)) {
                 case 'GET':
                 default:
                     curl_setopt($this->con, CURLOPT_CUSTOMREQUEST, "GET");

src/base/Router.php

Spacing +44 added lines, -44 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::getInstance()->debugLog(_('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::getInstance()->errorLog($e->getMessage());
                 throw $e;
             }
@@ -159,7 +159,7 @@ 
             $corsEnabled = Config::getInstance()->get('cors.enabled');
             $request = Request::getInstance();
             if (NULL !== $corsEnabled && null !== $request->getServer('HTTP_REFERER')) {
-                if($corsEnabled == '*' || preg_match($corsEnabled, $request->getServer('HTTP_REFERER'))) {
+                if ($corsEnabled == '*' || preg_match($corsEnabled, $request->getServer('HTTP_REFERER'))) {
                     if (!$this->headersSent) {
                         // TODO include this headers in Template class output method
                         header("Access-Control-Allow-Credentials: true");
@@ -168,9 +168,9 @@ 
                         header("Access-Control-Allow-Headers: Access-Control-Allow-Methods, Access-Control-Allow-Headers, Access-Control-Allow-Origin, Origin, X-Requested-With, Content-Type, Accept, Authorization, X-API-SEC-TOKEN, X-API-USER-TOKEN");
                         $this->headersSent = true;
                     }
-                    if(Request::getInstance()->getMethod() == 'OPTIONS') {
+                    if (Request::getInstance()->getMethod() == 'OPTIONS') {
                         Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests');
-                        header( "HTTP/1.1 200 OK" );
+                        header("HTTP/1.1 200 OK");
                         exit();
                     }
                 }
@@ -185,11 +185,11 @@ 
          */
         private function compareSlashes($routePattern, $path) {
             $pattern_sep = count(explode('/', $routePattern));
-            if(preg_match('/\/$/', $routePattern)) {
+            if (preg_match('/\/$/', $routePattern)) {
                 $pattern_sep--;
             }
             $path_sep = count(explode('/', $path));
-            if(preg_match('/\/$/', $path)) {
+            if (preg_match('/\/$/', $path)) {
                 $path_sep--;
             }
             return abs($pattern_sep - $path_sep) < 1;
@@ -218,7 +218,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);
                     }
@@ -308,13 +308,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;
                     }
                 }
@@ -339,7 +339,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();
 
@@ -380,7 +380,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,
@@ -410,9 +410,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";
@@ -422,12 +422,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,
                 );
             }
 
@@ -440,11 +440,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;
         }
@@ -495,16 +495,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);
@@ -522,12 +522,12 @@ 
                 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)) {
                         $_profile = ($params["visible"]) ? $profile : 'adminhidden';
-                        if(!array_key_exists($_profile, $routes)) {
+                        if (!array_key_exists($_profile, $routes)) {
                             $routes[$_profile] = array();
                         }
                         $routes[$_profile][] = $params["slug"];
@@ -574,7 +574,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;
         }
@@ -593,7 +593,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;
         }
 
@@ -630,9 +630,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);
         }
@@ -688,16 +688,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;
@@ -746,7 +746,7 @@ 
             $translations = array();
             if (file_exists($absoluteTranslationFileName)) {
                 include($absoluteTranslationFileName);
-            } else {
+            }else {
                 Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
             }