psfs / core

src/services/GeneratorService.php

Doc Comments +5 added lines, -6 removed lines

@@ -25,7 +25,7 @@ 
 
         /**
          * Método que revisa las traducciones directorio a directorio
-         * @param $path
+         * @param string $path
          * @param $locale
          * @return array
          */
@@ -65,7 +65,7 @@ 
          * @param string $module
          * @param boolean $force
          * @param string $type
-         * @param boolean $is_module
+         * @param boolean $isModule
          * @return mixed
          */
         public function createStructureModule($module, $force = false, $type = "", $isModule = false)
@@ -99,8 +99,8 @@ 
 
         /**
          * Servicio que genera la estructura base
-         * @param $module
-         * @param $mod_path
+         * @param string $module
+         * @param string $mod_path
          * @param boolean $isModule
          */
         private function createModulePathTree($module, $mod_path, $isModule = false)
@@ -230,7 +230,6 @@ 
         }
 
         /**
-         * @param string $module
          * @param string $mod_path
          * @param boolean $force
          * @return boolean
@@ -402,7 +401,7 @@ 
          * Method that copy resources recursively
          * @param string $dest
          * @param boolean $force
-         * @param $filename_path
+         * @param string $filename_path
          * @param boolean $debug
          */
         public static function copyResources($dest, $force, $filename_path, $debug)

Spacing +51 added lines, -51 removed lines

@@ -6,7 +6,7 @@ 
     use PSFS\base\exception\ConfigException;
     use PSFS\base\Service;
 
