psfs / core

src/base/Router.php

Spacing +24 added lines, -24 removed lines

@@ -62,8 +62,8 @@ 
      */
     public function init()
     {
-        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', $this->cacheType, TRUE);
-        $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->cacheType, TRUE);
+        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', $this->cacheType, TRUE);
+        $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->cacheType, TRUE);
         if (empty($this->routing) || Config::getParam('debug', true)) {
             $this->debugLoad();
         }
@@ -79,12 +79,12 @@ 
      */
     private function debugLoad()
     {
-                if(!Config::getParam('skip.route_generation', false)) {
+                if (!Config::getParam('skip.route_generation', false)) {
                     Logger::log('Begin routes load');
                     $this->hydrateRouting();
                     $this->simpatize();
                     Logger::log('End routes load');
-                } else {
+                }else {
                     Logger::log('Routes generation skipped');
                 }
     }
@@ -101,13 +101,13 @@ 
         try {
             //Search action and execute
             return $this->searchAction($route);
-        } catch (AccessDeniedException $e) {
-            Logger::log(t('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile() . '[' . $e->getLine() . ']']);
+        }catch (AccessDeniedException $e) {
+            Logger::log(t('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile().'['.$e->getLine().']']);
             return Admin::staticAdminLogon();
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             Logger::log($r->getMessage(), LOG_WARNING);
             $code = $r->getCode();
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -125,7 +125,7 @@ 
      */
     protected function searchAction($route)
     {
-        Inspector::stats('[Router] Searching action to execute: ' . $route, Inspector::SCOPE_DEBUG);
+        Inspector::stats('[Router] Searching action to execute: '.$route, Inspector::SCOPE_DEBUG);
         //Revisamos si tenemos la ruta registrada
         $parts = parse_url($route);
         $path = array_key_exists('path', $parts) ? $parts['path'] : $route;
@@ -145,7 +145,7 @@ 
                     }
 
                     throw new RouterException(t('Preconditions failed'), 412);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw $e;
                 }
@@ -170,7 +170,7 @@ 
                 }
             }
             $valid = count($action['requirements']) === $checked;
-        } else {
+        }else {
             $valid = true;
         }
         return $valid;
@@ -193,11 +193,11 @@ 
             if ($modules->hasResults()) {
                 foreach ($modules->getIterator() as $modulePath) {
                     $module = $modulePath->getBasename();
-                    $this->routing = $this->inspectDir($modulesPath . DIRECTORY_SEPARATOR . $module, $module, $this->routing);
+                    $this->routing = $this->inspectDir($modulesPath.DIRECTORY_SEPARATOR.$module, $module, $this->routing);
                 }
             }
         }
-        $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->domains, Cache::JSON, TRUE);
+        $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->domains, Cache::JSON, TRUE);
     }
 
     /**
@@ -214,7 +214,7 @@ 
             $homeParams = NULL;
             foreach ($this->routing as $pattern => $params) {
                 list($method, $route) = RouterHelper::extractHttpRoute($pattern);
-                if (preg_match('/' . preg_quote($route, '/') . '$/i', '/' . $home)) {
+                if (preg_match('/'.preg_quote($route, '/').'$/i', '/'.$home)) {
                     $homeParams = $params;
                 }
                 unset($method);
@@ -246,18 +246,18 @@ 
     {
         $baseUrl = $absolute ? Request::getInstance()->getRootUrl() : '';
         if ('' === $slug) {
-            return $baseUrl . '/';
+            return $baseUrl.'/';
         }
         if (!is_array($this->slugs) || !array_key_exists($slug, $this->slugs)) {
             throw new RouterException(t('No existe la ruta especificada'));
         }
-        $url = $baseUrl . $this->slugs[$slug];
+        $url = $baseUrl.$this->slugs[$slug];
         if (!empty($params)) {
             foreach ($params as $key => $value) {
-                $url = str_replace('{' . $key . '}', $value, $url);
+                $url = str_replace('{'.$key.'}', $value, $url);
             }
         } elseif (!empty($this->routing[$this->slugs[$slug]]['default'])) {
-            $url = $baseUrl . $this->routing[$this->slugs[$slug]]['default'];
+            $url = $baseUrl.$this->routing[$this->slugs[$slug]]['default'];
         }
 
         return preg_replace('/(GET|POST|PUT|DELETE|ALL|HEAD|PATCH)\#\|\#/', '', $url);
@@ -269,7 +269,7 @@ 
      */
     private function checkPreActions($class, $method)
     {
-        $preAction = 'pre' . ucfirst($method);
+        $preAction = 'pre'.ucfirst($method);
         if (method_exists($class, $preAction)) {
             Inspector::stats('[Router] Pre action invoked', Inspector::SCOPE_DEBUG);
             try {
@@ -277,7 +277,7 @@ 
                     Logger::log(t('Pre action failed'), LOG_ERR, [error_get_last()]);
                     error_clear_last();
                 }
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR, [$class, $method]);
             }
         }
