psfs / core

src/base/types/traits/Helper/ServerTrait.php

Spacing +2 added lines, -2 removed lines

@@ -54,10 +54,10 @@
     public function getServerName()
     {
         $serverName = $this->getServer('SERVER_NAME');
-        if(empty($serverName)) {
+        if (empty($serverName)) {
             $serverName = $this->getServer('HTTP_HOST');
         }
-        if(str_contains($serverName ?? '', ':')) {
+        if (str_contains($serverName ?? '', ':')) {
             $pieces = explode(':', $serverName);
             $serverName = $pieces[0];
         }

src/base/dto/JsonResponse.php

Spacing +2 added lines, -2 removed lines

@@ -33,10 +33,10 @@
     private function parseData($data) {
         if ($data instanceof \Generator) {
             $generatedData = [];
-            foreach($data as $datum) {
+            foreach ($data as $datum) {
                 $generatedData[] = $datum;
             }
-        } else {
+        }else {
             $generatedData = $data;
         }
         return $generatedData;

src/autoload.php

Spacing +3 added lines, -3 removed lines

@@ -22,11 +22,11 @@ 
         if (str_starts_with($class, 'PSFS\\')) {
             $relativeClass = substr($class, strlen('PSFS\\'));
 
-            $file = SOURCE_DIR . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $relativeClass) . '.php';
+            $file = SOURCE_DIR.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $relativeClass).'.php';
 
             if (file_exists($file)) {
                 require_once $file;
-            } else if (class_exists('PSFS\\base\\Logger')) {
+            }else if (class_exists('PSFS\\base\\Logger')) {
                 \PSFS\base\Logger::log("[Autoloader] Class $class not found at $file", LOG_WARNING);
             }
         }
@@ -35,7 +35,7 @@ 
 
 // Registro automático del autoloader (puedes comentarlo si lo haces desde bootstrap)
 if (!defined('SOURCE_DIR')) {
-    define('SOURCE_DIR', dirname(__DIR__) . '/src');
+    define('SOURCE_DIR', dirname(__DIR__).'/src');
 }
 
 Autoloader::register();

src/base/types/traits/Generator/StructureTrait.php

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
         // Creates the src folder
         GeneratorHelper::createDir($modPath);
         // Create module path
-        GeneratorHelper::createDir($modPath . $module);
+        GeneratorHelper::createDir($modPath.$module);
     }
 
     /**
@@ -42,16 +42,16 @@ 
         Logger::log("Generamos la estructura");
         $paths = [
             "Api", "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"
         ];
-        $modulePath = $modPath . $module;
+        $modulePath = $modPath.$module;
         foreach ($paths as $path) {
-            GeneratorHelper::createDir($modulePath . DIRECTORY_SEPARATOR . $path);
+            GeneratorHelper::createDir($modulePath.DIRECTORY_SEPARATOR.$path);
         }
         //Creamos las carpetas de los assets
         $htmlPaths = array("css", "js", "img", "media", "font");
         foreach ($htmlPaths as $path) {
-            GeneratorHelper::createDir($modulePath . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
+            GeneratorHelper::createDir($modulePath.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
         }
     }
 
@@ -66,10 +66,10 @@ 
         //Generamos el fichero de configuración
         Logger::log("Generamos ficheros para assets base");
         $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n",
-            $modPath . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css",
+            $modPath.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})();",
-            $modPath . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js",
+            $modPath.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js",
             $force);
         return ($css && $js);
     }
@@ -91,7 +91,7 @@ 
             "class" => $class,
         ));
         return $this->writeTemplateToFile($controller,
-            $modPath . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php",
+            $modPath.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php",
             $force);
     }
 
@@ -110,13 +110,13 @@ 
             "autoloader" => preg_replace('/(\\\|\/)/', '_', $module),
             "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
         ));
-        $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", true);
+        $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", true);
 
         Logger::log("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;
     }
 }

src/base/types/helpers/ResponseHelper.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
     {
         if (str_contains($header, ':')) {
             list($key, $value) = explode(':', $header);
-        } else {
+        }else {
             $key = 'Http Status';
             $value = $header;
         }
@@ -101,9 +101,9 @@ 
             Logger::log('Adding debug headers to render response');
             $vars["__DEBUG__"]["includes"] = get_included_files();
             $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            self::setHeader('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s');
-            self::setHeader('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes');
-            self::setHeader('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened');
+            self::setHeader('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s');
+            self::setHeader('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes');
+            self::setHeader('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened');
         }
 
         return $vars;
@@ -115,7 +115,7 @@ 
      * @return int|string
      * @throws GeneratorException
      */
-    public static function httpNotFound(\Throwable $exception = null, bool $isJson = false): int|string
+    public static function httpNotFound(\Throwable $exception = null, bool $isJson = false): int | string
     {
         if (self::isTest()) {
             return 404;
@@ -134,7 +134,7 @@ 
         $notFoundRoute = Config::getParam('route.404');
         if (null !== $notFoundRoute) {
             Request::getInstance()->redirect(Router::getInstance()->getRoute($notFoundRoute, true));
-        } else {
+        }else {
             return $template->render('error.html.twig', array(
                 'exception' => $exception,
                 'trace' => $exception->getTraceAsString(),

src/base/types/AuthApi.php

Spacing +2 added lines, -2 removed lines

@@ -32,13 +32,13 @@
     {
         $namespace = explode('\\', $this->getModelTableMap());
         $module = strtolower($namespace[0]);
-        $secret = Config::getInstance()->get($module . '.api.secret');
+        $secret = Config::getInstance()->get($module.'.api.secret');
         if (null === $secret) {
             $secret = Config::getInstance()->get("api.secret");
         }
         if (null === $secret) {
             $auth = true;
-        } else {
+        }else {
             $token = Request::getInstance()->getHeader('X-API-SEC-TOKEN');
             if (array_key_exists('API_TOKEN', $this->query)) {
                 $token = $this->query['API_TOKEN'];

src/base/Router.php

Spacing +25 added lines, -25 removed lines

@@ -64,8 +64,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();
         }
@@ -86,7 +86,7 @@ 
             $this->hydrateRouting();
             $this->simpatize();
             Logger::log('End routes load');
-        } else {
+        }else {
             Logger::log('Routes generation skipped');
         }
     }
@@ -103,13 +103,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;
         }
@@ -127,7 +127,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;
@@ -148,7 +148,7 @@ 
                     }
 
                     throw new RouterException(t('Preconditions failed'), 412);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw $e;
                 }
@@ -173,7 +173,7 @@ 
                 }
             }
             $valid = count($action['requirements']) === $checked;
-        } else {
+        }else {
             $valid = true;
         }
         return $valid;
@@ -196,11 +196,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);
     }
 
     /**
@@ -217,7 +217,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);
@@ -249,18 +249,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);
@@ -275,7 +275,7 @@ 
         if ($this->hasToRunPreChecks($class)) {
             self::run($class, '__check', true);
         }
-        $preAction = 'pre' . ucfirst($method);
+        $preAction = 'pre'.ucfirst($method);
         if (method_exists($class, $preAction)) {
             self::run($class, $preAction);
         }
@@ -290,13 +290,13 @@ 
      */
     public static function run($class, $method, $throwExceptions = false): void
     {
-        Inspector::stats("[Router] Pre action invoked " . get_class($class) . "::{$method}", Inspector::SCOPE_DEBUG);
+        Inspector::stats("[Router] Pre action invoked ".get_class($class)."::{$method}", Inspector::SCOPE_DEBUG);
         try {
             if (false === call_user_func_array([$class, $method], [])) {
-                Logger::log(t("[Router] action " . get_class($class) . "::{$method} failed"), LOG_ERR, [error_get_last()]);
+                Logger::log(t("[Router] action ".get_class($class)."::{$method} failed"), LOG_ERR, [error_get_last()]);
                 error_clear_last();
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR, [$class, $method]);
             if ($throwExceptions) {
                 throw $e;
@@ -325,7 +325,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();
@@ -333,15 +333,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/Dispatcher.php

Spacing +6 added lines, -6 removed lines

@@ -85,18 +85,18 @@
                 if (!Request::getInstance()->isFile()) {
                     return $this->router->execute($uri ?? $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->handleException($e);
         }
 

src/base/types/traits/Helper/FieldModelHelperTrait.php

Spacing +11 added lines, -11 removed lines

@@ -33,7 +33,7 @@ 
         $fDto->entity = $relatedModel;
         $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName());
         $fDto->relatedField = $relatedField->getPhpName();
-        $fDto->url = Router::getInstance()->getRoute(strtolower($domain) . '-api-' . $relatedModel);
+        $fDto->url = Router::getInstance()->getRoute(strtolower($domain).'-api-'.$relatedModel);
         return $fDto;
     }
 
@@ -42,7 +42,7 @@ 
      * @param ModelCriteria $query
      * @param mixed $value
      */
-    private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null)
+    private static function addQueryFilter(ColumnMap $column, ModelCriteria & $query, $value = null)
     {
         $tableField = $column->getFullyQualifiedName();
         if (is_array($value)) {
@@ -52,8 +52,8 @@ 
         } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) {
             $text = preg_replace('/(\'|\")/', '', $value);
             $text = preg_replace('/\ /', '%', $text);
-            $query->add($tableField, '%' . $text . '%', Criteria::LIKE);
-        } else {
+            $query->add($tableField, '%'.$text.'%', Criteria::LIKE);
+        }else {
             if (null !== $column->getValueSet()) {
                 $valueSet = $column->getValueSet();
                 if (in_array($value, $valueSet)) {
@@ -71,7 +71,7 @@ 
      * @param string $field
      * @param mixed $value
      */
-    public static function addModelField(TableMap $tableMap, ModelCriteria &$query, $field, $value = null)
+    public static function addModelField(TableMap $tableMap, ModelCriteria & $query, $field, $value = null)
     {
         if ($column = self::checkFieldExists($tableMap, $field)) {
             self::addQueryFilter($column, $query, $value);
@@ -86,7 +86,7 @@ 
      */
     public static function extractQuery($modelNameNamespace, ConnectionInterface $con = null)
     {
-        $queryReflector = new \ReflectionClass($modelNameNamespace . "Query");
+        $queryReflector = new \ReflectionClass($modelNameNamespace."Query");
         /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
         $query = $queryReflector->getMethod('create')->invoke($con);
 
@@ -99,13 +99,13 @@ 
      * @param array $extraColumns
      * @param mixed $value
      */
-    public static function composerComboField(TableMap $tableMap, ModelCriteria &$query, array $extraColumns = [], $value = null)
+    public static function composerComboField(TableMap $tableMap, ModelCriteria & $query, array $extraColumns = [], $value = null)
     {
         $exp = 'CONCAT(';
         $sep = '';
         foreach ($tableMap->getColumns() as $column) {
             if ($column->isText()) {
-                $exp .= $sep . 'COALESCE(' . $column->getFullyQualifiedName() . ',"")';
+                $exp .= $sep.'COALESCE('.$column->getFullyQualifiedName().',"")';
                 $sep = ', " ", ';
             }
         }
@@ -114,7 +114,7 @@ 
                 $localeTableMap = $relation->getLocalTable();
                 foreach ($localeTableMap->getColumns() as $column) {
                     if ($column->isText()) {
-                        $exp .= $sep . 'COALESCE(' . $column->getFullyQualifiedName() . ',"")';
+                        $exp .= $sep.'COALESCE('.$column->getFullyQualifiedName().',"")';
                         $sep = ', " ", ';
                     }
                 }
@@ -122,14 +122,14 @@ 
         }
         foreach (array_keys($extraColumns) as $extra) {
             if (!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) {
-                $exp .= $sep . 'COALESCE(' . $extra . ', "")';
+                $exp .= $sep.'COALESCE('.$extra.', "")';
                 $sep = ', " ", ';
             }
         }
         $exp .= ")";
         $text = preg_replace('/(\'|\")/', '', $value);
         $text = preg_replace('/\ /', '%', $text);
-        $query->where($exp . Criteria::LIKE . '"%' . $text . '%"');
+        $query->where($exp.Criteria::LIKE.'"%'.$text.'%"');
     }
 
     /**