-    class GeneratorService extends Service{
+    class GeneratorService extends Service {
         /**
          * @Inyectable
          * @var \PSFS\base\config\Config Servicio de configuración
@@ -31,25 +31,25 @@ 
          */
         public static function findTranslations($path, $locale)
         {
-            $locale_path = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            $locale_path .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
+            $locale_path = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+            $locale_path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
 
             $translations = array();
-            if(file_exists($path))
+            if (file_exists($path))
             {
                 $d = dir($path);
-                while(false !== ($dir = $d->read()))
+                while (false !== ($dir = $d->read()))
                 {
                     Config::createDir($locale_path);
-                    if(!file_exists($locale_path . 'translations.po')) {
-                        file_put_contents($locale_path . 'translations.po', '');
+                    if (!file_exists($locale_path.'translations.po')) {
+                        file_put_contents($locale_path.'translations.po', '');
                     }
                     $inspect_path = realpath($path.DIRECTORY_SEPARATOR.$dir);
-                    $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ". $inspect_path . DIRECTORY_SEPARATOR ."*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$locale_path}translations.po";
-                    if(is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./',$dir) == 0)
+                    $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ".$inspect_path.DIRECTORY_SEPARATOR."*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$locale_path}translations.po";
+                    if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0)
                     {
-                        $res = _('Revisando directorio: ') . $inspect_path;
-                        $res .= _('Comando ejecutado: '). $cmd_php;
+                        $res = _('Revisando directorio: ').$inspect_path;
+                        $res .= _('Comando ejecutado: ').$cmd_php;
                         $res .= shell_exec($cmd_php);
                         usleep(10);
                         $translations[] = $res;
@@ -70,7 +70,7 @@ 
          */
         public function createStructureModule($module, $force = false, $type = "", $isModule = false)
         {
-            $mod_path = CORE_DIR . DIRECTORY_SEPARATOR;
+            $mod_path = CORE_DIR.DIRECTORY_SEPARATOR;
             $module = ucfirst($module);
             $this->createModulePath($module, $mod_path, $isModule);
             $this->createModulePathTree($module, $mod_path, $isModule);
@@ -92,8 +92,8 @@ 
             // Creates the src folder
             Config::createDir($mod_path);
             // Create module path
-            if(false === $isModule) {
-                Config::createDir($mod_path . $module);
+            if (false === $isModule) {
+                Config::createDir($mod_path.$module);
             }
         }
 
@@ -108,20 +108,20 @@ 
             //Creamos las carpetas CORE del módulo
             $this->log->infoLog("Generamos la estructura");
             $paths = array("Api", "Api/base", "Config", "Controller", "Form", "Models", "Public", "Templates", "Services", "Test");
-            $module_path = $isModule ? $mod_path : $mod_path . $module;
-            foreach($paths as $path) {
-                Config::createDir($module_path . DIRECTORY_SEPARATOR . $path);
+            $module_path = $isModule ? $mod_path : $mod_path.$module;
+            foreach ($paths as $path) {
+                Config::createDir($module_path.DIRECTORY_SEPARATOR.$path);
             }
             //Creamos las carpetas de los assets
             $htmlPaths = array("css", "js", "img", "media", "font");
-            foreach($htmlPaths as $path) {
-                Config::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
+            foreach ($htmlPaths as $path) {
+                Config::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
             }
 
-            if($isModule) {
+            if ($isModule) {
                 return $this->writeTemplateToFile(json_encode([
-                    "module" => "\\" . preg_replace('/(\\\|\/)/', '\\\\',$module),
-                ], JSON_PRETTY_PRINT), $mod_path . DIRECTORY_SEPARATOR . "module.json", true);
+                    "module" => "\\".preg_replace('/(\\\|\/)/', '\\\\', $module),
+                ], JSON_PRETTY_PRINT), $mod_path.DIRECTORY_SEPARATOR."module.json", true);
             }
         }
 
@@ -135,7 +135,7 @@ 
          */
         private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '', $isModule = false)
         {
-            $module_path = $isModule ? $mod_path : $mod_path . $module;
+            $module_path = $isModule ? $mod_path : $mod_path.$module;
             $this->generateControllerTemplate($module, $module_path, $force, $controllerType);
             $this->generateServiceTemplate($module, $module_path, $force);
             $this->genereateAutoloaderTemplate($module, $module_path, $force, $isModule);
@@ -154,19 +154,19 @@ 
          */
         private function createModuleModels($module, $path, $isModule = false)
         {
-            $module_path = $isModule ? $path : $path . $module;
-            $module_path = str_replace(BASE_DIR . DIRECTORY_SEPARATOR, '', $module_path);
+            $module_path = $isModule ? $path : $path.$module;
+            $module_path = str_replace(BASE_DIR.DIRECTORY_SEPARATOR, '', $module_path);
             //Generamos las clases de propel y la configuración
-            $exec = "export PATH=\$PATH:/opt/local/bin; " . BASE_DIR . DIRECTORY_SEPARATOR . "vendor" . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "propel ";
-            $schemaOpt = " --schema-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . "Config";
-            $opt = " --config-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . "Config --output-dir=" . CORE_DIR . " --verbose";
-            $this->log->infoLog("[GENERATOR] Ejecutamos propel:\n" . $exec . "build" . $opt . $schemaOpt);
-            $ret = shell_exec($exec . "build" . $opt . $schemaOpt);
+            $exec = "export PATH=\$PATH:/opt/local/bin; ".BASE_DIR.DIRECTORY_SEPARATOR."vendor".DIRECTORY_SEPARATOR."bin".DIRECTORY_SEPARATOR."propel ";
+            $schemaOpt = " --schema-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR."Config";
+            $opt = " --config-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR."Config --output-dir=".CORE_DIR." --verbose";
+            $this->log->infoLog("[GENERATOR] Ejecutamos propel:\n".$exec."build".$opt.$schemaOpt);
+            $ret = shell_exec($exec."build".$opt.$schemaOpt);
 
             $this->log->infoLog("[GENERATOR] Generamos clases invocando a propel:\n $ret");
-            $ret = shell_exec($exec . "sql:build" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . "Config" . $schemaOpt);
+            $ret = shell_exec($exec."sql:build".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR."Config".$schemaOpt);
             $this->log->infoLog("[GENERATOR] Generamos sql invocando a propel:\n $ret");
-            $ret = shell_exec($exec . "config:convert" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . "Config");
+            $ret = shell_exec($exec."config:convert".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR."Config");
             $this->log->infoLog("[GENERATOR] Generamos configuración invocando a propel:\n $ret");
         }
 
@@ -189,7 +189,7 @@ 
                 "class" => $class,
                 "controllerType" => $controllerType,
             ));
-            return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "Controller" . DIRECTORY_SEPARATOR . "{$class}Controller.php", $force);
+            return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."Controller".DIRECTORY_SEPARATOR."{$class}Controller.php", $force);
         }
 
         /**
@@ -202,11 +202,11 @@ 
         private function generateBaseApiTemplate($module, $mod_path, $force = false, $controllerType = "")
         {
             $created = true;
-            $modelPath = $mod_path . $module . DIRECTORY_SEPARATOR . 'Models';
-            if(file_exists($modelPath)) {
+            $modelPath = $mod_path.$module.DIRECTORY_SEPARATOR.'Models';
+            if (file_exists($modelPath)) {
                 $dir = dir($modelPath);
-                while($file = $dir->read()) {
-                    if(!in_array($file, array('.', '..')) && !preg_match('/Query\.php$/i', $file) && preg_match('/\.php$/i', $file)) {
+                while ($file = $dir->read()) {
+                    if (!in_array($file, array('.', '..')) && !preg_match('/Query\.php$/i', $file) && preg_match('/\.php$/i', $file)) {
                         $filename = str_replace(".php", "", $file);
                         $this->log->infoLog("Generamos Api BASES para {$filename}");
                         $this->createApiBaseFile($module, $mod_path, $filename);
@@ -226,7 +226,7 @@ 
         {
             //Generamos el fichero de configuración
             $this->log->infoLog("Generamos fichero vacío de configuración");
-            return $this->writeTemplateToFile("<?php\n\t", $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php", $force);
+            return $this->writeTemplateToFile("<?php\n\t", $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php", $force);
         }
 
         /**
@@ -239,8 +239,8 @@ 
         {
             //Generamos el fichero de configuración
             $this->log->infoLog("Generamos ficheros para assets base");
-            $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n", $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css", $force);
-            $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();", $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js", $force);
+            $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n", $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css", $force);
+            $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();", $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js", $force);
             return ($css && $js);
         }
 
@@ -260,7 +260,7 @@ 
                 "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
                 "class" => $class,
             ));
-            return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php", $force);
+            return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php", $force);
         }
 
         /**
@@ -280,7 +280,7 @@ 
                 "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
                 "is_module" => $isModule,
             ));
-            return $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force);
+            return $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force);
         }
 
         /**
@@ -299,7 +299,7 @@ 
                 "prefix" => preg_replace('/(\\\|\/)/', '', $module),
                 "db"     => $this->config->get("db_name"),
             ));
-            return $this->writeTemplateToFile($schema, $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml", $force);
+            return $this->writeTemplateToFile($schema, $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml", $force);
         }
 
         /**
@@ -320,7 +320,7 @@ 
                 "db"     => $this->config->get("db_name"),
                 "namespace" => preg_replace('/(\\\|\/)/', '', $module),
             ));
-            return $this->writeTemplateToFile($build_properties, $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml", $force);
+            return $this->writeTemplateToFile($build_properties, $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml", $force);
         }
 
         /**
@@ -336,7 +336,7 @@ 
             $index = $this->tpl->dump("generator/index.template.twig", array(
                 "module" => $module,
             ));
-            return $this->writeTemplateToFile($index, $mod_path . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig", $force);
+            return $this->writeTemplateToFile($index, $mod_path.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig", $force);
         }
 
         /**
@@ -350,13 +350,13 @@ 
             $created = false;
             if ($force || !file_exists($filename)) {
                 try {
-                    $this->cache->storeData($filename, $fileContent, Cache::TEXT,true);
+                    $this->cache->storeData($filename, $fileContent, Cache::TEXT, true);
                     $created = true;
-                } catch(\Exception $e) {
+                }catch (\Exception $e) {
                     $this->log->errorLog($e->getMessage());
                 }
-            } else{
-                $this->log->errorLog($filename . _(' not exists or cant write'));
+            }else {
+                $this->log->errorLog($filename._(' not exists or cant write'));
             }
             return $created;
         }
@@ -376,7 +376,7 @@ 
                 "api"            => $api
             ));
 
-            return $this->writeTemplateToFile($controller, $mod_path . $module . DIRECTORY_SEPARATOR . "Api" . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
+            return $this->writeTemplateToFile($controller, $mod_path.$module.DIRECTORY_SEPARATOR."Api".DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
         }
 
         /**
@@ -395,7 +395,7 @@ 
                 "api"            => $api
             ));
 
-            return $this->writeTemplateToFile($controller, $mod_path . $module . DIRECTORY_SEPARATOR . "Api" . DIRECTORY_SEPARATOR . "{$api}.php", $force);
+            return $this->writeTemplateToFile($controller, $mod_path.$module.DIRECTORY_SEPARATOR."Api".DIRECTORY_SEPARATOR."{$api}.php", $force);
         }
 
         /**

src/controller/GeneratorController.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
      */
     public function generateModule()
     {
-        Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri());
+        Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri());
         /* @var $form \PSFS\base\config\ConfigForm */
         $form = new ModuleForm();
         $form->build();