@@ -294,7 +294,7 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Inspector::stats('[Router] Executing route ' . $route, Inspector::SCOPE_DEBUG);
+        Inspector::stats('[Router] Executing route '.$route, Inspector::SCOPE_DEBUG);
         $action['params'] = array_merge($action['params'], $params, Request::getInstance()->getQueryParams());
         Security::getInstance()->setSessionKey(Cache::CACHE_SESSION_VAR, $action);
         $cache = Cache::needCache();
@@ -302,15 +302,15 @@ 
         $return = null;
         if (FALSE !== $cache && $action['http'] === 'GET' && Config::getParam('debug') === FALSE) {
             list($path, $cacheDataName) = $this->cache->getRequestCacheHash();
-            $cachedData = $this->cache->readFromCache('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $cache);
+            $cachedData = $this->cache->readFromCache('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $cache);
             if (NULL !== $cachedData) {
-                $headers = $this->cache->readFromCache('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', $cache, null, Cache::JSON);
+                $headers = $this->cache->readFromCache('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', $cache, null, Cache::JSON);
                 Template::getInstance()->renderCache($cachedData, $headers);
                 $execute = FALSE;
             }
         }
         if ($execute) {
-            Inspector::stats('[Router] Start executing action ' . $route, Inspector::SCOPE_DEBUG);
+            Inspector::stats('[Router] Start executing action '.$route, Inspector::SCOPE_DEBUG);
             $this->checkPreActions($class, $action['method']);
             $return = call_user_func_array([$class, $action['method']], $params);
             if (false === $return) {

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

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
      * @param true $isArray
      * @return array
      */
-    public function processPayload(array|string $namespace, bool $isArray): array
+    public function processPayload(array | string $namespace, bool $isArray): array
     {
         if (false !== strpos($namespace, '[') && false !== strpos($namespace, ']')) {
             $namespace = str_replace(']', '', str_replace('[', '', $namespace));
@@ -102,7 +102,7 @@ 
             list($isArray, $payload) = $this->processPayload($namespace, $isArray);
             $reflector = new ReflectionClass($namespace);
             $shortName = $reflector->getShortName();
-        } else {
+        }else {
             $namespace = $model;
             $shortName = $model;
         }
@@ -177,10 +177,10 @@ 
                     if ($module === $requestModule && !preg_match('/^ROOT/i', $module)) {
                         $modules = [
                             'name' => $module,
-                            'path' => realpath(dirname($info['base'] . DIRECTORY_SEPARATOR . '..')),
+                            'path' => realpath(dirname($info['base'].DIRECTORY_SEPARATOR.'..')),
                         ];
                     }
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $modules[] = $e->getMessage();
                 }
             }
@@ -223,7 +223,7 @@ 
             } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 $payload = $this->extractDtoProperties($namespace);
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
 

src/base/extension/CustomTranslateExtension.php

Spacing +11 added lines, -11 removed lines

@@ -48,7 +48,7 @@ 
     {
         // Gather always the base translations
         $standardTranslations = [];
-        self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale . '.json']);
+        self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale.'.json']);
         if (file_exists(self::$filename)) {
             $standardTranslations = json_decode(file_get_contents(self::$filename), true);
         }
