psfs / core

src/services/GeneratorService.php

Doc Comments +3 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 
     /**
      * Método que revisa las traducciones directorio a directorio
-     * @param $path
+     * @param string $path
      * @param $locale
      * @return array
      */
@@ -85,7 +85,6 @@ 
      * Service that creates the root paths for the modules
      * @param string $module
      * @param string $mod_path
-     * @param boolean $isModule
      */
     private function createModulePath($module, $mod_path)
     {
@@ -99,7 +98,7 @@ 
      * Servicio que genera la estructura base
      * @param string $module
      * @param boolean $mod_path
-     * @return boolean
+     * @return boolean|null
      */
     private function createModulePathTree($module, $mod_path)
     {
@@ -464,7 +463,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 +63 added lines, -63 removed lines

@@ -32,24 +32,24 @@ 
      */
     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)) {
             $d = dir($path);
             while (false !== ($dir = $d->read())) {
                 GeneratorHelper::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 .
+                $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) {
-                    $res = _('Revisando directorio: ') . $inspect_path;
-                    $res .= _('Comando ejecutado: ') . $cmd_php;
+                if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0) {
+                    $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 = "", $apiClass = "")
     {
-        $mod_path = CORE_DIR . DIRECTORY_SEPARATOR;
+        $mod_path = CORE_DIR.DIRECTORY_SEPARATOR;
         $module = ucfirst($module);
         $this->createModulePath($module, $mod_path);
         $this->createModulePathTree($module, $mod_path);
@@ -92,7 +92,7 @@ 
         // Creates the src folder
         GeneratorHelper::createDir($mod_path);
         // Create module path
-        GeneratorHelper::createDir($mod_path . $module);
+        GeneratorHelper::createDir($mod_path.$module);
     }
 
     /**
@@ -108,14 +108,14 @@ 
         $paths = [
             "Api", "Api/base", "Config", "Controller", "Form", "Models", "Public", "Templates", "Services", "Test"
         ];
-        $module_path = $mod_path . $module;
+        $module_path = $mod_path.$module;
         foreach ($paths as $path) {
-            GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . $path);
+            GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR.$path);
         }
         //Creamos las carpetas de los assets
         $htmlPaths = array("css", "js", "img", "media", "font");
         foreach ($htmlPaths as $path) {
-            GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
+            GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
         }
     }
 
@@ -128,7 +128,7 @@ 
      */
     private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '')
     {
-        $module_path = $mod_path . $module;
+        $module_path = $mod_path.$module;
         $this->generateControllerTemplate($module, $module_path, $force, $controllerType);
         $this->generateServiceTemplate($module, $module_path, $force);
         $this->genereateAutoloaderTemplate($module, $module_path, $force);
@@ -146,28 +146,28 @@ 
      */
     private function createModuleModels($module, $path)
     {
-        $module_path = $path . $module;
-        $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path);
+        $module_path = $path.$module;
+        $module_path = str_replace(CORE_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");
 
         $configTemplate = $this->tpl->dump("generator/config.propel.template.twig", array(
             "module" => $module,
         ));
-        $this->writeTemplateToFile($configTemplate, CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . "Config" .
-            DIRECTORY_SEPARATOR . "config.php", true);
+        $this->writeTemplateToFile($configTemplate, CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR."Config".
+            DIRECTORY_SEPARATOR."config.php", true);
         $this->log->infoLog("Generado config genérico para propel:\n $ret");
     }
 
@@ -188,32 +188,32 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
             "class" => $class,
-            "controllerType" => $class . "Base",
+            "controllerType" => $class."Base",
             "is_base" => false
         ));
-        $controller = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "{$class}Controller.php", $force);
+        $controller = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller".
+            DIRECTORY_SEPARATOR."{$class}Controller.php", $force);
 
         $controllerBody = $this->tpl->dump("generator/controller.template.twig", array(
             "module" => $module,
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
-            "class" => $class . "Base",
+            "class" => $class."Base",
             "service" => $class,
             "controllerType" => $controllerType,
             "is_base" => true,
             "domain" => $class,
         ));
-        $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true);
+        $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller".
+            DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true);
 
         $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array(
             "module" => $module,
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "class" => $class,
         ));
-        $test = $this->writeTemplateToFile($testTemplate, $mod_path . DIRECTORY_SEPARATOR . "Test" .
-            DIRECTORY_SEPARATOR . "{$class}Test.php", true);
+        $test = $this->writeTemplateToFile($testTemplate, $mod_path.DIRECTORY_SEPARATOR."Test".
+            DIRECTORY_SEPARATOR."{$class}Test.php", true);
         return ($controller && $controllerBase && $test);
     }
 
@@ -227,8 +227,8 @@ 
     private function generateBaseApiTemplate($module, $mod_path, $force = false, $apiClass = "")
     {
         $created = true;
-        $modelPath = $mod_path . $module . DIRECTORY_SEPARATOR . 'Models';
-        $api_path = $mod_path . $module . DIRECTORY_SEPARATOR . 'Api';
+        $modelPath = $mod_path.$module.DIRECTORY_SEPARATOR.'Models';
+        $api_path = $mod_path.$module.DIRECTORY_SEPARATOR.'Api';
         if (file_exists($modelPath)) {
             $dir = dir($modelPath);
             while ($file = $dir->read()) {
@@ -256,7 +256,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",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php",
             $force);
     }
 
@@ -271,10 +271,10 @@ 
         //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",
+            $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",
+            $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js",
             $force);
         return ($css && $js);
     }
@@ -296,7 +296,7 @@ 
             "class" => $class,
         ));
         return $this->writeTemplateToFile($controller,
-            $mod_path . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php",
+            $mod_path.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php",
             $force);
     }
 
@@ -315,13 +315,13 @@ 
             "autoloader" => preg_replace('/(\\\|\/)/', '_', $module),
             "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
         ));
-        $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force);
+        $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force);
 
         $this->log->infoLog("Generamos el phpunit");
         $phpUnitTemplate = $this->tpl->dump("generator/phpunit.template.twig", array(
             "module" => $module,
         ));
-        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path . DIRECTORY_SEPARATOR . "phpunit.xml.dist", $force);
+        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path.DIRECTORY_SEPARATOR."phpunit.xml.dist", $force);
         return $autoload && $phpunit;
     }
 
@@ -342,7 +342,7 @@ 
             "db" => $this->config->get("db_name"),
         ));
         return $this->writeTemplateToFile($schema,
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml",
             $force);
     }
 
@@ -365,7 +365,7 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '', $module),
         ));
         return $this->writeTemplateToFile($build_properties,
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml",
             $force);
     }
 
@@ -383,7 +383,7 @@ 
             "module" => $module,
         ));
         return $this->writeTemplateToFile($index,
-            $mod_path . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig",
+            $mod_path.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig",
             $force);
     }
 
@@ -401,11 +401,11 @@ 
             try {
                 $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;
     }
@@ -434,7 +434,7 @@ 
         ));
 
         return $this->writeTemplateToFile($controller,
-            $mod_path . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
+            $mod_path.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
     }
 
     /**
@@ -457,7 +457,7 @@ 
             "class" => $class,
         ));
 
-        return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "{$api}.php", $force);
+        return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."{$api}.php", $force);
     }
 
     /**
@@ -471,12 +471,12 @@ 
     {
         if (file_exists($filename_path)) {
             $destfolder = basename($filename_path);
-            if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) {
+            if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) {
                 if (is_dir($filename_path)) {
-                    self::copyr($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
-                } else {
-                    if (@copy($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) {
-                        throw new ConfigException("Can't copy " . $filename_path . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
+                    self::copyr($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
+                }else {
+                    if (@copy($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) {
+                        throw new ConfigException("Can't copy ".$filename_path." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
                     }
                 }
             }
@@ -495,10 +495,10 @@ 
         GeneratorHelper::createDir($dst);
         while (false !== ($file = readdir($dir))) {
             if (($file != '.') && ($file != '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::copyr($src . '/' . $file, $dst . '/' . $file);
-                } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) {
-                    throw new ConfigException("Can't copy " . $src . " to " . $dst);
+                if (is_dir($src.'/'.$file)) {
+                    self::copyr($src.'/'.$file, $dst.'/'.$file);
+                } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) {
+                    throw new ConfigException("Can't copy ".$src." to ".$dst);
                 }
             }
         }

src/controller/GeneratorController.php

Spacing +4 added lines, -4 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();
@@ -57,14 +57,14 @@ 
             try {
                 $module = preg_replace('/(\\\|\/)/', '/', $module);
                 $module = preg_replace('/^\//', '', $module);
-                if(!empty($apiClass) && !class_exists($apiClass)) {
+                if (!empty($apiClass) && !class_exists($apiClass)) {
                     throw new ConfigException(_('La clase definida para la API no existe'), 501);
                 }
                 $this->gen->createStructureModule($module, false, $type, $apiClass);
                 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) {
-                Logger::getInstance()->infoLog($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
+            }catch (\Exception $e) {
+                Logger::getInstance()->infoLog($e->getMessage()." [".$e->getFile().":".$e->getLine()."]");
                 Security::getInstance()->setFlash("callback_message", $e->getMessage());
             }
         }

src/base/Router.php

Spacing +31 added lines, -31 removed lines

@@ -60,12 +60,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);
             $this->checkExternalModules(false);
         }
     }
@@ -90,7 +90,7 @@ 
                 "success" => FALSE,
                 "error" => $e->getMessage(),
             )), 'application/json');
-        } else {
+        }else {
             return $template->render('error.html.twig', array(
                 'exception' => $e,
                 'trace' => $e->getTraceAsString(),
@@ -148,12 +148,12 @@ 
             SecurityHelper::checkRestrictedAccess($route);
             //Search action and execute
             $this->searchAction($route);
-        } catch (AccessDeniedException $e) {
+        }catch (AccessDeniedException $e) {
             Logger::log(_('Solicitamos credenciales de acceso a zona restringida'));
             return Admin::staticAdminLogon($route);
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             Logger::log($r->getMessage(), LOG_WARNING);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -170,7 +170,7 @@ 
      */
     protected function searchAction($route)
     {
-        Logger::log('Searching action to execute: ' . $route, LOG_INFO);
+        Logger::log('Searching action to execute: '.$route, LOG_INFO);
         //Revisamos si tenemos la ruta registrada
         $parts = parse_url($route);
         $path = (array_key_exists('path', $parts)) ? $parts['path'] : $route;
@@ -184,7 +184,7 @@ 
                 $class = RouterHelper::getClassToCall($action);
                 try {
                     $this->executeCachedRoute($route, $action, $class, $get);
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw new RouterException($e->getMessage(), 404, $e);
                 }
@@ -213,17 +213,17 @@ 
             $externalModules = explode(',', $externalModules);
             foreach ($externalModules as &$module) {
                 $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module);
-                $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src';
+                $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src';
                 if (file_exists($externalModulePath)) {
                     $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0);
                     if (!empty($externalModule)) {
                         foreach ($externalModule as $modulePath) {
                             $extModule = $modulePath->getBasename();
-                            $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php');
+                            $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php');
                             if (file_exists($moduleAutoloader)) {
                                 @include $moduleAutoloader;
                                 if ($hydrateRoute) {
-                                    $this->routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $this->routing);
+                                    $this->routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $this->routing);
                                 }
                             }
                         }
@@ -245,11 +245,11 @@ 
             $modules = $this->finder->directories()->in($modulesPath)->depth(0);
             foreach ($modules as $modulePath) {
                 $module = $modulePath->getBasename();
-                $this->routing = $this->inspectDir($modulesPath . DIRECTORY_SEPARATOR . $module, $module, $this->routing);
+                $this->routing = $this->inspectDir($modulesPath.DIRECTORY_SEPARATOR.$module, $module, $this->routing);
             }
         }
         $this->checkExternalModules();
-        $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);
     }
 
     /**
@@ -264,7 +264,7 @@ 
             $home_params = NULL;
             foreach ($this->routing as $pattern => $params) {
                 list($method, $route) = RouterHelper::extractHttpRoute($pattern);
-                if (preg_match("/" . preg_quote($route, "/") . "$/i", "/" . $home)) {
+                if (preg_match("/".preg_quote($route, "/")."$/i", "/".$home)) {
                     $home_params = $params;
                 }
             }
@@ -289,7 +289,7 @@ 
         $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->depth(1)->name("*.php");
         foreach ($files as $file) {
             $filename = str_replace("/", '\\', str_replace($origen, '', $file->getPathname()));
-            $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing, $namespace);
+            $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing, $namespace);
         }
         $this->finder = new Finder();
 
@@ -359,7 +359,7 @@ 
             if (!$this->domains) {
                 $this->domains = [];
             }
-            $domain = "@" . $class->getConstant("DOMAIN") . "/";
+            $domain = "@".$class->getConstant("DOMAIN")."/";
             if (!array_key_exists($domain, $this->domains)) {
                 $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain);
             }
@@ -374,11 +374,11 @@ 
      */
     public function simpatize()
     {
-        $translationFileName = "translations" . DIRECTORY_SEPARATOR . "routes_translations.php";
-        $absoluteTranslationFileName = CACHE_DIR . DIRECTORY_SEPARATOR . $translationFileName;
+        $translationFileName = "translations".DIRECTORY_SEPARATOR."routes_translations.php";
+        $absoluteTranslationFileName = CACHE_DIR.DIRECTORY_SEPARATOR.$translationFileName;
         $this->generateSlugs($absoluteTranslationFileName);
         GeneratorHelper::createDir(CONFIG_DIR);
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
 
         return $this;
     }
@@ -396,16 +396,16 @@ 
     public function getRoute($slug = '', $absolute = FALSE, $params = [])
     {
         if (strlen($slug) === 0) {
-            return ($absolute) ? Request::getInstance()->getRootUrl() . '/' : '/';
+            return ($absolute) ? Request::getInstance()->getRootUrl().'/' : '/';
         }
         if (NULL === $slug || !array_key_exists($slug, $this->slugs)) {
             throw new RouterException(_("No existe la ruta especificada"));
         }
-        $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
+        $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->slugs[$slug] : $this->slugs[$slug];
         if (!empty($params)) foreach ($params as $key => $value) {
-            $url = str_replace("{" . $key . "}", $value, $url);
+            $url = str_replace("{".$key."}", $value, $url);
         } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) {
-            $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
+            $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
         }
 
         return preg_replace('/(GET|POST|PUT|DELETE|ALL)\#\|\#/', '', $url);
@@ -450,19 +450,19 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Logger::log('Executing route ' . $route, LOG_INFO);
+        Logger::log('Executing route '.$route, LOG_INFO);
         Security::getInstance()->setSessionKey("__CACHE__", $action);
         $cache = Cache::needCache();
         $execute = TRUE;
         if (FALSE !== $cache && Config::getInstance()->getDebugMode() === FALSE) {
             $cacheDataName = $this->cache->getRequestCacheHash();
-            $tmpDir = substr($cacheDataName, 0, 2) . DIRECTORY_SEPARATOR . substr($cacheDataName, 2, 2) . DIRECTORY_SEPARATOR;
-            $cachedData = $this->cache->readFromCache("json" . DIRECTORY_SEPARATOR . $tmpDir . $cacheDataName,
-                $cache, function () {
+            $tmpDir = substr($cacheDataName, 0, 2).DIRECTORY_SEPARATOR.substr($cacheDataName, 2, 2).DIRECTORY_SEPARATOR;
+            $cachedData = $this->cache->readFromCache("json".DIRECTORY_SEPARATOR.$tmpDir.$cacheDataName,
+                $cache, function() {
                 });
             if (NULL !== $cachedData) {
-                $headers = $this->cache->readFromCache("json" . DIRECTORY_SEPARATOR . $tmpDir . $cacheDataName . ".headers",
-                    $cache, function () {
+                $headers = $this->cache->readFromCache("json".DIRECTORY_SEPARATOR.$tmpDir.$cacheDataName.".headers",
+                    $cache, function() {
                     }, Cache::JSON);
                 Template::getInstance()->renderCache($cachedData, $headers);
                 $execute = FALSE;

src/base/config/Config.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
      */
     protected function init()
     {
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE)) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) {
             $this->loadConfigData();
         }
         return $this;
@@ -173,10 +173,10 @@ 
             $final_data = array_filter($final_data, function($value) {
                 return !empty($value);
             });
-            Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE, $final_data, Cache::JSON, true);
+            Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, $final_data, Cache::JSON, true);
             Config::getInstance()->loadConfigData();
             $saved = true;
-        } catch (ConfigException $e) {
+        }catch (ConfigException $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $saved;
@@ -208,7 +208,7 @@ 
      */
     public function loadConfigData()
     {
-        $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE,
+        $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE,
             Cache::JSON,
             TRUE) ?: [];
         $this->debug = (array_key_exists('debug', $this->config)) ? (bool)$this->config['debug'] : FALSE;

src/base/config/ModuleForm.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
             "Auth" => _("Requiere autenticación de usuario"),
             "AuthAdmin" => _("Requiere autenticación de administrador"),
         );
-        if(Config::getParam('psfs.auth')) {
+        if (Config::getParam('psfs.auth')) {
             $controllerTypes['SessionAuthApi'] = _('Requiere autenticación usando PSFS AUTH');
         }
         $this->add('module', array(

src/base/types/helpers/GeneratorHelper.php

Spacing +11 added lines, -11 removed lines

@@ -19,10 +19,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::deleteDir($dir . "/" . $object);
-                    } else {
-                        unlink($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::deleteDir($dir."/".$object);
+                    }else {
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -38,10 +38,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 {
-                    self::deleteDir(WEB_DIR . DIRECTORY_SEPARATOR . $dir);
-                } catch (\Exception $e) {
+                    self::deleteDir(WEB_DIR.DIRECTORY_SEPARATOR.$dir);
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage());
                 }
             }
@@ -57,12 +57,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 GeneratorException($e->getMessage() . $dir);
+                throw new GeneratorException($e->getMessage().$dir);
             }
         }
     }
@@ -73,7 +73,7 @@ 
      */
     public static function getTemplatePath()
     {
-        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+        $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR;
         return realpath($path);
     }
 

src/base/types/helpers/AdminHelper.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
     {
         $routes = [];
         foreach ($systemRoutes as $route => $params) {
-            if(isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) {
+            if (isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) {
                 $module = strtoupper($params['module']);
                 $mode = $params["visible"] ? 'visible' : 'hidden';
                 $routes[$module][$mode][] = [
@@ -41,11 +41,11 @@ 
                 ];
             }
         }
-        foreach($routes as $module => &$route) {
-            if(array_key_exists('visible', $route)) {
+        foreach ($routes as $module => &$route) {
+            if (array_key_exists('visible', $route)) {
                 uasort($route["visible"], '\PSFS\base\types\helpers\AdminHelper::sortByLabel');
             }
-            if(array_key_exists('hidden', $route)) {
+            if (array_key_exists('hidden', $route)) {
                 uasort($route["hidden"], '\PSFS\base\types\helpers\AdminHelper::sortByLabel');
             }
         }