psfs / core

src/controller/I18nController.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
         //Generating the templates translations
         $translations = $this->tpl->regenerateTemplates();
 
-        $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;
 
         //xgettext localizations
         $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale));

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
     public function getTranslations($locale)
     {
         //Default locale
-        if (null === $locale) $locale = $this->config->get("default_language");
+        if (null === $locale) {
+            $locale = $this->config->get("default_language");
+        }
 
         //Generating the templates translations
         $translations = $this->tpl->regenerateTemplates();

src/controller/ConfigController.php

Spacing +4 added lines, -4 removed lines

@@ -25,10 +25,10 @@ 
     public function getConfigParams() {
         $response = array_merge(Config::$required, Config::$optional);
         $domains = Router::getInstance()->getDomains();
-        foreach($domains as $domain => $routes) {
+        foreach ($domains as $domain => $routes) {
             $pDomain = str_replace('@', '', $domain);
             $pDomain = str_replace('/', '', $pDomain);
-            $response[] = strtolower($pDomain) . '.api.secret';
+            $response[] = strtolower($pDomain).'.api.secret';
         }
         return $this->json($response);
     }
@@ -42,7 +42,7 @@ 
      */
     public function config()
     {
-        Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri());
+        Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri());
         /* @var $form \PSFS\base\config\ConfigForm */
         $form = new ConfigForm();
         $form->build();
@@ -79,7 +79,7 @@ 
                 }
                 Security::getInstance()->setFlash("callback_message", _("Configuración actualizada correctamente"));
                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-config", true));
-            } else {
+            }else {
                 throw new \HttpException(_('Error al guardar la configuración, prueba a cambiar los permisos'), 403);
             }
         }

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      * @GET
      * @route /admin/routes/show
      * @visible false
-     * @return mixed
+     * @return string|null
      */
     public function getRouting()
     {

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/services/GeneratorService.php

Doc Comments +4 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
      */
@@ -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)
@@ -453,7 +453,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 +62 added lines, -64 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())) {
                 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 .
+                $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 @@ 
         Config::createDir($mod_path);
         // Create module path
         if (false === $isModule) {
-            Config::createDir($mod_path . $module);
+            Config::createDir($mod_path.$module);
         }
     }
 
@@ -110,20 +110,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) {
-            Config::createDir($module_path . DIRECTORY_SEPARATOR . $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);
+            Config::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);
         }
     }
 
@@ -137,7 +137,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);
@@ -156,24 +156,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");
     }
 
@@ -194,23 +194,23 @@ 
             "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
         ));
-        $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);
         return ($controller && $controllerBase);
     }
 
@@ -225,11 +225,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()) {
@@ -257,7 +255,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);
     }
 
@@ -272,10 +270,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);
     }
@@ -297,7 +295,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);
     }
 