@@ -67,32 +67,32 @@ 
         $session_locale = $session->getSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY);
         self::$locale = $forceReload ? $session_locale : I18nHelper::extractLocale($session_locale);
         $version = $session->getSessionKey(self::LOCALE_CACHED_VERSION);
-        $configVersion = self::$locale . '_' . Config::getParam('cache.var', 'v1');
+        $configVersion = self::$locale.'_'.Config::getParam('cache.var', 'v1');
         if ($forceReload) {
             Inspector::stats('[translationsCheckLoad] Force translations reload', Inspector::SCOPE_DEBUG);
             self::dropInstance();
             $version = null;
             self::$translations = [];
         }
-        if(count(self::$translations) === 0) {
+        if (count(self::$translations) === 0) {
             Inspector::stats('[translationsCheckLoad] Extracting translations', Inspector::SCOPE_DEBUG);
             self::$generate = (boolean)Config::getParam('i18n.autogenerate', false);
-            if(null !== $version && $version === $configVersion) {
+            if (null !== $version && $version === $configVersion) {
                 Inspector::stats('[translationsCheckLoad] Translations loaded from session', Inspector::SCOPE_DEBUG);
                 self::$translations = $session->getSessionKey(self::LOCALE_CACHED_TAG);
-            } else {
+            }else {
                 if (!$useBase) {
                     $customKey = $customKey ?: $session->getSessionKey(self::CUSTOM_LOCALE_SESSION_KEY);
                 }
                 $standardTranslations = self::extractBaseTranslations();
                 // If the project has custom translations, gather them
                 if (null !== $customKey) {
-                    Logger::log('[' . self::class . '] Custom key detected: ' . $customKey, LOG_INFO);
-                    self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale . '.json']);
+                    Logger::log('['.self::class.'] Custom key detected: '.$customKey, LOG_INFO);
+                    self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale.'.json']);
                 }
                 // Finally we merge base and custom translations to complete all the i18n set
                 if (file_exists(self::$filename)) {
-                    Logger::log('[' . self::class . '] Custom locale detected: ' . $customKey . ' [' . self::$locale . ']', LOG_INFO);
+                    Logger::log('['.self::class.'] Custom locale detected: '.$customKey.' ['.self::$locale.']', LOG_INFO);
                     self::$translations = array_merge($standardTranslations, json_decode(file_get_contents(self::$filename), true));
                     $session->setSessionKey(self::LOCALE_CACHED_TAG, self::$translations);
                     $session->setSessionKey(self::LOCALE_CACHED_VERSION, $configVersion);
@@ -118,7 +118,7 @@ 
     public function getFilters()
     {
         return array(
-            new TwigFilter('trans', function ($message) {
+            new TwigFilter('trans', function($message) {
                 return self::_($message);
             }),
         );
@@ -140,12 +140,12 @@ 
      */
     public static function _($message, $customKey = null, $forceReload = false)
     {
-        if(0 === count(self::$translations) || $forceReload) {
+        if (0 === count(self::$translations) || $forceReload) {
             self::translationsCheckLoad($customKey, $forceReload);
         }
         if (is_array(self::$translations) && array_key_exists($message, self::$translations)) {
             $translation = self::$translations[$message];
-        } else {
+        }else {
             $translation = gettext($message);
         }
         if (self::$generate) {

src/controller/ConfigController.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
         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);
     }
@@ -53,7 +53,7 @@ 
      */
     public function config()
     {
-        Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri());
+        Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri());
         if (defined('PSFS_UNIT_TESTING_EXECUTION')) {
             throw new ConfigException('CONFIG');
         }
@@ -92,7 +92,7 @@ 
                 }
                 Security::getInstance()->setFlash("callback_message", t("Configuración actualizada correctamente"));
                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-config", true));
-            } else {
+            }else {
                 throw new HttpException(t('Error al guardar la configuración, prueba a cambiar los permisos'), 403);
             }
         }

src/base/Cache.php

Spacing +10 added lines, -10 removed lines

@@ -56,7 +56,7 @@ 
     {
         GeneratorHelper::createDir(dirname($path));
         if (false === FileHelper::writeFile($path, $data)) {
-            throw new ConfigException(t('No se tienen los permisos suficientes para escribir en el fichero ') . $path);
+            throw new ConfigException(t('No se tienen los permisos suficientes para escribir en el fichero ').$path);
         }
     }
 
@@ -70,7 +70,7 @@ 
     {
         Inspector::stats('[Cache] Gathering data from cache', Inspector::SCOPE_DEBUG);
         $data = null;
-        $absolutePath = $absolute ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = $absolute ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         if (file_exists($absolutePath)) {
             $data = FileHelper::readFile($absolutePath);
         }
@@ -86,7 +86,7 @@ 
     private function hasExpiredCache($path, $expires = 300, $absolute = false)
     {
         Inspector::stats('[Cache] Checking expiration', Inspector::SCOPE_DEBUG);
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $lasModificationDate = filemtime($absolutePath);
         return ($lasModificationDate + $expires <= time());
     }
@@ -153,7 +153,7 @@ 
     {
         Inspector::stats('[Cache] Store data in cache', Inspector::SCOPE_DEBUG);
         $data = self::transformData($data, $transform);
-        $absolutePath = $absolute ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = $absolute ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $this->saveTextToFile($data, $absolutePath);
     }
 
@@ -170,12 +170,12 @@ 
     public function readFromCache($path, $expires = 300, $function = null, $transform = Cache::TEXT, $ignoreExpiration = false)
     {
         $data = null;
-        Inspector::stats('[Cache] Reading data from cache: ' . json_encode(['path' => $path]), Inspector::SCOPE_DEBUG);
-        if (file_exists(CACHE_DIR . DIRECTORY_SEPARATOR . $path)) {
+        Inspector::stats('[Cache] Reading data from cache: '.json_encode(['path' => $path]), Inspector::SCOPE_DEBUG);
+        if (file_exists(CACHE_DIR.DIRECTORY_SEPARATOR.$path)) {
             if (is_callable($function) && $this->hasExpiredCache($path, $expires) && !$ignoreExpiration) {
                 $data = $function();
                 $this->storeData($path, $data, $transform);
-            } else {
+            }else {
                 $data = $this->getDataFromFile($path, $transform);
             }
         }
@@ -221,7 +221,7 @@ 
             $query[Api::HEADER_API_LANG] = Request::header(Api::HEADER_API_LANG, 'es');
             $filename = FileHelper::generateHashFilename($action['http'], $action['slug'], $query);
             $hashPath = FileHelper::generateCachePath($action, $query);
-            Inspector::stats('[Cache] Cache file calculated: ' . json_encode(['file' => $filename, 'hash' => $hashPath]), Inspector::SCOPE_DEBUG);
+            Inspector::stats('[Cache] Cache file calculated: '.json_encode(['file' => $filename, 'hash' => $hashPath]), Inspector::SCOPE_DEBUG);
             Logger::log('Cache file calculated', LOG_DEBUG, ['file' => $filename, 'hash' => $hashPath]);
         }
         return [$hashPath, $filename];
@@ -233,9 +233,9 @@ 
             Inspector::stats('[Cache] Flushing cache', Inspector::SCOPE_DEBUG);
             $action = Security::getInstance()->getSessionKey(self::CACHE_SESSION_VAR);
             if (is_array($action)) {
-                $hashPath = FileHelper::generateCachePath($action, $action['params']) . '..' . DIRECTORY_SEPARATOR . ' .. ' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
+                $hashPath = FileHelper::generateCachePath($action, $action['params']).'..'.DIRECTORY_SEPARATOR.' .. '.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
                 if (!file_exists($hashPath)) {
-                    $hashPath = CACHE_DIR . DIRECTORY_SEPARATOR . $hashPath;
+                    $hashPath = CACHE_DIR.DIRECTORY_SEPARATOR.$hashPath;
                 }
                 FileHelper::deleteDir($hashPath);
             }

src/bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -8,24 +8,24 @@
 defined('JSON_THROW_ON_ERROR') or define('JSON_THROW_ON_ERROR', 4194304);
 defined('JSON_INVALID_UTF8_SUBSTITUTE') or define('JSON_INVALID_UTF8_SUBSTITUTE', 2097152);
 
-if (defined('PSFS_PHAR_DIR') && file_exists(PSFS_PHAR_DIR . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'environment.php')) {
-    @require_once PSFS_PHAR_DIR . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'environment.php';
+if (defined('PSFS_PHAR_DIR') && file_exists(PSFS_PHAR_DIR.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'environment.php')) {
+    @require_once PSFS_PHAR_DIR.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'environment.php';
 }
 
 defined('SOURCE_DIR') or define('SOURCE_DIR', __DIR__);
 if (str_contains(SOURCE_DIR, 'vendor')) {
-    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..');
+    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'src');
+}else {
+    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..');
+    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'modules');
 }
-defined('VENDOR_DIR') or define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
-defined('LOG_DIR') or define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-defined('CACHE_DIR') or define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-defined('CONFIG_DIR') or define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-defined('WEB_DIR') or define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
-defined('LOCALE_DIR') or define('LOCALE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+defined('VENDOR_DIR') or define('VENDOR_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'vendor');
+defined('LOG_DIR') or define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+defined('CACHE_DIR') or define('CACHE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'cache');
+defined('CONFIG_DIR') or define('CONFIG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'config');
+defined('WEB_DIR') or define('WEB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'html');
+defined('LOCALE_DIR') or define('LOCALE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
 
 if (!class_exists(bootstrap::class)) {
     /**

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
         {
             if (!self::$loaded) {
                 defined('PSFS_BOOTSTRAP_LOADED') or define('PSFS_BOOTSTRAP_LOADED', true);
-                if (class_exists("\\PSFS\\base\\Logger")) \PSFS\base\Logger::log('Bootstrap initialized', LOG_INFO);
+                if (class_exists("\\PSFS\\base\\Logger")) {
+                    \PSFS\base\Logger::log('Bootstrap initialized', LOG_INFO);
+                }
                 self::$loaded = true;
             }
         }

src/autoload.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
     // autoloader
     function PSFSAutoloader($class): false
     {
-        Logger::log("Trying to load class {$class} with " . __FILE__);
+        Logger::log("Trying to load class {$class} with ".__FILE__);
         // it only autoload class into the Rain scope
         if (str_contains($class, 'PSFS')) {
             // Change order src
@@ -23,13 +23,13 @@ 
             $path = str_replace("\\", DIRECTORY_SEPARATOR, $class);
 
             // filepath
-            $abs_path = SOURCE_DIR . DIRECTORY_SEPARATOR . $path . ".php";
+            $abs_path = SOURCE_DIR.DIRECTORY_SEPARATOR.$path.".php";
 
             // require the file
             if (file_exists($abs_path)) {
                 require_once $abs_path;
-            } else {
-                Logger::log("{$class} not loaded with " . __FILE__);
+            }else {
+                Logger::log("{$class} not loaded with ".__FILE__);
             }
         }
         return false;

src/services/MigrationService.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
      * @throws \PSFS\base\exception\GeneratorException
      */
     public function getConnectionManager(string $module, string $path): array {
-        $modulePath = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $path . $module);
+        $modulePath = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $path.$module);
         $generatorConfig = $this->getConfigGenerator($modulePath);
 
         $manager = new MigrationManager();

src/services/GeneratorService.php

Spacing +28 added lines, -28 removed lines

@@ -49,14 +49,14 @@ 
      */
     public function createStructureModule(string $module, bool $force = false, string $type = "", string $apiClass = "", bool $skipMigration = false): void
     {
-        $modPath = CORE_DIR . DIRECTORY_SEPARATOR;
+        $modPath = CORE_DIR.DIRECTORY_SEPARATOR;
         $module = ucfirst($module);
         $this->createModulePath($module, $modPath);
         $this->createModulePathTree($module, $modPath);
         $this->createModuleBaseFiles($module, $modPath, $force, $type);
         $this->createModuleModels($module, $modPath);
         $this->generateBaseApiTemplate($module, $modPath, $force, $apiClass);
-        if(!$skipMigration) {
+        if (!$skipMigration) {
             $this->createModuleMigrations($module, $modPath);
         }
         //Redireccionamos al home definido
@@ -73,7 +73,7 @@ 
      */
     private function createModuleBaseFiles($module, $modPath, $force = false, $controllerType = '')
     {
-        $modulePath = $modPath . $module;
+        $modulePath = $modPath.$module;
         $this->generateControllerTemplate($module, $modulePath, $force, $controllerType);
         $this->generateServiceTemplate($module, $modulePath, $force);
         $this->generateSchemaTemplate($module, $modulePath, $force);
@@ -94,7 +94,7 @@ 
         $this->genereateAutoloaderTemplate($module, $modulePath, $force);
         $this->generatePropertiesTemplate($module, $modulePath, $force);
         $this->generateConfigTemplate($modulePath, $force);
-        $this->createModuleModels($module, CORE_DIR . DIRECTORY_SEPARATOR);
+        $this->createModuleModels($module, CORE_DIR.DIRECTORY_SEPARATOR);
     }
 
     /**
@@ -114,26 +114,26 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
             "class" => $class,
-            "controllerType" => $class . "Base",
+            "controllerType" => $class."Base",
             "is_base" => false
         ));
-        $controller = $this->writeTemplateToFile($controllerBody, $modPath . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "{$class}Controller.php", $force);
+        $controller = $this->writeTemplateToFile($controllerBody, $modPath.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, $modPath . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true);
+        $controllerBase = $this->writeTemplateToFile($controllerBody, $modPath.DIRECTORY_SEPARATOR."Controller".
+            DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true);
 
-        $filename = $modPath . DIRECTORY_SEPARATOR . "Test" . DIRECTORY_SEPARATOR . "{$class}Test.php";
+        $filename = $modPath.DIRECTORY_SEPARATOR."Test".DIRECTORY_SEPARATOR."{$class}Test.php";
         $test = true;
         if (!file_exists($filename)) {
             $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array(
@@ -154,7 +154,7 @@ 
      */
     private function createModuleModels($module, $path)
     {
-        $modulePath = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $path . $module);
+        $modulePath = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $path.$module);
         $configGenerator = $this->getConfigGenerator($modulePath);
 
         $this->buildModels($configGenerator);
@@ -163,8 +163,8 @@ 
         $configTemplate = $this->tpl->dump("generator/config.propel.template.twig", array(
             "module" => $module,
         ));
-        $this->writeTemplateToFile($configTemplate, CORE_DIR . DIRECTORY_SEPARATOR . $modulePath . DIRECTORY_SEPARATOR . "Config" .
-            DIRECTORY_SEPARATOR . "config.php", true);
+        $this->writeTemplateToFile($configTemplate, CORE_DIR.DIRECTORY_SEPARATOR.$modulePath.DIRECTORY_SEPARATOR."Config".
+            DIRECTORY_SEPARATOR."config.php", true);
         Logger::log("Generado config genérico para propel");
     }
 
@@ -230,7 +230,7 @@ 
 
         if ($totalNbTables) {
             Logger::log(sprintf('%d tables found in all databases.', $totalNbTables));
-        } else {
+        }else {
             Logger::log('No table found in all databases');
         }
 
@@ -288,7 +288,7 @@ 
         $migrationFileName = $manager->getMigrationFileName($timestamp);
         $migrationClassBody = $manager->getMigrationClassBody($migrationsUp, $migrationsDown, $timestamp);
 
-        $file = $generatorConfig->getSection('paths')['migrationDir'] . DIRECTORY_SEPARATOR . $migrationFileName;
+        $file = $generatorConfig->getSection('paths')['migrationDir'].DIRECTORY_SEPARATOR.$migrationFileName;
         file_put_contents($file, $migrationClassBody);
 
         Logger::log(sprintf('"%s" file successfully created.', $file));
@@ -306,8 +306,8 @@ 
     private function generateBaseApiTemplate($module, $modPath, $force = false, $apiClass = "")
     {
         $created = true;
-        $modelPath = $modPath . $module . DIRECTORY_SEPARATOR . 'Models';
-        $apiPath = $modPath . $module . DIRECTORY_SEPARATOR . 'Api';
+        $modelPath = $modPath.$module.DIRECTORY_SEPARATOR.'Models';
+        $apiPath = $modPath.$module.DIRECTORY_SEPARATOR.'Api';
         if (file_exists($modelPath)) {
             $dir = dir($modelPath);
             $this->generateApiFiles($module, $force, $apiClass, $dir, $apiPath);
@@ -325,7 +325,7 @@ 
         //Generamos el fichero de configuración
         Logger::log("Generamos fichero vacío de configuración");
         return $this->writeTemplateToFile("<?php\n\t",
-            $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php",
+            $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php",
             $force);
     }
 
@@ -346,7 +346,7 @@ 
             "db" => $this->config->get("db_name"),
         ));
         return $this->writeTemplateToFile($schema,
-            $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml",
+            $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml",
             $force);
     }
 
@@ -364,7 +364,7 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '', $module),
         ));
         return $this->writeTemplateToFile($buildProperties,
-            $modPath . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.php",
+            $modPath.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.php",
             $force);
     }
 
