psfs / core

src/base/types/traits/SystemTrait.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 namespace PSFS\base\types\traits;
 
 use PSFS\base\Logger;
-use PSFS\base\Request;
-use PSFS\base\Router;
 
 /**
  * Class SystemTrait

Spacing +5 added lines, -5 removed lines

@@ -36,7 +36,7 @@ 
                 $use /= 1024;
                 break;
             case "MBytes":
-                $use /= (1024 * 1024);
+                $use /= (1024*1024);
                 break;
             case "Bytes":
             default:
@@ -61,14 +61,14 @@ 
     {
         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, 'errno' => $errno]);
             return true;
         }, E_ALL | E_STRICT);
 
-        register_shutdown_function(function () {
+        register_shutdown_function(function() {
             $error = error_get_last();
-            if( $error !== NULL) {
+            if ($error !== NULL) {
                 $errno   = $error["type"];
                 $errfile = $error["file"];
                 $errline = $error["line"];
@@ -88,7 +88,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 = PSFS_START_TS;
         }
         $this->mem = PSFS_START_MEM;

src/services/GeneratorService.php

Doc Comments +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
 
     /**
      * Método que revisa las traducciones directorio a directorio
-     * @param $path
+     * @param string $path
      * @param $locale
      * @return array
      */
@@ -111,7 +111,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)
     {
@@ -467,7 +467,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)
@@ -509,7 +509,7 @@ 
     }
 
     /**
-     * @param $module_path
+     * @param string $module_path
      * @return array
      */
     private function getPropelPaths($module_path)

Unused Use Statements -6 removed lines

@@ -1,16 +1,10 @@
 <?php
 namespace PSFS\Services;
 
-use Propel\Common\Config\ConfigurationManager;
 use Propel\Generator\Config\GeneratorConfig;
 use Propel\Generator\Manager\AbstractManager;
-use Propel\Generator\Manager\MigrationManager;
 use Propel\Generator\Manager\ModelManager;
 use Propel\Generator\Manager\SqlManager;
-use Propel\Generator\Model\Database;
-use Propel\Generator\Model\Diff\DatabaseComparator;
-use Propel\Generator\Model\IdMethod;
-use Propel\Generator\Model\Schema;
 use PSFS\base\Cache;
 use PSFS\base\config\Config;
 use PSFS\base\exception\ConfigException;

Spacing +61 added lines, -61 removed lines

@@ -45,24 +45,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;
@@ -83,7 +83,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);
@@ -104,7 +104,7 @@ 
         // Creates the src folder
         GeneratorHelper::createDir($mod_path);
         // Create module path
-        GeneratorHelper::createDir($mod_path . $module);
+        GeneratorHelper::createDir($mod_path.$module);
     }
 
     /**
@@ -119,16 +119,16 @@ 
         $this->log->infoLog("Generamos la estructura");
         $paths = [
             "Api", "Api/base", "Config", "Controller", "Models", "Public", "Templates", "Services", "Test", "Doc",
-            "Locale", "Locale/" . Config::getParam('default.locale', 'es_ES'), "Locale/" . Config::getParam('default.locale', 'es_ES') . "/LC_MESSAGES"
+            "Locale", "Locale/".Config::getParam('default.locale', 'es_ES'), "Locale/".Config::getParam('default.locale', 'es_ES')."/LC_MESSAGES"
         ];
-        $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);
         }
     }
 
@@ -141,7 +141,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);
@@ -159,8 +159,8 @@ 
      */
     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);
 
         $configGenerator = $this->getConfigGenerator($module_path);
 
@@ -170,8 +170,8 @@ 
         $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");
     }
 
@@ -193,28 +193,28 @@ 
             "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);
 
-        $filename = $mod_path . DIRECTORY_SEPARATOR . "Test" . DIRECTORY_SEPARATOR . "{$class}Test.php";
+        $filename = $mod_path.DIRECTORY_SEPARATOR."Test".DIRECTORY_SEPARATOR."{$class}Test.php";
         $test = true;
-        if(!file_exists($filename)) {
+        if (!file_exists($filename)) {
             $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array(
                 "module" => $module,
                 "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
@@ -235,8 +235,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()) {
@@ -264,7 +264,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);
     }
 
@@ -279,10 +279,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);
     }
@@ -304,7 +304,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);
     }
 
@@ -323,13 +323,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;
     }
 
@@ -350,7 +350,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);
     }
 
@@ -368,7 +368,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);
     }
 
@@ -386,7 +386,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);
     }
 
@@ -404,11 +404,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;
     }
@@ -437,7 +437,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);
     }
 
     /**
@@ -460,7 +460,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);
     }
 
     /**
@@ -474,12 +474,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);
                     }
                 }
             }
@@ -498,10 +498,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);
                 }
             }
         }
@@ -514,12 +514,12 @@ 
      */
     private function getPropelPaths($module_path)
     {
-        $moduleDir = CORE_DIR . DIRECTORY_SEPARATOR . $module_path;
+        $moduleDir = CORE_DIR.DIRECTORY_SEPARATOR.$module_path;
         GeneratorHelper::createDir($moduleDir);
         $moduleDir = realpath($moduleDir);
-        $configDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config';
-        $sqlDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Sql';
-        $migrationDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Migrations';
+        $configDir = $moduleDir.DIRECTORY_SEPARATOR.'Config';
+        $sqlDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Sql';
+        $migrationDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Migrations';
         $paths = [
             'projectDir' => $moduleDir,
             'outputDir' => $moduleDir,
@@ -581,12 +581,12 @@ 
      * @param AbstractManager $manager
      * @param string $workingDir
      */
-    private function setupManager(GeneratorConfig $configGenerator, AbstractManager &$manager, $workingDir = CORE_DIR)
+    private function setupManager(GeneratorConfig $configGenerator, AbstractManager & $manager, $workingDir = CORE_DIR)
     {
         $manager->setGeneratorConfig($configGenerator);
-        $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'] . DIRECTORY_SEPARATOR . 'schema.xml');
+        $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'].DIRECTORY_SEPARATOR.'schema.xml');
         $manager->setSchemas([$schemaFile]);
-        $manager->setLoggerClosure(function ($message) {
+        $manager->setLoggerClosure(function($message) {
             Logger::log($message, LOG_INFO);
         });
         $manager->setWorkingDirectory($workingDir);

src/controller/GeneratorController.php

Indentation +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
                 GeneratorHelper::checkCustomNamespaceApi($apiClass);
                 $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));
+                // Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true));
             } catch (\Exception $e) {
                 Logger::getInstance()->infoLog($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
                 Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage()));

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,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();
@@ -65,8 +65,8 @@ 
                 $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", htmlentities($e->getMessage()));
             }
         }
@@ -77,14 +77,14 @@ 
 
     public static function createRoot($path = WEB_DIR, OutputInterface $output = null) {
 
-        if(null === $output) {
+        if (null === $output) {
             $output = new ConsoleOutput();
         }
 
         GeneratorHelper::createDir($path);
         $paths = array("js", "css", "img", "media", "font");
         foreach ($paths as $htmlPath) {
-            GeneratorHelper::createDir($path . DIRECTORY_SEPARATOR . $htmlPath);
+            GeneratorHelper::createDir($path.DIRECTORY_SEPARATOR.$htmlPath);
         }
 
         // Generates the root needed files
@@ -96,18 +96,18 @@ 
             'robots' => 'robots.txt',
         ];
         foreach ($files as $templates => $filename) {
-            $text = 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 = 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')) {
-            GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            GeneratorService::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+        if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) {
+            GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+            GeneratorService::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
         }
     }
 }
\ No newline at end of file

src/base/types/Api.php

Unused Use Statements -3 removed lines

@@ -4,15 +4,12 @@
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Propel\Runtime\Map\TableMap;
 use Propel\Runtime\Propel;
-use PSFS\base\config\Config;
 use PSFS\base\dto\JsonResponse;
 use PSFS\base\dto\Order;
 use PSFS\base\Logger;
 use PSFS\base\Request;
-use PSFS\base\Security;
 use PSFS\base\Singleton;
 use PSFS\base\types\helpers\ApiHelper;
-use PSFS\base\types\helpers\Inspector;
 use PSFS\base\types\traits\Api\ManagerTrait;
 
 /**

Spacing +29 added lines, -29 removed lines

@@ -74,15 +74,15 @@ 
     public function init()
     {
         parent::init();
-        Logger::log(get_called_class() . ' init', LOG_DEBUG);
+        Logger::log(get_called_class().' init', LOG_DEBUG);
         $this->domain = $this->getDomain();
         $this->hydrateRequestData();
         $this->hydrateOrders();
-        if($this instanceof CustomApi === false) {
+        if ($this instanceof CustomApi === false) {
             $this->createConnection($this->getTableMap());
         }
         $this->setLoaded(true);
-        Logger::log(get_called_class() . ' loaded', LOG_DEBUG);
+        Logger::log(get_called_class().' loaded', LOG_DEBUG);
     }
 
     /**
@@ -91,7 +91,7 @@ 
     protected function hydrateOrders()
     {
         if (count($this->query)) {
-            Logger::log(get_called_class() . ' gathering query string', LOG_DEBUG);
+            Logger::log(get_called_class().' gathering query string', LOG_DEBUG);
             foreach ($this->query as $key => $value) {
                 if ($key === self::API_ORDER_FIELD) {
                     foreach ($value as $field => $direction) {
@@ -108,10 +108,10 @@ 
      */
     protected function extractPagination()
     {
-        Logger::log(get_called_class() . ' extract pagination start', LOG_DEBUG);
+        Logger::log(get_called_class().' extract pagination start', LOG_DEBUG);
         $page = (array_key_exists(self::API_PAGE_FIELD, $this->query)) ? $this->query[self::API_PAGE_FIELD] : 1;
         $limit = (array_key_exists(self::API_LIMIT_FIELD, $this->query)) ? $this->query[self::API_LIMIT_FIELD] : 100;
-        Logger::log(get_called_class() . ' extract pagination end', LOG_DEBUG);
+        Logger::log(get_called_class().' extract pagination end', LOG_DEBUG);
         return array($page, $limit);
     }
 
@@ -120,9 +120,9 @@ 
      *
      * @param ModelCriteria $query
      */
-    private function addOrders(ModelCriteria &$query)
+    private function addOrders(ModelCriteria & $query)
     {
-        Logger::log(get_called_class() . ' extract orders start ', LOG_DEBUG);
+        Logger::log(get_called_class().' extract orders start ', LOG_DEBUG);
         $orderAdded = FALSE;
         $tableMap = $this->getTableMap();
         foreach ($this->order->getOrders() as $field => $direction) {
@@ -130,17 +130,17 @@ 
                 $orderAdded = TRUE;
                 if ($direction === Order::ASC) {
                     $query->addAscendingOrderByColumn($column->getPhpName());
-                } else {
+                }else {
                     $query->addDescendingOrderByColumn($column->getPhpName());
                 }
             }
         }
         if (!$orderAdded) {
-            foreach($this->getPkDbName() as $pk => $phpName) {
+            foreach ($this->getPkDbName() as $pk => $phpName) {
                 $query->addAscendingOrderByColumn($pk);
             }
         }
-        Logger::log(get_called_class() . ' extract orders end', LOG_DEBUG);
+        Logger::log(get_called_class().' extract orders end', LOG_DEBUG);
     }
 
     /**
@@ -148,14 +148,14 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function addFilters(ModelCriteria &$query)
+    protected function addFilters(ModelCriteria & $query)
     {
         if (count($this->query) > 0) {
             $tableMap = $this->getTableMap();
             foreach ($this->query as $field => $value) {
                 if (self::API_COMBO_FIELD === $field) {
                     ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value);
-                } elseif(!preg_match('/^__/', $field)) {
+                } elseif (!preg_match('/^__/', $field)) {
                     ApiHelper::addModelField($tableMap, $query, $field, $value);
                 }
             }
@@ -176,10 +176,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);
         }
     }
@@ -198,7 +198,7 @@ 
         $code = 200;
         list($return, $total, $pages) = $this->getList();
         $message = null;
-        if(!$total) {
+        if (!$total) {
             $message = _('No se han encontrado elementos para la búsqueda');
         }
 
@@ -224,7 +224,7 @@ 
         $pages = 1;
         $message = null;
         list($code, $return) = $this->getSingleResult($pk);
-        if($code !== 200) {
+        if ($code !== 200) {
             $message = _('No se ha encontrado el elemento solicitado');
         }
 
@@ -253,11 +253,11 @@ 
                 $status = 200;
                 $saved = TRUE;
                 $model = $this->model->toArray();
-            } else {
+            }else {
                 $message = _('No se ha podido guardar el modelo seleccionado');
             }
-        } catch (\Exception $e) {
-            $message = _('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage();
+        }catch (\Exception $e) {
+            $message = _('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage();
             Logger::log($e->getMessage(), LOG_ERR);
         }
 
@@ -291,14 +291,14 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray();
-                } else {
+                }else {
                     $message = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $message = $e->getMessage();
                 Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
             }
-        } else {
+        }else {
             $message = _('No se ha encontrado el modelo al que se hace referencia para actualizar');
         }
 
@@ -326,13 +326,13 @@ 
                 $this->con->beginTransaction();
                 $this->hydrateModel($pk);
                 if (NULL !== $this->model) {
-                    if(method_exists('clearAllReferences', $this->model)) {
+                    if (method_exists('clearAllReferences', $this->model)) {
                         $this->model->clearAllReferences(true);
                     }
                     $this->model->delete($this->con);
                     $deleted = TRUE;
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $message = _('Ha ocurrido un error intentando eliminar el elemento, por favor verifica que no tenga otros elementos relacionados');
                 Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
             }
@@ -360,7 +360,7 @@ 
             $this->saveBulk();
             $saved = true;
             $status = 200;
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR, $this->getRequest()->getData());
             $message = _('Bulk insert rolled back');
         }
@@ -392,8 +392,8 @@ 
                 $total = $this->list->getNbResults();
                 $pages = $this->list->getLastPage();
             }
-        } catch (\Exception $e) {
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
         }
 
         return array($return, $total, $pages);
@@ -411,7 +411,7 @@ 
         $return = array();
         if (NULL === $model || !method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray();
         }
 

src/services/DocumentorService.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use PSFS\base\Router;
 use PSFS\base\Service;
 use PSFS\base\types\helpers\DocumentorHelper;
-use PSFS\base\types\helpers\GeneratorHelper;
 use PSFS\base\types\helpers\I18nHelper;
 use PSFS\base\types\helpers\InjectorHelper;
 use PSFS\base\types\helpers\RouterHelper;

Spacing +24 added lines, -24 removed lines

@@ -57,10 +57,10 @@ 
                     if (!preg_match('/^ROOT/i', $module) && $module == $requestModule) {
                         $modules = [
                             'name' => $module,
-                            'path' => realpath($info['template'] . DIRECTORY_SEPARATOR . '..'),
+                            'path' => realpath($info['template'].DIRECTORY_SEPARATOR.'..'),
                         ];
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     $modules[] = $e->getMessage();
                 }
             }
@@ -78,7 +78,7 @@ 
      */
     public function extractApiEndpoints(array $module)
     {
-        $module_path = $module['path'] . DIRECTORY_SEPARATOR . 'Api';
+        $module_path = $module['path'].DIRECTORY_SEPARATOR.'Api';
         $module_name = $module['name'];
         $endpoints = [];
         if (file_exists($module_path)) {
@@ -87,7 +87,7 @@ 
             if (count($finder)) {
                 /** @var \SplFileInfo $file */
                 foreach ($finder as $file) {
-                    $namespace = "\\{$module_name}\\Api\\" . str_replace('.php', '', $file->getFilename());
+                    $namespace = "\\{$module_name}\\Api\\".str_replace('.php', '', $file->getFilename());
                     $info = $this->extractApiInfo($namespace, $module_name);
                     if (!empty($info)) {
                         $endpoints[$namespace] = $info;
@@ -111,14 +111,14 @@ 
         if (Router::exists($namespace) && !I18nHelper::checkI18Class($namespace)) {
             $reflection = new \ReflectionClass($namespace);
             $visible = InjectorHelper::checkIsVisible($reflection->getDocComment());
-            if($visible) {
+            if ($visible) {
                 foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
                     try {
                         $mInfo = $this->extractMethodInfo($namespace, $method, $reflection, $module);
                         if (NULL !== $mInfo) {
                             $info[] = $mInfo;
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         Logger::getInstance()->errorLog($e->getMessage());
                     }
                 }
@@ -251,7 +251,7 @@ 
             $payload = $this->extractModelFields($namespace);
             $reflector = new \ReflectionClass($namespace);
             $shortName = $reflector->getShortName();
-        } else {
+        }else {
             $namespace = $model;
             $shortName = $model;
         }
@@ -340,10 +340,10 @@ 
                         "required" => $field->isNotNull(),
                         'format' => $format,
                     ];
-                    if(count($field->getValueSet())) {
+                    if (count($field->getValueSet())) {
                         $info['enum'] = array_values($field->getValueSet());
                     }
-                    if(null !== $field->getDefaultValue()) {
+                    if (null !== $field->getDefaultValue()) {
                         $info['default'] = $field->getDefaultValue();
                     }
                     $payload[$field->getPhpName()] = $info;
@@ -351,7 +351,7 @@ 
             } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 $payload = $this->extractDtoProperties($namespace);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::getInstance()->errorLog($e->getMessage());
         }
 
@@ -382,7 +382,7 @@ 
                     $return = $this->extractReturn($modelNamespace, $docComments);
                     $url = array_pop($route);
                     $methodInfo = [
-                        'url' => str_replace("/" . $module . "/api", '', $url),
+                        'url' => str_replace("/".$module."/api", '', $url),
                         'method' => $info['http'],
                         'description' => $info['label'],
                         'return' => $return,
@@ -393,7 +393,7 @@ 
                     $this->setRequestParams($method, $methodInfo, $modelNamespace, $docComments);
                     $this->setQueryParams($method, $methodInfo);
                     $this->setRequestHeaders($reflection, $methodInfo);
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance()->errorLog($e->getMessage());
                 }
             }
@@ -462,10 +462,10 @@ 
         $formatted = [
             "swagger" => "2.0",
             "host" => preg_replace('/^(http|https)\:\/\/(.*)\/$/i', '$2', Router::getInstance()->getRoute('', true)),
-            "basePath" => '/' . $module['name'] . '/api',
+            "basePath" => '/'.$module['name'].'/api',
             "schemes" => [Request::getInstance()->getServer('HTTPS') == 'on' ? "https" : "http"],
             "info" => [
-                "title" => _('Documentación API módulo ') . $module['name'],
+                "title" => _('Documentación API módulo ').$module['name'],
                 "version" => Config::getParam('api.version', '1.0.0'),
                 "contact" => [
                     "name" => Config::getParam("author", "Fran López"),
@@ -478,7 +478,7 @@ 
         foreach ($endpoints as $model) {
             foreach ($model as $endpoint) {
                 if (!preg_match('/^\/(admin|api)\//i', $endpoint['url']) && strlen($endpoint['url'])) {
-                    $url = preg_replace('/\/' . $module['name'] . '\/api/i', '', $endpoint['url']);
+                    $url = preg_replace('/\/'.$module['name'].'\/api/i', '', $endpoint['url']);
                     $description = $endpoint['description'];
                     $method = strtolower($endpoint['method']);
                     $paths[$url][$method] = [
@@ -539,7 +539,7 @@ 
     protected function extractDtoName($dto, $isArray = false)
     {
         $dto = explode('\\', $dto);
-        $modelDto = array_pop($dto) . "Dto";
+        $modelDto = array_pop($dto)."Dto";
         if ($isArray) {
             $modelDto .= "List";
         }
@@ -589,10 +589,10 @@ 
     {
 
         $methodInfo['headers'] = [];
-        foreach($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property) {
             $doc = $property->getDocComment();
             preg_match('/@header\ (.*)\n/i', $doc, $headers);
-            if(count($headers)) {
+            if (count($headers)) {
                 $header = [
                     "name" => $headers[1],
                     "in" => "header",
@@ -637,7 +637,7 @@ 
             foreach ($method->getParameters() as $parameter) {
                 $parameterName = $parameter->getName();
                 $types = [];
-                preg_match_all('/\@param\ (.*)\ \$' . $parameterName . '$/im', $docComments, $types);
+                preg_match_all('/\@param\ (.*)\ \$'.$parameterName.'$/im', $docComments, $types);
                 if (count($types) > 1) {
                     $methodInfo['parameters'][$parameterName] = $types[1][0];
                 }
@@ -659,21 +659,21 @@ 
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'array',
                         'items' => [
-                            '$ref' => '#/definitions/' . $info['type'],
+                            '$ref' => '#/definitions/'.$info['type'],
                         ]
                     ];
-                } else {
+                }else {
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'object',
-                        '$ref' => '#/definitions/' . $info['type'],
+                        '$ref' => '#/definitions/'.$info['type'],
                     ];
                 }
                 $modelDto['objects'][$info['class']] = $info['properties'];
                 $paramDto = $this->checkDtoAttributes($info['properties'], $info['properties'], $info['class']);
-                if(array_key_exists('objects', $paramDto)) {
+                if (array_key_exists('objects', $paramDto)) {
                     $modelDto['objects'] = array_merge($modelDto['objects'], $paramDto['objects']);
                 }
-            } else {
+            }else {
                 $modelDto['objects'][$dtoName][$param] = $info;
             }
         }

src/base/types/helpers/InjectorHelper.php

Doc Comments +7 added lines, -7 removed lines

@@ -74,8 +74,8 @@ 
 
     /**
      * Method extract if a variable is required
-     * @param $doc
-     * @return null|string
+     * @param string $doc
+     * @return boolean
      */
     public static function checkIsRequired($doc)
     {
@@ -88,8 +88,8 @@ 
 
     /**
      * Method extract if a class or variable is visible
-     * @param $doc
-     * @return null|string
+     * @param string $doc
+     * @return boolean
      */
     public static function checkIsVisible($doc)
     {
@@ -101,7 +101,7 @@ 
     }
 
     /**
-     * @param $doc
+     * @param string $doc
      * @return null|string
      */
     public static function getLabel($doc) {
@@ -115,8 +115,8 @@ 
     }
 
     /**
-     * @param $doc
-     * @return null
+     * @param string $doc
+     * @return string|null
      */
     public static function getDefaultValue($doc) {
         $default = null;

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 
 use PSFS\base\Logger;
 use PSFS\base\Router;
-use PSFS\services\DocumentorService;
 
 /**
  * Class InjectorHelper

Spacing +8 added lines, -8 removed lines

@@ -27,10 +27,10 @@ 
                 $isRequired = self::checkIsRequired($property->getDocComment());
                 $label = self::getLabel($property->getDocComment());
                 $isArray = (bool)preg_match('/\[\]$/', $instanceType);
-                if($isArray) {
+                if ($isArray) {
                     $instanceType = str_replace('[]', '', $instanceType);
                 }
-                if(!Router::exists($instanceType) || $instanceType === '\\DateTime') {
+                if (!Router::exists($instanceType) || $instanceType === '\\DateTime') {
                     list($type, $format) = DocumentorHelper::translateSwaggerFormats($instanceType);
                     $variables[$property->getName()] = [
                         'type' => $type,
@@ -38,7 +38,7 @@ 
                         'required' => $isRequired,
                         'description' => $label,
                     ];
-                } else {
+                }else {
                     $instance = new \ReflectionClass($instanceType);
                     $variables[$property->getName()] = [
                         'is_array' => $isArray,
@@ -124,7 +124,7 @@ 
         // Extract description
         $label = null;
         preg_match('/@label\ (.*)\n/i', $doc, $matches);
-        if(count($matches)) {
+        if (count($matches)) {
             $label = _($matches[1]);
         }
         return $label;
@@ -137,7 +137,7 @@ 
     public static function getDefaultValue($doc) {
         $default = null;
         preg_match('/@default\ (.*)\n/i', $doc, $matches);
-        if(count($matches)) {
+        if (count($matches)) {
             $default = $matches[1];
         }
         return $default;
@@ -153,13 +153,13 @@ 
      */
     public static function constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass)
     {
-        Logger::log('Create inyectable instance for ' . $classNameSpace);
+        Logger::log('Create inyectable instance for '.$classNameSpace);
         $reflector = new \ReflectionClass($calledClass);
         $property = $reflector->getProperty($variable);
         $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace;
         if (true === $singleton && method_exists($varInstanceType, "getInstance")) {
             $instance = $varInstanceType::getInstance();
-        } else {
+        }else {
             $instance = new $varInstanceType();
         }
         return $instance;
@@ -173,7 +173,7 @@ 
     public static function getClassProperties($class)
     {
         $properties = [];
-        Logger::log('Extracting annotations properties from class ' . $class);
+        Logger::log('Extracting annotations properties from class '.$class);
         $selfReflector = new \ReflectionClass($class);
         if (false !== $selfReflector->getParentClass()) {
             $properties = self::getClassProperties($selfReflector->getParentClass()->getName());

src/base/types/helpers/DocumentorHelper.php

Doc Comments +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
      * @param $object
      * @param $paths
      * @param $url
-     * @param $method
+     * @param string $method
      * @param $dtos
      * @param $isReturn
      * @return array
@@ -87,7 +87,7 @@ 
      * Translator from php types to swagger types
      * @param string $format
      *
-     * @return array
+     * @return string[]
      */
     public static function translateSwaggerFormats($format)
     {

Spacing +15 added lines, -15 removed lines

@@ -14,9 +14,9 @@ 
      */
     private static function searchPayloadParam($params, $variable) {
         $exists = false;
-        if(null !== $param && count($params)) {
-            foreach($params as $param) {
-                if($param['name'] === $variable) {
+        if (null !== $param && count($params)) {
+            foreach ($params as $param) {
+                if ($param['name'] === $variable) {
                     $exists = true;
                     break;
                 }
@@ -40,12 +40,12 @@ 
         ];
         if ($endpoint['payload']['is_array']) {
             $schema['items'] = [
-                '$ref' => '#/definitions/' . $endpoint['payload']['type'],
+                '$ref' => '#/definitions/'.$endpoint['payload']['type'],
             ];
-        } else {
-            $schema['$ref'] = '#/definitions/' . $endpoint['payload']['type'];
+        }else {
+            $schema['$ref'] = '#/definitions/'.$endpoint['payload']['type'];
         }
-        if(!self::searchPayloadParam($paths[$url][$method]['parameters'], $endpoint['payload']['type'])) {
+        if (!self::searchPayloadParam($paths[$url][$method]['parameters'], $endpoint['payload']['type'])) {
             $paths[$url][$method]['parameters'][] = [
                 'in' => 'body',
                 'name' => $endpoint['payload']['type'],
@@ -74,18 +74,18 @@ 
             if (array_key_exists('data', $endpoint['return']) && count(array_keys($object)) === count(array_keys($endpoint['return']['data']))) {
                 $classDefinition = [
                     'type' => 'object',
-                    '$ref' => '#/definitions/' . $class,
+                    '$ref' => '#/definitions/'.$class,
                 ];
-            } else {
+            }else {
                 $classDefinition = [
                     'type' => 'array',
                     'items' => [
-                        '$ref' => '#/definitions/' . $class,
+                        '$ref' => '#/definitions/'.$class,
                     ],
                 ];
             }
 
-            if($paths[$url][$method]['responses'][200]['schema']['properties']['data']['type'] === 'boolean') {
+            if ($paths[$url][$method]['responses'][200]['schema']['properties']['data']['type'] === 'boolean') {
                 $paths[$url][$method]['responses'][200]['schema']['properties']['data'] = $classDefinition;
             }
             $dtos += self::extractSwaggerDefinition($class, $object);
@@ -163,18 +163,18 @@ 
             ],
         ];
         foreach ($fields as $field => $info) {
-            if(array_key_exists('type', $info) || in_array($info['type'], ['array', 'object'])) {
+            if (array_key_exists('type', $info) || in_array($info['type'], ['array', 'object'])) {
                 $definition[$name]['properties'][$field] = $info;
-            } else {
+            }else {
                 list($type, $format) = self::translateSwaggerFormats($info['type']);
                 $fieldData = [
                     "type" => $type,
                     "required" => $info['required'],
                 ];
-                if(array_key_exists('description', $info)) {
+                if (array_key_exists('description', $info)) {
                     $fieldData['description'] = $info['description'];
                 }
-                if(array_key_exists('format', $info)) {
+                if (array_key_exists('format', $info)) {
                     $fieldData['format'] = $info['format'];
                 }
                 $dto['properties'][$field] = $fieldData;

src/Dispatcher.php

Spacing +6 added lines, -6 removed lines

@@ -73,18 +73,18 @@
                 if (!Request::getInstance()->isFile()) {
                     return $this->router->execute($this->actualUri);
                 }
-            } else {
+            }else {
                 return ConfigController::getInstance()->config();
             }
-        } catch (AdminCredentialsException $a) {
+        }catch (AdminCredentialsException $a) {
             return UserController::showAdminManager();
-        } catch (SecurityException $s) {
+        }catch (SecurityException $s) {
             return $this->security->notAuthorized($this->actualUri);
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             return $this->router->httpNotFound($r);
-        } catch(ApiException $a) {
+        }catch (ApiException $a) {
             return $this->router->httpNotFound($a, true);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $this->dumpException($e);
         }
     }

src/base/dto/Dto.php

Spacing +15 added lines, -15 removed lines

@@ -18,7 +18,7 @@ 
     public function __construct($hydrate = true)
     {
         parent::__construct();
-        if($hydrate) {
+        if ($hydrate) {
             $this->fromArray(Request::getInstance()->getData());
         }
     }
@@ -46,15 +46,15 @@ 
                 /** @var \ReflectionProperty $property */
                 foreach ($properties as $property) {
                     $value = $property->getValue($this);
-                    if(is_object($value) && method_exists($value, 'toArray')) {
+                    if (is_object($value) && method_exists($value, 'toArray')) {
                         $dto[$property->getName()] = $value->toArray();
-                    } else {
+                    }else {
                         $dto[$property->getName()] = $property->getValue($this);
                     }
                 }
             }
-        } catch (\Exception $e) {
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
         }
         return $dto;
     }
@@ -76,32 +76,32 @@ 
     protected function parseDtoField(array $properties, $key, $value = null) {
         $type = 'string';
         $is_array = false;
-        if(array_key_exists($key, $properties)) {
+        if (array_key_exists($key, $properties)) {
             $type = $properties[$key];
-            if(preg_match('/(\[\]|Array)/i', $type)) {
+            if (preg_match('/(\[\]|Array)/i', $type)) {
                 $type = preg_replace('/(\[\]|Array)/i', '', $type);
                 $is_array = true;
             }
         }
         $reflector = (class_exists($type)) ? new \ReflectionClass($type) : null;
-        if(null !== $reflector && $reflector->isSubclassOf(Dto::class)) {
-            if(null !== $value && is_array($value)) {
-                if($is_array) {
+        if (null !== $reflector && $reflector->isSubclassOf(Dto::class)) {
+            if (null !== $value && is_array($value)) {
+                if ($is_array) {
                     $this->$key = [];
-                    foreach($value as $data) {
-                        if(null !== $data && is_array($data)) {
+                    foreach ($value as $data) {
+                        if (null !== $data && is_array($data)) {
                             $dto = new $type(false);
                             $dto->fromArray($data);
                             array_push($this->$key, $dto);
                         }
                     }
-                } else {
+                }else {
                     $this->$key = new $type(false);
                     $this->$key->fromArray($value);
                 }
             }
-        } else {
-            switch($type) {
+        }else {
+            switch ($type) {
                 default:
                 case 'string':
                     $this->$key = $value;