psfs / core

src/base/types/traits/JsonTrait.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      * @param mixed $response
      * @param int $statusCode
      *
-     * @return mixed JSON
+     * @return string|null JSON
      */
     public function json($response, $statusCode = 200)
     {

Spacing +5 added lines, -5 removed lines

@@ -22,10 +22,10 @@ 
      */
     public function json($response, $statusCode = 200)
     {
-        if(Config::getParam('profiling.enable')) {
-            if(is_array($response)) {
+        if (Config::getParam('profiling.enable')) {
+            if (is_array($response)) {
                 $response['profiling'] = Inspector::getStats();
-            } elseif($response instanceof JsonResponse) {
+            } elseif ($response instanceof JsonResponse) {
                 $response = ProfilingJsonResponse::createFromPrevious($response, Inspector::getStats());
             }
         }
@@ -33,8 +33,8 @@ 
         $this->decodeJsonReponse($response);
 
         $data = json_encode($response, JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING | JSON_NUMERIC_CHECK);
-        if(Config::getParam('angular.protection', false)) {
-            $data = ")]}',\n" . $data;
+        if (Config::getParam('angular.protection', false)) {
+            $data = ")]}',\n".$data;
         }
         $this->setStatus($statusCode);
         return $this->output($data, "application/json");

src/bootstrap.php

Spacing +10 added lines, -10 removed lines

@@ -3,17 +3,17 @@
 
 if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'src');
+}else {
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'modules');
 }
-if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'vendor');
+if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'cache');
+if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'config');
+if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'html');
 
 
 /**

Braces +31 added lines, -11 removed lines

@@ -1,19 +1,39 @@
 <?php
 namespace PSFS;
 
-if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
+if (!defined('SOURCE_DIR')) {
+    define('SOURCE_DIR', __DIR__);
+}
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
+    }
+    } else {
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    }
+    }
+if (!defined('VENDOR_DIR')) {
+    define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
+}
+if (!defined('LOG_DIR')) {
+    define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+}
+if (!defined('CACHE_DIR')) {
+    define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
+}
+if (!defined('CONFIG_DIR')) {
+    define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
+}
+if (!defined('WEB_DIR')) {
+    define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
 }
-if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
 
 
 /**

src/base/types/helpers/FileHelper.php

Doc Comments +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
  */
 class FileHelper {
     /**
-     * @param mixed $data
+     * @param string $data
      * @param string $path
      * @return int
      */
@@ -18,7 +18,7 @@ 
 
     /**
      * @param string $path
-     * @return mixed|bool
+     * @return string|false
      */
     public static function readFile($path) {
         $data = false;
@@ -51,8 +51,8 @@ 
     }
 
     /**
-     * @param $path
-     * @return bool
+     * @param string $path
+     * @return boolean|null
      */
     public static function deleteDir($path) {
         (new Filesystem())->remove($path);

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
      */
     public static function readFile($path) {
         $data = false;
-        if(file_exists($path)) {
+        if (file_exists($path)) {
             $data = file_get_contents($path);
         }
         return $data;
@@ -35,7 +35,7 @@ 
      * @return string
      */
     public static function generateHashFilename($verb, $slug, array $query = []) {
-        return sha1(strtolower($verb) . " " . $slug . " " . strtolower(http_build_query($query)));
+        return sha1(strtolower($verb)." ".$slug." ".strtolower(http_build_query($query)));
     }
 
     /**
@@ -46,8 +46,8 @@ 
     public static function generateCachePath(array $action, array $query = []) {
         $class = GeneratorHelper::extractClassFromNamespace($action['class']);
         $filename = self::generateHashFilename($action["http"], $action["slug"], $query);
-        $subPath = substr($filename, 0, 2) . DIRECTORY_SEPARATOR . substr($filename, 2, 2);
-        return $action['module'] . DIRECTORY_SEPARATOR . $class . DIRECTORY_SEPARATOR . $action['method'] . DIRECTORY_SEPARATOR . $subPath . DIRECTORY_SEPARATOR;
+        $subPath = substr($filename, 0, 2).DIRECTORY_SEPARATOR.substr($filename, 2, 2);
+        return $action['module'].DIRECTORY_SEPARATOR.$class.DIRECTORY_SEPARATOR.$action['method'].DIRECTORY_SEPARATOR.$subPath.DIRECTORY_SEPARATOR;
     }
 
     /**

src/base/types/helpers/I18nHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
     /**
      * @param string $default
-     * @return array|mixed|string
+     * @return string
      */
     private static function extractLocale($default = null)
     {

Spacing +12 added lines, -12 removed lines

@@ -29,21 +29,21 @@ 
                 list($BrowserLocales[$i]) = explode(";", $BrowserLocales[$i]); //trick for "en;q=0.8"
             }
             $locale = array_shift($BrowserLocales);
-        } else {
+        }else {
             $locale = strtolower($locale);
         }
         if (false !== strpos($locale, '_')) {
             $locale = explode('_', $locale);
             if ($locale[0] == 'en') {
-                $locale = $locale[0] . '_GB';
-            } else {
-                $locale = $locale[0] . '_' . strtoupper($locale[1]);
+                $locale = $locale[0].'_GB';
+            }else {
+                $locale = $locale[0].'_'.strtoupper($locale[1]);
             }
-        } else {
+        }else {
             if (strtolower($locale) === 'en') {
                 $locale = 'en_GB';
-            } else {
-                $locale = $locale . '_' . strtoupper($locale);
+            }else {
+                $locale = $locale.'_'.strtoupper($locale);
             }
         }
         if (!in_array($locale, self::$langs)) {
@@ -64,7 +64,7 @@ 
         $translations = array();
         if (file_exists($absoluteTranslationFileName)) {
             @include($absoluteTranslationFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }
 
@@ -77,13 +77,13 @@ 
     public static function setLocale()
     {
         $locale = self::extractLocale('es_ES');
-        Logger::log('Set locale to project [' . $locale . ']');
+        Logger::log('Set locale to project ['.$locale.']');
         // Load translations
-        putenv("LC_ALL=" . $locale);
+        putenv("LC_ALL=".$locale);
         setlocale(LC_ALL, $locale);
         // Load the locale path
-        $locale_path = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
-        Logger::log('Set locale dir ' . $locale_path);
+        $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
+        Logger::log('Set locale dir '.$locale_path);
         GeneratorHelper::createDir($locale_path);
         bindtextdomain('translations', $locale_path);
         textdomain('translations');

src/base/types/traits/Api/MutationTrait.php

Spacing +24 added lines, -24 removed lines

@@ -65,21 +65,21 @@ 
         if (count($pks) == 1) {
             $pks = array_keys($pks);
             return [
-                $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD
+                $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD
             ];
         } elseif (count($pks) > 1) {
             $apiPks = [];
             $principal = '';
             $sep = 'CONCAT(';
             foreach ($pks as $pk) {
-                $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName();
-                $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName();
-                $sep = ', "' . Api::API_PK_SEPARATOR . '", ';
+                $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName();
+                $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName();
+                $sep = ', "'.Api::API_PK_SEPARATOR.'", ';
             }
             $principal .= ')';
             $apiPks[$principal] = Api::API_MODEL_KEY_FIELD;
             return $apiPks;
-        } else {
+        }else {
             throw new ApiException(_('El modelo de la API no está debidamente mapeado, no hay Primary Key o es compuesta'));
         }
     }
@@ -102,10 +102,10 @@ 
         $pks = '';
         $sep = '';
         foreach ($tableMap->getPrimaryKeys() as $pk) {
-            $pks .= $sep . $pk->getFullyQualifiedName();
+            $pks .= $sep.$pk->getFullyQualifiedName();
             $sep = ', "|", ';
         }
-        $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD;
+        $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD;
     }
 
     /**
@@ -127,7 +127,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -139,7 +139,7 @@ 
      * @param ModelCriteria $query
      * @param string $action
      */
-    private function addExtraColumns(ModelCriteria &$query, $action)
+    private function addExtraColumns(ModelCriteria & $query, $action)
     {
         if (Api::API_ACTION_LIST === $action) {
             $this->addDefaultListField();
@@ -173,21 +173,21 @@ 
     /**
      * @param ModelCriteria $query
      */
-    protected function checkI18n(ModelCriteria &$query)
+    protected function checkI18n(ModelCriteria & $query)
     {
         $this->extractApiLang();
         $model = $this->getModelNamespace();
-        $modelI18n = $model . 'I18n';
+        $modelI18n = $model.'I18n';
         if (method_exists($query, 'useI18nQuery')) {
             $query->useI18nQuery($this->lang);
-            $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap';
+            $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap';
             /** @var TableMap $modelI18nTableMap */
             $modelI18nTableMap = $modelI18nTableMapClass::getTableMap();
-            foreach($modelI18nTableMap->getColumns() as $columnMap) {
-                if(!$columnMap->isPrimaryKey()) {
-                    $query->withColumn($modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName(), $columnMap->getPhpName());
-                } elseif(!$columnMap->isForeignKey()) {
-                    $query->withColumn('IFNULL(' . $modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName() . ', "'.$this->lang.'")', $columnMap->getPhpName());
+            foreach ($modelI18nTableMap->getColumns() as $columnMap) {
+                if (!$columnMap->isPrimaryKey()) {
+                    $query->withColumn($modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName(), $columnMap->getPhpName());
+                } elseif (!$columnMap->isForeignKey()) {
+                    $query->withColumn('IFNULL('.$modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName().', "'.$this->lang.'")', $columnMap->getPhpName());
                 }
             }
         }
@@ -197,23 +197,23 @@ 
      * @param ActiveRecordInterface $model
      * @param array $data
      */
-    protected function hydrateModelFromRequest(ActiveRecordInterface &$model, array $data = []) {
+    protected function hydrateModelFromRequest(ActiveRecordInterface & $model, array $data = []) {
         $model->fromArray($data);
         $tableMap = $this->getTableMap();
         try {
-            $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
-            if(null !== $relateI18n) {
+            $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
+            if (null !== $relateI18n) {
                 $i18NTableMap = $relateI18n->getLocalTable();
-                foreach($i18NTableMap->getColumns() as $columnMap) {
-                    $method = 'set' . $columnMap->getPhpName();
-                    if(!($columnMap->isPrimaryKey() && $columnMap->isForeignKey())
+                foreach ($i18NTableMap->getColumns() as $columnMap) {
+                    $method = 'set'.$columnMap->getPhpName();
+                    if (!($columnMap->isPrimaryKey() && $columnMap->isForeignKey())
                         &&array_key_exists($columnMap->getPhpName(), $data)
                         && method_exists($model, $method)) {
                         $model->$method($data[$columnMap->getPhpName()]);
                     }
                 }
             }
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
         }
     }

src/base/Template.php

Spacing +7 added lines, -7 removed lines

@@ -113,7 +113,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $dump;
@@ -140,7 +140,7 @@ 
     public function regenerateTemplates()
     {
         $this->generateTemplatesCache();
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, true);
         $translations = [];
         if (is_array($domains)) {
             $translations = $this->parsePathTranslations($domains);
@@ -162,8 +162,8 @@ 
             // force compilation
             if ($file->isFile()) {
                 try {
-                    $this->tpl->load(str_replace($tplDir . '/', '', $file));
-                } catch (\Exception $e) {
+                    $this->tpl->load(str_replace($tplDir.'/', '', $file));
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR, ['file' => $e->getFile(), 'line' => $e->getLine()]);
                 }
             }
@@ -224,7 +224,7 @@ 
             'getFlash' => TemplateFunctions::GET_FLASH_FUNCTION,
             'getQuery' => TemplateFunctions::GET_QUERY_FUNCTION,
         ];
-        foreach($functions as $name => $function) {
+        foreach ($functions as $name => $function) {
             $this->addTemplateFunction($name, $function);
         }
     }
@@ -243,7 +243,7 @@ 
      */
     private function loadDomains()
     {
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true);
         if (null !== $domains) {
             foreach ($domains as $domain => $paths) {
                 $this->addPath($paths['template'], preg_replace('/(@|\/)/', '', $domain));
@@ -258,7 +258,7 @@ 
     {
         $loader = new \Twig_Loader_Filesystem(GeneratorHelper::getTemplatePath());
         $this->tpl = new \Twig_Environment($loader, array(
-            'cache' => CACHE_DIR . DIRECTORY_SEPARATOR . 'twig',
+            'cache' => CACHE_DIR.DIRECTORY_SEPARATOR.'twig',
             'debug' => (bool)$this->debug,
             'auto_reload' => Config::getParam('twig.autoreload', TRUE),
         ));

src/base/Security.php

Spacing +8 added lines, -8 removed lines

@@ -73,7 +73,7 @@ 
             session_start();
         }
         // Fix for phpunits
-        if(!isset($_SESSION)) {
+        if (!isset($_SESSION)) {
             $_SESSION = [];
         }
     }
@@ -133,12 +133,12 @@ 
     {
         $saved = true;
         try {
-            $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true) ?: [];
-            $admins[$user['username']]['hash'] = sha1($user['username'] . $user['password']);
+            $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true) ?: [];
+            $admins[$user['username']]['hash'] = sha1($user['username'].$user['password']);
             $admins[$user['username']]['profile'] = $user['profile'];
 
-            Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', $admins, Cache::JSONGZ, true);
-        } catch(\Exception $e) {
+            Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', $admins, Cache::JSONGZ, true);
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             $saved = false;
         }
@@ -175,7 +175,7 @@ 
      */
     public function getAdmins()
     {
-        return Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true);
+        return Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true);
     }
 
     /**
@@ -203,7 +203,7 @@ 
                 }
                 if (!empty($user) && !empty($admins[$user])) {
                     $auth = $admins[$user]['hash'];
-                    $this->authorized = ($auth == sha1($user . $pass));
+                    $this->authorized = ($auth == sha1($user.$pass));
                     if ($this->authorized) {
                         $this->admin = array(
                             'alias' => $user,
@@ -211,7 +211,7 @@ 
                         );
                         $this->setSessionKey(self::ADMIN_ID_TOKEN, serialize($this->admin));
                     }
-                } else {
+                }else {
                     $this->admin = null;
                     $this->setSessionKey(self::ADMIN_ID_TOKEN, null);
                 }

src/base/dto/Dto.php

Spacing +4 added lines, -4 removed lines

@@ -35,15 +35,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;
     }

src/controller/GeneratorController.php

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", $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