@@ -382,7 +382,7 @@ 
             "module" => $module,
         ));
         return $this->writeTemplateToFile($index,
-            $modPath . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig",
+            $modPath.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig",
             $force);
     }
 
@@ -412,7 +412,7 @@ 
         ));
 
         return $this->writeTemplateToFile($controller,
-            $modPath . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
+            $modPath.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
     }
 
     /**
@@ -437,7 +437,7 @@ 
             "package" => $package,
         ));
 
-        return $this->writeTemplateToFile($controller, $modPath . DIRECTORY_SEPARATOR . "{$api}.php", $force);
+        return $this->writeTemplateToFile($controller, $modPath.DIRECTORY_SEPARATOR."{$api}.php", $force);
     }
 
     /**
@@ -454,9 +454,9 @@ 
         $base = $dir->path;
         while ($file = $dir->read()) {
             if (!in_array(strtolower($file), ['.', '..', 'base', 'map'])) {
-                if (is_dir($base . DIRECTORY_SEPARATOR . $file)) {
-                    $this->generateApiFiles($module, $force, $apiClass, dir($base . DIRECTORY_SEPARATOR . $file), $apiPath . DIRECTORY_SEPARATOR . $file, $file);
-                } else if (!preg_match('/Query\.php$/i', $file)
+                if (is_dir($base.DIRECTORY_SEPARATOR.$file)) {
+                    $this->generateApiFiles($module, $force, $apiClass, dir($base.DIRECTORY_SEPARATOR.$file), $apiPath.DIRECTORY_SEPARATOR.$file, $file);
+                }else if (!preg_match('/Query\.php$/i', $file)
                     && !preg_match('/I18n\.php$/i', $file)
                     && preg_match('/\.php$/i', $file)
                 ) {
@@ -485,7 +485,7 @@ 
             $parts[] = $package;
         }
         $parts[] = $filename;
-        $namespace = '\\' . implode('\\', $parts);
+        $namespace = '\\'.implode('\\', $parts);
         $reflectorClass = new \ReflectionClass($namespace);
         $isModel = $reflectorClass->isInstantiable();
         return $isModel;