psfs / core

src/services/AdminServices.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     {
         $platform = trim(Config::getInstance()->get('platform.name', 'PSFS'));
         ResponseHelper::setHeader('HTTP/1.1 401 Unauthorized');
-        ResponseHelper::setHeader('WWW-Authenticate: Basic Realm="' . $platform . '"');
+        ResponseHelper::setHeader('WWW-Authenticate: Basic Realm="'.$platform.'"');
         echo t('Zona restringida');
         exit();
     }
@@ -78,7 +78,7 @@ 
                             $admin['class'] = 'primary';
                             break;
                     }
-                } else {
+                }else {
                     $admin['class'] = 'primary';
                 }
             }

src/base/types/helpers/EventHelper.php

Spacing +5 added lines, -5 removed lines

@@ -13,13 +13,13 @@ 
 
     public static function handleEvents(string $eventName, mixed $context = null): void
     {
-        if(array_key_exists($eventName, self::$events)) {
-            foreach(self::$events[$eventName] as $eventClass) {
+        if (array_key_exists($eventName, self::$events)) {
+            foreach (self::$events[$eventName] as $eventClass) {
                 try {
                     $return = (new $eventClass)($context);
                     Logger::log("$eventClass event handled with return $return");
-                } catch (\Exception $exception) {
-                    Logger::log("$eventClass event handled with exception:" . $exception->getMessage(), LOG_CRIT);
+                }catch (\Exception $exception) {
+                    Logger::log("$eventClass event handled with exception:".$exception->getMessage(), LOG_CRIT);
                 }
             }
         }
@@ -27,7 +27,7 @@ 
 
     public static function addEvent(string $eventName, string $eventClass): void
     {
-        if(!array_key_exists($eventName, self::$events)) {
+        if (!array_key_exists($eventName, self::$events)) {
             self::$events[$eventName] = [];
         }
         self::$events[$eventName][] = $eventClass;

src/base/types/helpers/RequestHelper.php

Spacing +4 added lines, -4 removed lines

@@ -50,10 +50,10 @@ 
                 if (!headers_sent()) {
                     // TODO include this headers in Template class output method
                     ResponseHelper::setHeader('Access-Control-Allow-Credentials: true');
-                    ResponseHelper::setHeader('Access-Control-Allow-Origin: ' . Request::getInstance()->getServer('HTTP_ORIGIN', '*'));
+                    ResponseHelper::setHeader('Access-Control-Allow-Origin: '.Request::getInstance()->getServer('HTTP_ORIGIN', '*'));
                     ResponseHelper::setHeader('Vary: Origin');
                     ResponseHelper::setHeader('Access-Control-Allow-Methods: GET, POST, DELETE, PUT, PATCH, OPTIONS, HEAD');
-                    ResponseHelper::setHeader('Access-Control-Allow-Headers: ' . implode(', ', self::getCorsHeaders()));
+                    ResponseHelper::setHeader('Access-Control-Allow-Headers: '.implode(', ', self::getCorsHeaders()));
                 }
                 if (Request::getInstance()->getMethod() === Request::VERB_OPTIONS) {
                     Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests', LOG_DEBUG);
@@ -86,7 +86,7 @@ 
                         return $ip;
                     }
                 }
-            } else {
+            }else {
                 if (self::validateIpAddress($xForwardedFor)) {
                     return $xForwardedFor;
                 }
@@ -126,7 +126,7 @@ 
         // Verifica si la IP está en el rango válido
         if ($ipNum >= $rangoInicioNum && $ipNum <= $rangoFinNum) {
             return true; // La IP está en el rango válido
-        } else {
+        }else {
             return false; // La IP está fuera del rango válido
         }
     }

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

Spacing +4 added lines, -4 removed lines

@@ -29,12 +29,12 @@ 
         foreach ($data as $key => $value) {
             try {
                 $realValue = $model->getByName($key);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $realValue = $value;
             }
             if (Api::API_MODEL_KEY_FIELD === $key) {
                 $result[$key] = (integer)$realValue;
-            } else {
+            }else {
                 $result[$key] = $realValue;
             }
         }
@@ -49,7 +49,7 @@ 
      * @return array
      * @throws \Propel\Runtime\Exception\PropelException
      */
-    public static function mapArrayObject($namespace, ColumnMap $modelPk, array $query, array|ActiveRecordInterface $data = [])
+    public static function mapArrayObject($namespace, ColumnMap $modelPk, array $query, array | ActiveRecordInterface $data = [])
     {
         $formatter = new ObjectFormatter();
         $formatter->setClass($namespace);
@@ -67,7 +67,7 @@ 
         /** @var ActiveRecordInterface $obj */
         $obj = @$formatter->getAllObjectsFromRow($objData);
         $result = self::mapResult($obj, $data);
-        if (!preg_match('/' . $modelPk->getPhpName() . '/i', $query[Api::API_FIELDS_RESULT_FIELD])) {
+        if (!preg_match('/'.$modelPk->getPhpName().'/i', $query[Api::API_FIELDS_RESULT_FIELD])) {
             unset($result[$modelPk->getPhpName()]);
         }
         return $result;

src/base/types/traits/Api/Crud/ApiListTrait.php

Spacing +10 added lines, -10 removed lines

@@ -39,7 +39,7 @@ 
     protected function hydrateOrders()
     {
         if (count($this->query)) {
-            Logger::log(static::class . ' gathering query string', LOG_DEBUG);
+            Logger::log(static::class.' gathering query string', LOG_DEBUG);
             foreach ($this->query as $key => $value) {
                 if ($key === self::API_ORDER_FIELD) {
                     $orders = json_decode($value, true);
@@ -57,10 +57,10 @@ 
      */
     protected function extractPagination()
     {
-        Logger::log(static::class . ' extract pagination start', LOG_DEBUG);
+        Logger::log(static::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(static::class . ' extract pagination end', LOG_DEBUG);
+        Logger::log(static::class.' extract pagination end', LOG_DEBUG);
         return array($page, (int)$limit);
     }
 
@@ -69,9 +69,9 @@ 
      * @param ModelCriteria $query
      * @throws \PSFS\base\exception\ApiException
      */
-    protected function addOrders(ModelCriteria &$query)
+    protected function addOrders(ModelCriteria & $query)
     {
-        Logger::log(static::class . ' extract orders start ', LOG_DEBUG);
+        Logger::log(static::class.' extract orders start ', LOG_DEBUG);
         $orderAdded = FALSE;
         $tableMap = $this->getTableMap();
         foreach ($this->order->getOrders() as $field => $direction) {
@@ -79,7 +79,7 @@ 
                 $orderAdded = TRUE;
                 if ($direction === Order::ASC) {
                     $query->addAscendingOrderByColumn($column->getPhpName());
-                } else {
+                }else {
                     $query->addDescendingOrderByColumn($column->getPhpName());
                 }
             }
@@ -90,7 +90,7 @@ 
                 $query->addAscendingOrderByColumn($key);
             }
         }
-        Logger::log(static::class . ' extract orders end', LOG_DEBUG);
+        Logger::log(static::class.' extract orders end', LOG_DEBUG);
     }
 
     /**
@@ -98,7 +98,7 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function addFilters(ModelCriteria &$query)
+    protected function addFilters(ModelCriteria & $query)
     {
         if (count($this->query) > 0) {
             $tableMap = $this->getTableMap();
@@ -126,10 +126,10 @@ 
             $this->checkReturnFields($query);
             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);
         }
     }

src/base/Request.php

Spacing +7 added lines, -7 removed lines

@@ -137,10 +137,10 @@ 
         $header = null;
         if ($this->hasHeader($name)) {
             $header = $this->header[$name];
-        } else if (array_key_exists('h_' . strtolower($name), $this->query)) {
-            $header = $this->query['h_' . strtolower($name)];
-        } else if (array_key_exists('HTTP_' . strtoupper(str_replace('-', '_', $name)), $this->server)) {
-            $header = $this->getServer('HTTP_' . strtoupper(str_replace('-', '_', $name)));
+        }else if (array_key_exists('h_'.strtolower($name), $this->query)) {
+            $header = $this->query['h_'.strtolower($name)];
+        }else if (array_key_exists('HTTP_'.strtoupper(str_replace('-', '_', $name)), $this->server)) {
+            $header = $this->getServer('HTTP_'.strtoupper(str_replace('-', '_', $name)));
         }
         return $header ?: $default;
     }
@@ -254,7 +254,7 @@ 
             $url = $this->getServer('HTTP_ORIGIN');
         }
         ob_start();
-        header('Location: ' . $url);
+        header('Location: '.$url);
         ob_end_clean();
         Security::getInstance()->updateSession();
         exit(t('Redirect...'));
@@ -270,7 +270,7 @@ 
         $url = $this->getServerName();
         $protocol = $hasProtocol ? $this->getProtocol() : '//';
         if (!empty($protocol)) {
-            $url = $protocol . $url;
+            $url = $protocol.$url;
         }
         return $this->checkServerPort($url);
     }
@@ -291,7 +291,7 @@ 
             }
         }
         if (!in_array($port, [80, 443], true)) {
-            $url .= ':' . $port;
+            $url .= ':'.$port;
         }
         return $url;
     }

src/base/extension/TemplateFunctions.php

Spacing +13 added lines, -13 removed lines

@@ -46,13 +46,13 @@ 
 
         $filePath = $returnPath = '';
         if (!file_exists($filePath)) {
-            $filePath = BASE_DIR . $string;
+            $filePath = BASE_DIR.$string;
         }
         $filenamePath = AssetsHelper::findDomainPath($string, $filePath);
-        if(!empty($filenamePath)){
+        if (!empty($filenamePath)) {
             $filePath = self::processAsset($string, $name, $return, $filenamePath);
             $basePath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl(false));
-            $returnPath = empty($name) ? $basePath . '/' . $filePath : $name;
+            $returnPath = empty($name) ? $basePath.'/'.$filePath : $name;
         }
         return $return ? $returnPath : '';
     }
@@ -70,7 +70,7 @@ 
         $router = Router::getInstance();
         try {
             return $router->getRoute($path, $absolute, $params);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage());
             return $router->getRoute('', $absolute, $params);
         }
@@ -166,7 +166,7 @@ 
         $filenamePath = self::extractPathname($path, $domains);
         // Check if resources has been copied to public folders
         if (!$debug) {
-            $cacheFilename = Config::getParam('cache.var', '__initial__') . '.file.cache';
+            $cacheFilename = Config::getParam('cache.var', '__initial__').'.file.cache';
             $cachedFiles = Cache::getInstance()->readFromCache($cacheFilename,
                 1, fn() => [], Cache::JSON, true) ?: [];
             // Force the resource copy
@@ -187,7 +187,7 @@ 
      *
      * @return string|array
      */
-    private static function extractPathname(string $path, $domains): string|array
+    private static function extractPathname(string $path, $domains): string | array
     {
         $filenamePath = $path;
         if (!empty($domains) && !file_exists($path)) {
@@ -226,13 +226,13 @@ 
      * @param string $base
      * @param string $filePath
      */
-    private static function putResourceContent(string|null $name, string $filenamePath, string $base, string $filePath): void
+    private static function putResourceContent(string | null $name, string $filenamePath, string $base, string $filePath): void
     {
         $data = file_get_contents($filenamePath);
         if (!empty($name)) {
-            file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data);
-        } else {
-            file_put_contents($base . $filePath, $data);
+            file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data);
+        }else {
+            file_put_contents($base.$filePath, $data);
         }
     }
 
@@ -245,15 +245,15 @@ 
      * @return string
      * @throws GeneratorException
      */
-    private static function processAsset(string $string, string|null $name = null, bool $return = true, string $filenamePath = ''): string
+    private static function processAsset(string $string, string | null $name = null, bool $return = true, string $filenamePath = ''): string
     {
         $filePath = $filenamePath;
         if (file_exists($filenamePath)) {
             list($base, $htmlBase, $filePath) = AssetsHelper::calculateAssetPath($string, $name, $return, $filenamePath);
             //Creamos el directorio si no existe
-            GeneratorHelper::createDir($base . $htmlBase);
+            GeneratorHelper::createDir($base.$htmlBase);
             //Si se ha modificado
-            if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($filenamePath)) {
+            if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($filenamePath)) {
                 if ($htmlBase === 'css') {
                     self::processCssLines($filenamePath);
                 }

src/base/types/helpers/ResponseHelper.php

Spacing +8 added lines, -8 removed lines

@@ -20,14 +20,14 @@ 
     public static array $headers_sent = [];
 
     public static function setHeader(string $header): void {
-        if(str_contains($header, ':')) {
+        if (str_contains($header, ':')) {
             list($key, $value) = explode(':', $header);
-        } else {
+        }else {
             $key = 'Http Status';
             $value = $header;
         }
         if (!in_array($key, self::$headers_sent)) {
-            if(!self::isTest()) {
+            if (!self::isTest()) {
                 header($header);
             }
             self::$headers_sent[$key] = $value;
@@ -99,9 +99,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;
@@ -113,7 +113,7 @@ 
      * @return int|string
      * @throws GeneratorException
      */
-    public static function httpNotFound(Exception $exception = NULL, bool $isJson = false): int|string
+    public static function httpNotFound(Exception $exception = NULL, bool $isJson = false): int | string
     {
         if (self::isTest()) {
             return 404;
@@ -132,7 +132,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/Router.php

Spacing +25 added lines, -25 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();
         }
@@ -84,7 +84,7 @@ 
             $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);
@@ -272,7 +272,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);
         }
@@ -287,13 +287,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;
@@ -322,7 +322,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();
@@ -330,15 +330,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) {