@@ -318,7 +316,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);
     }
 
     /**
@@ -338,7 +336,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);
     }
 
@@ -361,7 +359,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);
     }
 
@@ -379,7 +377,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);
     }
 
@@ -397,11 +395,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;
     }
@@ -426,7 +424,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);
     }
 
     /**
@@ -449,7 +447,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);
     }
 
     /**
@@ -463,12 +461,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);
                     }
                 }
             }
@@ -487,10 +485,10 @@ 
         Config::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/base/config/Config.php

Spacing +12 added lines, -12 removed lines

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

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace PSFS\base;
 
 use PSFS\base\types\SingletonTrait;
-use PSFS\controller\UserController;
 
 
 /**

Doc Comments +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
     /**
      * Static wrapper for extracting params
      * @param string $key
-     * @param mixed|null $defaultValue
+     * @param boolean $defaultValue
      * @return mixed|null
      */
     public static function getParam($key, $defaultValue = null) {

src/base/types/Api.php

Unused Use Statements -3 removed lines

@@ -5,12 +5,9 @@
     use Propel\Runtime\ActiveQuery\ModelCriteria;
     use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
     use Propel\Runtime\Connection\ConnectionInterface;
-    use Propel\Runtime\Map\ColumnMap;
     use Propel\Runtime\Map\TableMap;
     use Propel\Runtime\Propel;
     use PSFS\base\config\Config;
-    use PSFS\base\dto\Field;
-    use PSFS\base\dto\Form;
     use PSFS\base\dto\JsonResponse;
     use PSFS\base\dto\Order;
     use PSFS\base\Logger;

Spacing +17 added lines, -17 removed lines

@@ -171,7 +171,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addOrders(ModelCriteria &$query)
+        private function addOrders(ModelCriteria & $query)
         {
             $orderAdded = FALSE;
             foreach ($this->order->getOrders() as $field => $direction) {
@@ -179,7 +179,7 @@ 
                     $orderAdded = TRUE;
                     if ($direction === Order::ASC) {
                         $query->addAscendingOrderByColumn($field);
-                    } else {
+                    }else {
                         $query->addDescendingOrderByColumn($field);
                     }
                 }
@@ -194,7 +194,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addExtraColumns(ModelCriteria &$query)
+        private function addExtraColumns(ModelCriteria & $query)
         {
             if (!empty($this->extraColumns)) {
                 foreach ($this->extraColumns as $expression => $columnName) {
@@ -208,7 +208,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        protected function joinTables(ModelCriteria &$query)
+        protected function joinTables(ModelCriteria & $query)
         {
             //TODO for specific implementations
         }
@@ -218,7 +218,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addFilters(ModelCriteria &$query)
+        private function addFilters(ModelCriteria & $query)
         {
             if (count($this->query) > 0) {
                 foreach ($this->query as $field => $value) {
@@ -236,7 +236,7 @@ 
                             $text = preg_replace('/(\'|\")/', '', $value);
                             $text = preg_replace('/\ /', '%', $text);
                             $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE);
-                        } else {
+                        }else {
                             $query->filterBy($tableField, $value, Criteria::EQUAL);
                         }
                     }
@@ -259,10 +259,10 @@ 
                 list($page, $limit) = $this->extractPagination();
                 if ($limit == -1) {
                     $this->list = $query->find($this->con);
-                } else {
+                }else {
                     $this->list = $query->paginate($page, $limit, $this->con);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR);
             }
         }
@@ -279,7 +279,7 @@ 
                 $this->joinTables($query);
                 $this->addExtraColumns($query);
                 $this->model = $query->findPk($pk);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -367,7 +367,7 @@ 
                     $saved = TRUE;
                     $model = $this->model->toArray();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR);
             }
 
@@ -395,7 +395,7 @@ 
                         $this->model->delete($this->con);
                         $deleted = TRUE;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
                 }
             }
@@ -439,7 +439,7 @@ 
          */
         private function extractQuery()
         {
-            $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query");
+            $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query");
             /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
             $query = $queryReflector->getMethod('create')->invoke($this->con);
 
@@ -483,7 +483,7 @@ 
             if (null !== $this->con && $this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -527,7 +527,7 @@ 
             return $this->render('api.admin.html.twig', array(
                 "api"    => $this->getApi(),
                 "domain" => $this->domain,
-                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)),
+                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)),
             ), [], '');
         }
 
