psfs / core

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) {

src/base/types/Api.php

Spacing +21 added lines, -21 removed lines

@@ -54,7 +54,7 @@ 
     public function init()
     {
         parent::init();
-        Logger::log(static::class . ' init', LOG_DEBUG);
+        Logger::log(static::class.' init', LOG_DEBUG);
         $this->domain = $this->getDomain();
         $this->hydrateRequestData();
         $this->hydrateOrders();
@@ -63,7 +63,7 @@ 
         }
         $this->checkFieldType();
         $this->setLoaded(true);
-        Logger::log(static::class . ' loaded', LOG_DEBUG);
+        Logger::log(static::class.' loaded', LOG_DEBUG);
     }
 
     private function checkActions($method)
@@ -159,14 +159,14 @@ 
                 $status = 200;
                 $saved = TRUE;
                 $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
-            } else {
+            }else {
                 $message = t('No se ha podido guardar el modelo seleccionado');
             }
-        } catch (\Exception $e) {
-            if(Config::getParam('debug')) {
-                $message = t('Ha ocurrido un error intentando guardar el elemento: ') . '<br>' . $e->getMessage();
-            } else {
-                $message = t('Ha ocurrido un error intentando guardar el elemento: ') . '<br>' . $e->getCode();
+        }catch (\Exception $e) {
+            if (Config::getParam('debug')) {
+                $message = t('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage();
+            }else {
+                $message = t('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getCode();
             }
             $context = [];
             if (null !== $e->getPrevious()) {
@@ -205,14 +205,14 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
-                } else {
+                }else {
                     $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
-                if(Config::getParam('debug')) {
-                    $message = t('Ha ocurrido un error intentando actualizar el elemento: ') . '<br>' . $e->getMessage();
-                } else {
-                    $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs: ') . '<br>' . $e->getCode();
+            }catch (\Exception $e) {
+                if (Config::getParam('debug')) {
+                    $message = t('Ha ocurrido un error intentando actualizar el elemento: ').'<br>'.$e->getMessage();
+                }else {
+                    $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs: ').'<br>'.$e->getCode();
                 }
                 $context = [];
                 if (null !== $e->getPrevious()) {
@@ -220,7 +220,7 @@ 
                 }
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
             }
-        } else {
+        }else {
             $message = t('No se ha encontrado el modelo al que se hace referencia para actualizar');
         }
 
@@ -254,7 +254,7 @@ 
                     $this->model->delete($this->con);
                     $deleted = TRUE;
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $context = [];
                 if (null !== $e->getPrevious()) {
                     $context[] = $e->getPrevious()->getMessage();
@@ -286,7 +286,7 @@ 
             $this->saveBulk();
             $saved = true;
             $status = 200;
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData());
             $message = t('Bulk insert rolled back');
         }
@@ -318,7 +318,7 @@ 
             if (null !== $this->list) {
                 if (array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) {
                     $return = $this->extractDataWithFormat();
-                } else {
+                }else {
                     $return = $this->list->toArray(null, false, $this->fieldType ?: TableMap::TYPE_PHPNAME, false);
                 }
                 $total = 0;
@@ -331,8 +331,8 @@ 
                     $pages = 1;
                 }
             }
-        } catch (\Exception $e) {
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
         }
 
         return array($return, $total, $pages);
@@ -350,7 +350,7 @@ 
         $return = array();
         if (NULL === $model || !method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
         }
 

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

Spacing +20 added lines, -20 removed lines

@@ -100,7 +100,7 @@ 
         if (count($pks) === 1) {
             $pks = array_keys($pks);
             return [
-                $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD
+                $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD
             ];
         }
         if (count($pks) > 1) {
@@ -108,9 +108,9 @@ 
             $principal = '';
             $sep = 'CONCAT(';
             foreach ($pks as $pk) {
-                $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName();
-                $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName();
-                $sep = ', "' . Api::API_PK_SEPARATOR . '", ';
+                $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName();
+                $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName();
+                $sep = ', "'.Api::API_PK_SEPARATOR.'", ';
             }
             $principal .= ')';
             $apiPks[$principal] = Api::API_MODEL_KEY_FIELD;
@@ -137,10 +137,10 @@ 
         $pks = '';
         $sep = '';
         foreach ($tableMap->getPrimaryKeys() as $pk) {
-            $pks .= $sep . $pk->getFullyQualifiedName();
+            $pks .= $sep.$pk->getFullyQualifiedName();
             $sep = ', "|", ';
         }
-        $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD;
+        $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD;
     }
 
     /**
@@ -162,7 +162,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -173,7 +173,7 @@ 
      * @param $action
      * @throws ApiException
      */
-    private function addExtraColumns(ModelCriteria &$query, $action)
+    private function addExtraColumns(ModelCriteria & $query, $action)
     {
         if (Api::API_ACTION_LIST === $action) {
             $this->addDefaultListField();
@@ -182,7 +182,7 @@ 
         if (!empty($this->extraColumns)) {
             if (Config::getParam('api.extrafields.compat', true)) {
                 $fields = array_values($this->extraColumns);
-            } else {
+            }else {
                 $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD);
                 $fields = explode(',', $returnFields ?: '');
                 $fields[] = self::API_MODEL_KEY_FIELD;
@@ -216,32 +216,32 @@ 
     /**
      * @param ModelCriteria $query
      */
-    protected function checkI18n(ModelCriteria &$query)
+    protected function checkI18n(ModelCriteria & $query)
     {
         $this->extractApiLang();
         $model = $this->getModelNamespace();
-        $modelI18n = $model . 'I18n';
+        $modelI18n = $model.'I18n';
         if (method_exists($query, 'useI18nQuery')) {
             $query->useI18nQuery($this->lang);
             $modelParts = explode('\\', $modelI18n);
-            $i18nMapClass = str_replace(end($modelParts), 'Map\\' . end($modelParts), $modelI18n) . 'TableMap';
+            $i18nMapClass = str_replace(end($modelParts), 'Map\\'.end($modelParts), $modelI18n).'TableMap';
             /** @var TableMap $modelI18nTableMap */
             $modelI18nTableMap = $i18nMapClass::getTableMap();
             foreach ($modelI18nTableMap->getColumns() as $columnMap) {
                 if (!$columnMap->isPrimaryKey()) {
                     $query->withColumn($columnMap->getFullyQualifiedName(), ApiHelper::getColumnMapName($columnMap));
                 } elseif (!$columnMap->isForeignKey()) {
-                    $query->withColumn('IFNULL(' . $columnMap->getFullyQualifiedName() . ', "' . $this->lang . '")', ApiHelper::getColumnMapName($columnMap));
+                    $query->withColumn('IFNULL('.$columnMap->getFullyQualifiedName().', "'.$this->lang.'")', ApiHelper::getColumnMapName($columnMap));
                 }
             }
         }
     }
 
     protected function cleanData(array &$data) {
-        foreach($data as $key => &$value) {
-            if(is_array($value)) {
+        foreach ($data as $key => &$value) {
+            if (is_array($value)) {
                 $this->cleanData($value);
-            } else if(is_string($value)) {
+            }else if (is_string($value)) {
                 $value = I18nHelper::cleanHtmlAttacks($value);
             }
         }
@@ -257,12 +257,12 @@ 
         $model->fromArray($data, ApiHelper::getFieldTypes());
         $tableMap = $this->getTableMap();
         try {
-            if ($tableMap->hasRelation($tableMap->getPhpName() . 'I18n')) {
-                $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
+            if ($tableMap->hasRelation($tableMap->getPhpName().'I18n')) {
+                $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
                 $i18NTableMap = $relateI18n->getLocalTable();
                 $model->setLocale(array_key_exists('Locale', $data) ? $data['Locale'] : (array_key_exists('locale', $data) ? $data['locale'] : Request::header(Api::HEADER_API_LANG, 'es_ES')));
                 foreach ($i18NTableMap->getColumns() as $columnMap) {
-                    $method = 'set' . $columnMap->getPhpName();
+                    $method = 'set'.$columnMap->getPhpName();
                     $dtoColumnName = ApiHelper::getColumnMapName($columnMap);
                     if (array_key_exists($dtoColumnName, $data)
                         && method_exists($model, $method)
@@ -271,7 +271,7 @@ 
                     }
                 }
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_DEBUG);
         }
     }

src/base/types/helpers/GeneratorHelper.php

Spacing +33 added lines, -33 removed lines

@@ -26,10 +26,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::deleteDir($dir . "/" . $object);
-                    } else {
-                        unlink($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::deleteDir($dir."/".$object);
+                    }else {
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -44,10 +44,10 @@ 
     {
         $rootDirs = array("css", "js", "media", "font");
         foreach ($rootDirs as $dir) {
-            if (file_exists(WEB_DIR . DIRECTORY_SEPARATOR . $dir)) {
+            if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) {
                 try {
-                    self::deleteDir(WEB_DIR . DIRECTORY_SEPARATOR . $dir);
-                } catch (Exception $e) {
+                    self::deleteDir(WEB_DIR.DIRECTORY_SEPARATOR.$dir);
+                }catch (Exception $e) {
                     syslog(LOG_INFO, $e->getMessage());
                 }
             }
@@ -64,12 +64,12 @@ 
         if (!empty($dir)) {
             try {
                 if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) {
-                    throw new Exception(t('Can\'t create directory ') . $dir);
+                    throw new Exception(t('Can\'t create directory ').$dir);
                 }
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 syslog(LOG_WARNING, $e->getMessage());
                 if (!file_exists(dirname($dir))) {
-                    throw new GeneratorException($e->getMessage() . $dir);
+                    throw new GeneratorException($e->getMessage().$dir);
                 }
             }
         }
@@ -81,7 +81,7 @@ 
      */
     public static function getTemplatePath(): string
     {
-        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+        $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR;
         return realpath($path);
     }
 
@@ -109,7 +109,7 @@ 
                 } elseif (!$reflector->isAbstract()) {
                     throw new GeneratorException(t('La clase definida debe ser abstracta'), 501);
                 }
-            } else {
+            }else {
                 throw new GeneratorException(t('La clase definida para extender la API no existe'), 501);
             }
         }
@@ -131,7 +131,7 @@ 
         GeneratorHelper::createDir($path);
         $paths = array("js", "css", "img", "media", "font");
         foreach ($paths as $htmlPath) {
-            GeneratorHelper::createDir($path . DIRECTORY_SEPARATOR . $htmlPath);
+            GeneratorHelper::createDir($path.DIRECTORY_SEPARATOR.$htmlPath);
         }
 
         // Generates the root needed files
@@ -141,35 +141,35 @@ 
             'crossdomain' => 'crossdomain.xml',
             'humans' => 'humans.txt',
             'robots' => 'robots.txt',
-            'docker' => '..' . DIRECTORY_SEPARATOR . 'docker-compose.yml',
+            'docker' => '..'.DIRECTORY_SEPARATOR.'docker-compose.yml',
         ];
         $verificable = ['humans', 'robots', 'docker'];
         if (!$quiet) {
             $output->writeln('Start creating html files');
         }
         foreach ($files as $template => $filename) {
-            if (in_array($template, $verificable) && file_exists($path . DIRECTORY_SEPARATOR . $filename)) {
+            if (in_array($template, $verificable) && file_exists($path.DIRECTORY_SEPARATOR.$filename)) {
                 if (!$quiet) {
-                    $output->writeln($filename . ' already exists');
+                    $output->writeln($filename.' already exists');
                 }
                 continue;
             }
-            $text = Template::getInstance()->dump("generator/html/" . $template . '.html.twig');
-            if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) {
+            $text = Template::getInstance()->dump("generator/html/".$template.'.html.twig');
+            if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) {
                 if (!$quiet) {
-                    $output->writeln('Can\t create the file ' . $filename);
+                    $output->writeln('Can\t create the file '.$filename);
                 }
-            } else {
+            }else {
                 if (!$quiet) {
-                    $output->writeln($filename . ' created successfully');
+                    $output->writeln($filename.' created successfully');
                 }
             }
         }
 
         //Export base locale translations
-        if (!file_exists(BASE_DIR . DIRECTORY_SEPARATOR . 'locale')) {
-            GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            self::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+        if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) {
+            GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+            self::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
         }
     }
 
@@ -185,12 +185,12 @@ 
     {
         if (file_exists($filenamePath)) {
             $destfolder = basename($filenamePath);
-            if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) {
+            if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) {
                 if (is_dir($filenamePath)) {
-                    self::copyr($filenamePath, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
-                } else {
-                    if (@copy($filenamePath, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) {
-                        throw new ConfigException("Can't copy " . $filenamePath . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
+                    self::copyr($filenamePath, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
+                }else {
+                    if (@copy($filenamePath, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) {
+                        throw new ConfigException("Can't copy ".$filenamePath." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
                     }
                 }
             }
@@ -209,10 +209,10 @@ 
         self::createDir($dst);
         while (false !== ($file = readdir($dir))) {
             if (($file != '.') && ($file != '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::copyr($src . '/' . $file, $dst . '/' . $file);
-                } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) {
-                    throw new ConfigException("Can't copy " . $src . " to " . $dst);
+                if (is_dir($src.'/'.$file)) {
+                    self::copyr($src.'/'.$file, $dst.'/'.$file);
+                } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) {
+                    throw new ConfigException("Can't copy ".$src." to ".$dst);
                 }
             }
         }

src/base/types/helpers/AuthHelper.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
         if (NULL === $user || (array_key_exists($user, $admins) && empty($admins[$user]))) {
             list($user, $pass) = self::getAdminFromCookie();
         }
-        return array_key_exists($user, $admins) ? [$user, sha1($user . $pass)] : [null, null];
+        return array_key_exists($user, $admins) ? [$user, sha1($user.$pass)] : [null, null];
     }
 
     public static function checkComplexAuth(array $admins)
@@ -86,7 +86,7 @@ 
         return base64_encode($encrypted_data);
     }
 
-    public static function decrypt(string $encrypted_data, string $key): false|string
+    public static function decrypt(string $encrypted_data, string $key): false | string
     {
         $encrypted_data = base64_decode($encrypted_data);
         $data = '';
@@ -104,15 +104,15 @@ 
         $tz = new \DateTimeZone('UTC');
         $timestamp = new \DateTime('now', $tz);
         $timestamp->modify(Config::getParam('auth.expiration', '+1 day'));
-        $data = $user . Security::LOGGED_USER_TOKEN . $timestamp->format(self::EXPIRATION_TIMESTAMP_FORMAT);
-        return self::encrypt($data, sha1($user . $password));
+        $data = $user.Security::LOGGED_USER_TOKEN.$timestamp->format(self::EXPIRATION_TIMESTAMP_FORMAT);
+        return self::encrypt($data, sha1($user.$password));
     }
 
     public static function decodeToken(string $token, string $password): array
     {
         $user = $timestamp = null;
         $secret = self::decrypt($token, $password);
-        if(!empty($secret) && str_contains($secret, Security::LOGGED_USER_TOKEN)) {
+        if (!empty($secret) && str_contains($secret, Security::LOGGED_USER_TOKEN)) {
             list($user, $timestamp) = explode(Security::LOGGED_USER_TOKEN, $secret);
         }
         return [$user, $timestamp];

src/base/Security.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
      */
     public function getAdmins()
     {
-        return Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true);
+        return Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true);
     }
 
     /**
@@ -77,12 +77,12 @@ 
             $admins = $this->getAdmins();
             $token = null;
             if (null !== $admins) {
-                if(empty($user)) {
+                if (empty($user)) {
                     // First try, traditional basic auth
                     Inspector::stats('[Auth] Checking Basic Auth');
                     list($user, $token) = AuthHelper::checkBasicAuth($user, $pass, $admins);
                 }
-                if(empty($user)) {
+                if (empty($user)) {
                     // Second try, cookie auth
                     Inspector::stats('[Auth] Checking Basic Auth PSFS');
                     list($user, $token) = AuthHelper::checkComplexAuth($admins);
@@ -103,7 +103,7 @@ 
                         ]);
                         $this->setSessionKey(AuthHelper::ADMIN_ID_TOKEN, $encrypted);
                     }
-                } else {
+                }else {
                     $this->admin = null;
                     $this->setSessionKey(AuthHelper::ADMIN_ID_TOKEN, null);
                 }