psfs / core

src/base/events/CloseSessionEvent.php

Spacing +2 added lines, -2 removed lines

@@ -12,10 +12,10 @@
     {
         $uri = Request::requestUri();
         Security::getInstance()->setSessionKey('lastRequest', array(
-            'url' => Request::getInstance()->getRootUrl() . $uri,
+            'url' => Request::getInstance()->getRootUrl().$uri,
             'ts' => microtime(true),
             'eta' => microtime(true) - PSFS_START_TS,
-            'mem' => memory_get_usage() / 1024 / 1024,
+            'mem' => memory_get_usage()/1024/1024,
         ));
         Security::getInstance()->updateSession();
         return EventInterface::EVENT_SUCCESS;

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/traits/OutputTrait.php

Spacing +14 added lines, -14 removed lines

@@ -127,7 +127,7 @@ 
                 $this->setStatusCode(Template::STATUS_OK);
                 break;
             default:
-                $this->setStatusCode('HTTP/1.0 ' . ($status ?: 200));
+                $this->setStatusCode('HTTP/1.0 '.($status ?: 200));
                 break;
         }
         return $this;
@@ -140,11 +140,11 @@ 
      */
     private function setResponseHeaders($contentType = 'text/html', array $cookies = array()): void
     {
-        ResponseHelper::setHeader('X-Powered-By: ' . Config::getParam('poweredBy', 'PSFS'));
+        ResponseHelper::setHeader('X-Powered-By: '.Config::getParam('poweredBy', 'PSFS'));
         ResponseHelper::setStatusHeader($this->getStatusCode());
         ResponseHelper::setAuthHeaders($this->isPublicZone());
         ResponseHelper::setCookieHeaders($cookies);
-        ResponseHelper::setHeader('Content-type: ' . $contentType);
+        ResponseHelper::setHeader('Content-type: '.$contentType);
 
     }
 
@@ -162,16 +162,16 @@ 
             Logger::log('Start output response');
             ob_start();
             $this->setResponseHeaders($contentType, $cookies);
-            ResponseHelper::setHeader('Content-length: ' . strlen($output));
-            ResponseHelper::setHeader('CRC: ' . crc32($output));
+            ResponseHelper::setHeader('Content-length: '.strlen($output));
+            ResponseHelper::setHeader('CRC: '.crc32($output));
 
             $needCache = Cache::needCache();
             $cache = Cache::getInstance();
             list($path, $cacheDataName) = $cache->getRequestCacheHash();
             if (null !== $cacheDataName && false !== $needCache && $this->getStatusCode() === Template::STATUS_OK) {
                 Logger::log('Saving output response into cache');
-                $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $output);
-                $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', headers_list(), Cache::JSON);
+                $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $output);
+                $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', headers_list(), Cache::JSON);
             } elseif (Request::getInstance()->getMethod() !== 'GET') {
                 $cache->flushCache();
             }
@@ -181,7 +181,7 @@ 
             ob_end_clean();
             Logger::log('End output response');
             $this->closeRender();
-        } else {
+        }else {
             return $output;
         }
     }
@@ -193,7 +193,7 @@ 
     {
         Logger::log('Close template render');
         EventHelper::handleEvents(EventHelper::EVENT_END_REQUEST);
-        Logger::log('End request: ' . Request::requestUri(), LOG_INFO);
+        Logger::log('End request: '.Request::requestUri(), LOG_INFO);
         exit;
     }
 
@@ -231,17 +231,17 @@ 
         /////////////////////////////////////////////////////////////
         // Date in the past sets the value to already have been expired.
         ResponseHelper::setHeader('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
-        ResponseHelper::setHeader('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        ResponseHelper::setHeader('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         ResponseHelper::setHeader('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
         ResponseHelper::setHeader('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
         ResponseHelper::setHeader('Pragma: no-cache');
         ResponseHelper::setHeader('Expires: 0');
         ResponseHelper::setHeader('Content-Transfer-Encoding: binary');
-        ResponseHelper::setHeader('Content-type: ' . $content);
-        ResponseHelper::setHeader('Content-length: ' . strlen($data));
-        ResponseHelper::setHeader('Content-Disposition: attachment; filename="' . $filename . '"');
+        ResponseHelper::setHeader('Content-type: '.$content);
+        ResponseHelper::setHeader('Content-length: '.strlen($data));
+        ResponseHelper::setHeader('Content-Disposition: attachment; filename="'.$filename.'"');
         ResponseHelper::setHeader('Access-Control-Expose-Headers: Filename');
-        ResponseHelper::setHeader('Filename: ' . $filename);
+        ResponseHelper::setHeader('Filename: '.$filename);
         echo $data;
         ob_flush();
         ob_end_clean();

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);
                 }