@@ -61,9 +61,9 @@ 
                 $this->gen->createStructureModule($module, $force, $type, (bool)$is_module);
                 Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, _("Módulo %s generado correctamente")));
                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true));
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 pre($e->getMessage(), true);
-                Logger::getInstance()->infoLog($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
+                Logger::getInstance()->infoLog($e->getMessage()." [".$e->getFile().":".$e->getLine()."]");
                 throw new ConfigException('Error al generar el módulo, prueba a cambiar los permisos', 403);
             }
         }

src/base/Router.php

Spacing +42 added lines, -42 removed lines

@@ -54,12 +54,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);
         }
     }
 
@@ -79,7 +79,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);
@@ -108,8 +108,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;
             }
         }
@@ -134,24 +134,24 @@ 
             $this->checkRestrictedAccess($route);
             //Search action and execute
             $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;
         }
@@ -228,7 +228,7 @@ 
                 $class = $this->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);
                 }
@@ -317,19 +317,19 @@ 
         $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);
         $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;
                 }
             }
@@ -354,7 +354,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();
 
@@ -404,7 +404,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,
@@ -434,9 +434,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";
@@ -446,12 +446,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,
             );
         }
 
@@ -464,11 +464,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;
     }
@@ -519,16 +519,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);
@@ -546,7 +546,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)) {
@@ -598,7 +598,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;
     }
@@ -617,7 +617,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;
     }
 
@@ -654,9 +654,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);
     }
@@ -712,16 +712,16 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Logger::log('Executing route ' . $route);
+        Logger::log('Executing route '.$route);
         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 () {
+                $headers = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName.".headers", $cache, function() {
                 }, Cache::JSON);
                 Template::getInstance()->renderCache($cachedData, $headers);
                 $execute = FALSE;
@@ -768,7 +768,7 @@ 
         $translations = array();
         if (file_exists($absoluteTranslationFileName)) {
             include($absoluteTranslationFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }