psfs / core

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);
         }
     }
 
@@ -89,7 +89,7 @@ 
                 "success" => FALSE,
                 "error" => $e->getMessage(),
             )), 'application/json');
-        } else {
+        }else {
             return $template->render('error.html.twig', array(
                 'exception' => $e,
                 'trace' => $e->getTraceAsString(),
@@ -140,12 +140,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;
         }
@@ -162,7 +162,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;
@@ -176,7 +176,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);
                 }
@@ -201,16 +201,16 @@ 
             $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;
-                                $this->routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, $extModule, $this->routing);
+                                $this->routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, $extModule, $this->routing);
                             }
                         }
                     }
@@ -231,11 +231,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);
     }
 
     /**
@@ -250,7 +250,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;
                 }
             }
@@ -275,7 +275,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();
 
@@ -344,7 +344,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);
             }
@@ -359,11 +359,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;
     }
@@ -381,16 +381,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);
@@ -451,19 +451,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/Singleton.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
 
     public function __construct()
     {
-        Logger::log(get_class($this) . ' constructor invoked');
+        Logger::log(get_class($this).' constructor invoked');
         $this->init();
     }
 
@@ -90,14 +90,14 @@ 
         $calledClass = get_called_class();
         try {
             $instance = InjectorHelper::constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass);
-            $setter = "set" . ucfirst($variable);
+            $setter = "set".ucfirst($variable);
             if (method_exists($calledClass, $setter)) {
                 $this->$setter($instance);
-            } else {
+            }else {
                 $this->$variable = $instance;
             }
-        } catch (\Exception $e) {
-            Logger::log($e->getMessage() . ': ' . $e->getFile() . ' [' . $e->getLine() . ']', LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log($e->getMessage().': '.$e->getFile().' ['.$e->getLine().']', LOG_ERR);
         }
         return $this;
     }
@@ -109,7 +109,7 @@ 
     {
         if (!$this->isLoaded()) {
             $filename = sha1(get_class($this));
-            $cacheFilename = "reflections" . DIRECTORY_SEPARATOR . substr($filename, 0, 2) . DIRECTORY_SEPARATOR . substr($filename, 2, 2) . DIRECTORY_SEPARATOR . $filename . ".json";
+            $cacheFilename = "reflections".DIRECTORY_SEPARATOR.substr($filename, 0, 2).DIRECTORY_SEPARATOR.substr($filename, 2, 2).DIRECTORY_SEPARATOR.$filename.".json";
             /** @var \PSFS\base\Cache $cacheService */
             $cacheService = Cache::getInstance();
             /** @var \PSFS\base\config\Config $configService */
@@ -124,8 +124,8 @@ 
                 $this->load($property, true, $class);
             }
             $this->setLoaded();
-        } else {
-            Logger::log(get_class($this) . ' already loaded', LOG_INFO);
+        }else {
+            Logger::log(get_class($this).' already loaded', LOG_INFO);
         }
     }
 }

src/base/types/helpers/RouterHelper.php

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
     public static 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;
     }
@@ -106,7 +106,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;
     }
 
@@ -117,8 +117,8 @@ 
      */
     public static function extractDomainInfo(\ReflectionClass $class, $domain)
     {
-        $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-        $path = realpath($path) . DIRECTORY_SEPARATOR;
+        $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
+        $path = realpath($path).DIRECTORY_SEPARATOR;
         $tpl_path = "templates";
         $public_path = "public";
         $model_path = "models";
@@ -128,13 +128,13 @@ 
             $model_path = ucfirst($model_path);
         }
         if ($class->hasConstant("TPL")) {
-            $tpl_path .= DIRECTORY_SEPARATOR . $class->getConstant("TPL");
+            $tpl_path .= DIRECTORY_SEPARATOR.$class->getConstant("TPL");
         }
         return [
             "base" => $path,
-            "template" => $path . $tpl_path,
-            "model" => $path . $model_path,
-            "public" => $path . $public_path,
+            "template" => $path.$tpl_path,
+            "model" => $path.$model_path,
+            "public" => $path.$public_path,
         ];
     }
 
@@ -156,9 +156,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);
     }
@@ -238,7 +238,7 @@ 
             $default = str_replace('{__DOMAIN__}', $module, $default);
             $httpMethod = RouterHelper::extractReflectionHttpMethod($docComments);
             $label = RouterHelper::extractReflectionLabel(str_replace('{__API__}', $api, $docComments));
-            $route = $httpMethod . "#|#" . $regex;
+            $route = $httpMethod."#|#".$regex;
             $info = [
                 "method" => $method->getName(),
                 "params" => $params,
@@ -265,7 +265,7 @@ 
             $default = Config::getInstance()->get('admin_action') ?: 'admin-login';
 
         }
-        if(null !== $default) {
+        if (null !== $default) {
             return Router::getInstance()->execute(Router::getInstance()->getRoute($default));
         }
         return null;

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);
     }
 }
\ No newline at end of file

src/services/GeneratorService.php

Spacing +65 added lines, -67 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 = "", $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);
@@ -93,7 +93,7 @@ 
         GeneratorHelper::createDir($mod_path);
         // Create module path
         if (false === $isModule) {
-            GeneratorHelper::createDir($mod_path . $module);
+            GeneratorHelper::createDir($mod_path.$module);
         }
     }
 
@@ -111,20 +111,20 @@ 
         $paths = [
             "Api", "Api/base", "Config", "Controller", "Form", "Models", "Public", "Templates", "Services", "Test"
         ];
-        $module_path = $isModule ? $mod_path : $mod_path . $module;
+        $module_path = $isModule ? $mod_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);
         }
 
         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);
         }
     }
 
@@ -138,7 +138,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);
@@ -157,24 +157,24 @@ 
      */
     private function createModuleModels($module, $path, $isModule = false)
     {
-        $module_path = $isModule ? $path : $path . $module;
-        $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path);
+        $module_path = $isModule ? $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");
-        $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");
     }
 
@@ -195,32 +195,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);
     }
 
@@ -235,11 +235,9 @@ 
     {
         $created = true;
         $modelPath = $isModule ?
-            $mod_path . DIRECTORY_SEPARATOR . 'Models' :
-            $mod_path . $module . DIRECTORY_SEPARATOR . 'Models';
+            $mod_path.DIRECTORY_SEPARATOR.'Models' : $mod_path.$module.DIRECTORY_SEPARATOR.'Models';
         $api_path = $isModule ?
-            $mod_path . DIRECTORY_SEPARATOR . 'Api' :
-            $mod_path . $module . DIRECTORY_SEPARATOR . 'Api';
+            $mod_path.DIRECTORY_SEPARATOR.'Api' : $mod_path.$module.DIRECTORY_SEPARATOR.'Api';
         if (file_exists($modelPath)) {
             $dir = dir($modelPath);
             while ($file = $dir->read()) {
@@ -267,7 +265,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);
     }
 
@@ -282,10 +280,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);
     }
@@ -307,7 +305,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);
     }
 
@@ -328,14 +326,14 @@ 
             "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
             "is_module" => $isModule,
         ));
-        $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,
             "is_module" => $isModule,
         ));
-        $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;
     }
 
@@ -356,7 +354,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);
     }
 
@@ -379,7 +377,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);
     }
 
@@ -397,7 +395,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);
     }
 
@@ -415,11 +413,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;
     }
@@ -444,7 +442,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);
     }
 
     /**
@@ -467,7 +465,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);
     }
 
     /**
@@ -481,12 +479,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);
                     }
                 }
             }
@@ -505,10 +503,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/command/CreateDocumentRoot.php

Spacing +11 added lines, -11 removed lines

@@ -13,14 +13,14 @@ 
         new InputArgument('path', InputArgument::OPTIONAL, 'Path en el que crear el Document Root'),
     ))
     ->setDescription('Comando de creación del Document Root del projecto')
-    ->setCode(function (InputInterface $input, OutputInterface $output) {
+    ->setCode(function(InputInterface $input, OutputInterface $output) {
         // Creates the html path
         $path = $input->getArgument('path');
         if (empty($path)) $path = WEB_DIR;
         \PSFS\base\types\helpers\GeneratorHelper::createDir($path);
         $paths = array("js", "css", "img", "media", "font");
         foreach ($paths as $htmlPath) {
-            \PSFS\base\types\helpers\GeneratorHelper::createDir($path . DIRECTORY_SEPARATOR . $htmlPath);
+            \PSFS\base\types\helpers\GeneratorHelper::createDir($path.DIRECTORY_SEPARATOR.$htmlPath);
         }
 
         // Generates the root needed files
@@ -32,19 +32,19 @@ 
             'robots' => 'robots.txt',
         ];
         foreach ($files as $templates => $filename) {
-            $text = \PSFS\base\Template::getInstance()->dump("generator/html/" . $templates . '.html.twig');
-            if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) {
-                $output->writeln('Can\t create the file ' . $filename);
-            } else {
-                $output->writeln($filename . ' created successfully');
+            $text = \PSFS\base\Template::getInstance()->dump("generator/html/".$templates.'.html.twig');
+            if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) {
+                $output->writeln('Can\t create the file '.$filename);
+            }else {
+                $output->writeln($filename.' created successfully');
             }
         }
 
         //Export base locale translations
-        if (!file_exists(BASE_DIR . DIRECTORY_SEPARATOR . 'locale')) {
-            \PSFS\base\types\helpers\GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            \PSFS\Services\GeneratorService::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+        if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) {
+            \PSFS\base\types\helpers\GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+            \PSFS\Services\GeneratorService::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
         }
 
-        $output->writeln("Document root generado en " . $path);
+        $output->writeln("Document root generado en ".$path);
     });

Braces +6 added lines, -2 removed lines

@@ -6,7 +6,9 @@ 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-if (!isset($console)) $console = new Application();
+if (!isset($console)) {
+    $console = new Application();
+}
 $console
     ->register('psfs:create:root')
     ->setDefinition(array(
@@ -16,7 +18,9 @@ 
     ->setCode(function (InputInterface $input, OutputInterface $output) {
         // Creates the html path
         $path = $input->getArgument('path');
-        if (empty($path)) $path = WEB_DIR;
+        if (empty($path)) {
+            $path = WEB_DIR;
+        }
         \PSFS\base\types\helpers\GeneratorHelper::createDir($path);
         $paths = array("js", "css", "img", "media", "font");
         foreach ($paths as $htmlPath) {

src/command/PSFSConsole.php

Spacing +10 added lines, -10 removed lines

@@ -11,20 +11,20 @@ 
  */
 // Load custom config
 $pwd = getcwd();
-$dir = $pwd . DIRECTORY_SEPARATOR . "vendor" . DIRECTORY_SEPARATOR;
+$dir = $pwd.DIRECTORY_SEPARATOR."vendor".DIRECTORY_SEPARATOR;
 
-require_once $dir . 'autoload.php';
+require_once $dir.'autoload.php';
 
 
-$project_path = $pwd . DIRECTORY_SEPARATOR . "src" . DIRECTORY_SEPARATOR;
-if (file_exists($project_path . "bootstrap.php")) {
-    include_once($project_path . "bootstrap.php");
+$project_path = $pwd.DIRECTORY_SEPARATOR."src".DIRECTORY_SEPARATOR;
+if (file_exists($project_path."bootstrap.php")) {
+    include_once($project_path."bootstrap.php");
 }
-if (file_exists($project_path . "autoload.php")) {
-    include_once($project_path . "autoload.php");
+if (file_exists($project_path."autoload.php")) {
+    include_once($project_path."autoload.php");
 }
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'bootstrap.php';
+require_once __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'bootstrap.php';
 
 $console = new Application();
 //Hidratamos con los comandos de PSFS
@@ -34,8 +34,8 @@ 
 
 //Hidratamos con los comandos de los módulos
 $domains = Router::getInstance()->getDomains();
-foreach($domains as $domain => $paths) {
-    if(!preg_match('/ROOT/i', $domain)) {
+foreach ($domains as $domain => $paths) {
+    if (!preg_match('/ROOT/i', $domain)) {
         $commands = new Finder();
         $commands->in($paths['base'])->path("Command")->name("*.php");
         foreach ($commands as $com) include_once($com->getRealPath());

Braces +6 added lines, -2 removed lines

@@ -30,7 +30,9 @@ 
 //Hidratamos con los comandos de PSFS
 $commands = new Finder();
 $commands->in(__DIR__)->notName("PSFSConsole.php");
-foreach ($commands as $com) include_once($com->getRealPath());
+foreach ($commands as $com) {
+    include_once($com->getRealPath());
+}
 
 //Hidratamos con los comandos de los módulos
 $domains = Router::getInstance()->getDomains();
@@ -38,7 +40,9 @@ 
     if(!preg_match('/ROOT/i', $domain)) {
         $commands = new Finder();
         $commands->in($paths['base'])->path("Command")->name("*.php");
-        foreach ($commands as $com) include_once($com->getRealPath());
+        foreach ($commands as $com) {
+            include_once($com->getRealPath());
+        }
     }
 }
 

src/Dispatcher.php

Spacing +14 added lines, -14 removed lines

@@ -16,7 +16,7 @@ 
 use PSFS\base\types\helpers\GeneratorHelper;
 use PSFS\controller\ConfigController;
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . "bootstrap.php";
+require_once __DIR__.DIRECTORY_SEPARATOR."bootstrap.php";
 
 /**
  * Class Dispatcher
@@ -77,13 +77,13 @@ 
     private function setLocale()
     {
         $this->locale = $this->config->get("default_language");
-        Logger::log('Set locale to project [' . $this->locale . ']');
+        Logger::log('Set locale to project ['.$this->locale.']');
         // 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';
-        Logger::log('Set locale dir ' . $locale_path);
+        $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
+        Logger::log('Set locale dir '.$locale_path);
         GeneratorHelper::createDir($locale_path);
         bindtextdomain('translations', $locale_path);
         textdomain('translations');
@@ -104,18 +104,18 @@ 
                 if (!$this->parser->isFile()) {
                     return $this->router->execute($this->actualUri);
                 }
-            } else {
+            }else {
                 return ConfigController::getInstance()->config();
             }
-        } catch (ConfigException $c) {
+        }catch (ConfigException $c) {
             return $this->dumpException($c);
-        } catch (SecurityException $s) {
+        }catch (SecurityException $s) {
             return $this->security->notAuthorized($this->actualUri);
-        } catch (UserAuthException $u) {
+        }catch (UserAuthException $u) {
             $this->redirectToHome();
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             return $this->router->httpNotFound($r);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $this->dumpException($e);
         }
     }
@@ -162,7 +162,7 @@ 
                 $use /= 1024;
                 break;
             case "MBytes":
-                $use /= (1024 * 1024);
+                $use /= (1024*1024);
                 break;
             case "Bytes":
             default:
@@ -188,7 +188,7 @@ 
         if ($this->config->getDebugMode() && $this->config->get('errors.strict', false)) {
             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);
             });
@@ -203,7 +203,7 @@ 
         Logger::log('Initializing stats (mem + ts)');
         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();