@@ -561,12 +561,12 @@ 
             $pages = 0;
             try {
                 $this->paginate();
-                if(null !== $this->list) {
+                if (null !== $this->list) {
                     $return = $this->list->toArray();
                     $total = $this->list->getNbResults();
                     $pages = $this->list->getLastPage();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
 
@@ -585,7 +585,7 @@ 
             $return = array();
             if (NULL === $model && method_exists($model, 'toArray')) {
                 $code = 404;
-            } else {
+            }else {
                 $return = $model->toArray();
             }
 

src/base/types/helpers/ApiHelper.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
                 $fDto = self::generateNumericField($field);
             }
 
-            if(null !== $fDto) {
+            if (null !== $fDto) {
                 $form->addField($fDto);
             }
         }
@@ -54,7 +54,7 @@ 
         $fDto->required = $mappedColumn->isNotNull();
         $relatedModel = strtolower($mappedColumn->getRelation()->getForeignTable()->getPhpName());
         $fDto->entity = $relatedModel;
-        $fDto->url = Router::getInstance()->getRoute('api-' . $relatedModel . '-pk');
+        $fDto->url = Router::getInstance()->getRoute('api-'.$relatedModel.'-pk');
         return $fDto;
     }
 

src/base/types/helpers/RouterHelper.php

Doc Comments +2 added lines, -2 removed lines

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

Braces +9 added lines, -3 removed lines

@@ -56,8 +56,10 @@ 
         $_route = explode("/", $url['path']);
         $_pattern = explode("/", $pattern);
         $get = array();
-        if (!empty($_pattern)) foreach ($_pattern as $index => $component) {
+        if (!empty($_pattern)) {
+            foreach ($_pattern as $index => $component) {
             $_get = array();
+        }
             preg_match_all('/^\{(.*)\}$/i', $component, $_get);
             if (!empty($_get[1]) && isset($_route[$index])) {
                 $get[array_pop($_get[1])] = $_route[$index];
@@ -151,12 +153,16 @@ 
         $params = [];
         $parameters = $method->getParameters();
         /** @var \ReflectionParameter $param */
-        if (count($parameters) > 0) foreach ($parameters as $param) {
+        if (count($parameters) > 0) {
+            foreach ($parameters as $param) {
             if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                 $params[$param->getName()] = $param->getDefaultValue();
+        }
                 $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
             }
-        } else $default = $regex;
+        } else {
+            $default = $regex;
+        }
 
         return array($regex, $default, $params);
     }

Spacing +15 added lines, -15 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,12 +128,12 @@ 
             $model_path = ucfirst($model_path);
         }
         if ($class->hasConstant("TPL")) {
-            $tpl_path .= DIRECTORY_SEPARATOR . $class->getConstant("TPL");
+            $tpl_path .= DIRECTORY_SEPARATOR.$class->getConstant("TPL");
         }
         return [
-            "template" => $path . $tpl_path,
-            "model" => $path . $model_path,
-            "public" => $path . $public_path,
+            "template" => $path.$tpl_path,
+            "model" => $path.$model_path,
+            "public" => $path.$public_path,
         ];
     }
 
@@ -155,9 +155,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);
     }
@@ -212,10 +212,10 @@ 
     {
         $is_enabled = true;
         // For non api routes
-        if(strlen($api) > 0 && preg_match('/admin/i', $route)) {
+        if (strlen($api) > 0 && preg_match('/admin/i', $route)) {
             // If route is for api, check if admin is enabled in config
             $admin_enabled = Config::getInstance()->get('api.admin');
-            if(empty($admin_enabled)) {
+            if (empty($admin_enabled)) {
                 $is_enabled = false;
             }
         }
@@ -239,8 +239,8 @@ 
                 $default = str_replace('{__API__}', $api, $default);
             }
             $httpMethod = RouterHelper::extractReflectionHttpMethod($docComments);
-            if(self::checkCanAddRoute($regex, $api)) {
-                $route = $httpMethod . "#|#" . $regex;
+            if (self::checkCanAddRoute($regex, $api)) {
+                $route = $httpMethod."#|#".$regex;
                 $info = [
                     "method" => $method->getName(),
                     "params" => $params,
@@ -267,7 +267,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/services/AdminServices.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
     use PSFS\base\config\Config;
     use PSFS\base\Security;
     use PSFS\base\Service;
-    use PSFS\controller\Admin;
     use Symfony\Component\Finder\Finder;
 
     class AdminServices extends Service{

Spacing +18 added lines, -18 removed lines

@@ -7,7 +7,7 @@ 
     use PSFS\controller\Admin;
     use Symfony\Component\Finder\Finder;
 
-    class AdminServices extends Service{
+    class AdminServices extends Service {
 
         /**
          * @Inyectable
@@ -33,7 +33,7 @@ 
         {
             $platform = trim(Config::getInstance()->get("platform_name"));
             header('HTTP/1.1 401 Unauthorized');
-            header('WWW-Authenticate: Basic Realm="' . $platform. '"');
+            header('WWW-Authenticate: Basic Realm="'.$platform.'"');
             echo _("Zona restringida");
             exit();
         }
@@ -45,9 +45,9 @@ 
         public function getAdmins()
         {
             $admins = $this->security->getAdmins();
-            if(!empty($admins))
+            if (!empty($admins))
             {
-                if(!$this->security->checkAdmin())
+                if (!$this->security->checkAdmin())
                 {
                     $this->setAdminHeaders();
                 }
@@ -62,17 +62,17 @@ 
          */
         private function parseAdmins(&$admins)
         {
-            if(!empty($admins)) foreach($admins as &$admin)
+            if (!empty($admins)) foreach ($admins as &$admin)
             {
-                if(isset($admin["profile"]))
+                if (isset($admin["profile"]))
                 {
-                    switch($admin["profile"]) {
+                    switch ($admin["profile"]) {
                         case Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning'; break;
                         case Security::ADMIN_ID_TOKEN: $admin['class'] = 'info'; break;
                         default:
                         case Security::USER_ID_TOKEN: $admin['class'] = 'primary'; break;
                     }
-                }else{
+                }else {
                     $admin["class"] = "primary";
                 }
             }
@@ -88,12 +88,12 @@ 
             $files->files()->in(LOG_DIR)->name("*.log")->sortByModifiedTime();
             $logs = array();
             /** @var \SplFileInfo $file */
-            foreach($files as $file)
+            foreach ($files as $file)
             {
-                $size = $file->getSize() / 8 / 1024;
+                $size = $file->getSize()/8/1024;
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
-                if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
+                if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
                 $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array(
                     "filename" => $file->getFilename(),
                     "size" => round($size, 3)
@@ -117,27 +117,27 @@ 
             $files->files()->in(LOG_DIR)->name($selectedLog);
             $file = null;
             $log = array();
-            foreach($files as $match)
+            foreach ($files as $match)
             {
                 $file = $match;
                 break;
             }
             /** @var \SplFileInfo $file */
-            if(!empty($file))
+            if (!empty($file))
             {
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
                 $monthOpen = $dateTime->format("m");
-                $content = file($file->getPath() . DIRECTORY_SEPARATOR . $file->getFilename());
+                $content = file($file->getPath().DIRECTORY_SEPARATOR.$file->getFilename());
                 krsort($content);
                 $detailLog = array();
-                foreach($content as &$line)
+                foreach ($content as &$line)
                 {
                     list($line, $detail) = $this->parseLogLine($line, $match);
                     $detailLog[] = array_merge(array(
                         "log" => $line,
                     ), $detail);
-                    if(count($detailLog) >= 1000) break;
+                    if (count($detailLog) >= 1000) break;
                 }
                 $log = $detailLog;
             }
@@ -166,7 +166,7 @@ 
 
                 $type = (isset($match[1][0])) ? $match[1][0] : '';
                 $type = explode(".", $type);
-                $type = count($type)>1 ? $type[1] : $type[0];
+                $type = count($type) > 1 ? $type[1] : $type[0];
                 switch ($type) {
                     case 'INFO':
                         $detail["type"] = "success";
@@ -182,7 +182,7 @@ 
                         break;
                 }
 
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $detail = array(
                     "type" => "danger",
                 );

Braces +15 added lines, -6 removed lines

@@ -62,17 +62,20 @@ 
          */
         private function parseAdmins(&$admins)
         {
-            if(!empty($admins)) foreach($admins as &$admin)
+            if(!empty($admins)) {
+                foreach($admins as &$admin)
             {
                 if(isset($admin["profile"]))
                 {
                     switch($admin["profile"]) {
-                        case Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning'; break;
+                        case Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning';
+            }
+            break;
                         case Security::ADMIN_ID_TOKEN: $admin['class'] = 'info'; break;
                         default:
                         case Security::USER_ID_TOKEN: $admin['class'] = 'primary'; break;
                     }
-                }else{
+                } else{
                     $admin["class"] = "primary";
                 }
             }
@@ -93,7 +96,9 @@ 
                 $size = $file->getSize() / 8 / 1024;
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
-                if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
+                if(!isset($logs[$dateTime->format("Y")])) {
+                    $logs[$dateTime->format("Y")] = array();
+                }
                 $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array(
                     "filename" => $file->getFilename(),
                     "size" => round($size, 3)
@@ -137,7 +142,9 @@ 
                     $detailLog[] = array_merge(array(
                         "log" => $line,
                     ), $detail);
-                    if(count($detailLog) >= 1000) break;
+                    if(count($detailLog) >= 1000) {
+                        break;
+                    }
                 }
                 $log = $detailLog;
             }
@@ -161,7 +168,9 @@ 
 
                     $detail = json_decode($match[0][0], TRUE);
                 }
-                if (empty($detail)) $detail = array();
+                if (empty($detail)) {
+                    $detail = array();
+                }
                 preg_match_all('/\>\ (.*):/i', $line, $match);
 
                 $type = (isset($match[1][0])) ? $match[1][0] : '';