psfs / core

src/base/dto/Dto.php

Spacing +7 added lines, -7 removed lines

@@ -57,14 +57,14 @@ 
                             }
                         }
                         $dto[$property->getName()] = $value;
-                    } else {
+                    }else {
                         $type = InjectorHelper::extractVarType($property->getDocComment());
                         $dto[$property->getName()] = $this->checkCastedValue($property->getValue($this), $type ?: 'string');
                     }
                 }
             }
-        } 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 $dto;
     }
@@ -101,12 +101,12 @@ 
                             $this->$key[] = $dto;
                         }
                     }
-                } else {
+                }else {
                     $this->$key = clone $this->__cache[$type];
                     $this->$key->fromArray($value);
                 }
             }
-        } else {
+        }else {
             $this->castValue($key, $value, $type);
         }
     }
@@ -133,7 +133,7 @@ 
     /**
      * @return mixed
      */
-    public function jsonSerialize(): array|string|null
+    public function jsonSerialize(): array | string | null
     {
         return $this->toArray();
     }
@@ -193,7 +193,7 @@ 
                     $value = (bool)$rawValue;
                     break;
             }
-        } else {
+        }else {
             $value = $rawValue;
         }
         return $value;

src/base/dto/Form.php

Spacing +2 added lines, -2 removed lines

@@ -46,11 +46,11 @@
         foreach ($this->fields as $field) {
             $array['fields'][] = $field->__toArray();
         }
-        usort($array['fields'], function ($fieldA, $fieldB) {
+        usort($array['fields'], function($fieldA, $fieldB) {
             if ((bool)$fieldA['required'] !== (bool)$fieldB['required']) {
                 if ((bool)$fieldA['required']) {
                     return -1;
-                } else {
+                }else {
                     return 1;
                 }
             }

src/base/dto/Order.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     {
         if (preg_match('/^asc$/i', $direction)) {
             return self::ASC;
-        } else {
+        }else {
             return self::DESC;
         }
     }

src/base/Router.php

Spacing +23 added lines, -23 removed lines

@@ -61,8 +61,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();
         }
@@ -83,7 +83,7 @@ 
             $this->hydrateRouting();
             $this->simpatize();
             Logger::log('End routes load');
-        } else {
+        }else {
             Logger::log('Routes generation skipped');
         }
     }
@@ -100,13 +100,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;
         }
@@ -124,7 +124,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;
@@ -144,7 +144,7 @@ 
                     }
 
                     throw new RouterException(t('Preconditions failed'), 412);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw $e;
                 }
@@ -169,7 +169,7 @@ 
                 }
             }
             $valid = count($action['requirements']) === $checked;
-        } else {
+        }else {
             $valid = true;
         }
         return $valid;
@@ -192,11 +192,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);
     }
 
     /**
@@ -213,7 +213,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);
@@ -245,18 +245,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);
@@ -268,7 +268,7 @@ 
      */
     private function checkPreActions($class, $method)
     {
-        $preAction = 'pre' . ucfirst($method);
+        $preAction = 'pre'.ucfirst($method);
         if (method_exists($class, $preAction)) {
             Inspector::stats('[Router] Pre action invoked', Inspector::SCOPE_DEBUG);
             try {
@@ -276,7 +276,7 @@ 
                     Logger::log(t('Pre action failed'), LOG_ERR, [error_get_last()]);
                     error_clear_last();
                 }
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR, [$class, $method]);
             }
         }
@@ -293,7 +293,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();
@@ -301,15 +301,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

@@ -79,18 +79,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->dumpException($e);
         }
     }

src/base/Logger.php

Spacing +5 added lines, -5 removed lines

@@ -18,8 +18,8 @@ 
 
 
 if (!defined('LOG_DIR')) {
-    GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-    define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+    GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+    define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
 }
 
 /**
@@ -59,10 +59,10 @@ 
     {
         $args = func_get_args();
         list($logger, $debug, $path) = $this->setup($args);
-        $this->stream = fopen($path . DIRECTORY_SEPARATOR . date('Ymd') . '.log', 'ab+');
+        $this->stream = fopen($path.DIRECTORY_SEPARATOR.date('Ymd').'.log', 'ab+');
         if (false !== $this->stream && is_resource($this->stream)) {
             $this->addPushLogger($logger, $debug);
-        } else {
+        }else {
             throw new ConfigException(t('Error creating logger'));
         }
         $this->logLevel = strtoupper(Config::getParam('log.level', 'NOTICE'));
@@ -141,7 +141,7 @@ 
     private function createLoggerPath(): string
     {
         $logger = $this->setLoggerName();
-        $path = Config::getParam('default.log.path', LOG_DIR) . DIRECTORY_SEPARATOR . $logger . DIRECTORY_SEPARATOR . date('Y') . DIRECTORY_SEPARATOR . date('m');
+        $path = Config::getParam('default.log.path', LOG_DIR).DIRECTORY_SEPARATOR.$logger.DIRECTORY_SEPARATOR.date('Y').DIRECTORY_SEPARATOR.date('m');
         GeneratorHelper::createDir($path);
         return $path;
     }

src/base/types/helpers/ServerHelper.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      */
     public static function dropServerValue(string $key): void
     {
-        if(array_key_exists($key, $_SERVER)) {
+        if (array_key_exists($key, $_SERVER)) {
             unset($_SERVER[$key]);
         }
     }

src/base/types/traits/SystemTrait.php

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
                 $use /= 1024;
                 break;
             case "MBytes":
-                $use /= (1024 * 1024);
+                $use /= (1024*1024);
                 break;
             case "Bytes":
             default:
@@ -70,12 +70,12 @@ 
             ini_set('display_errors', 1);
         }
         //Warning & Notice handler
-        set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+        set_error_handler(function($errno, $errstr, $errfile, $errline) {
             Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]);
             return true;
         }, E_ALL | E_STRICT | E_DEPRECATED | E_USER_DEPRECATED | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR);
 
-        register_shutdown_function(function () {
+        register_shutdown_function(function() {
             $error = error_get_last() or json_last_error() or preg_last_error() or \DateTime::getLastErrors();
             if ($error !== NULL) {
                 $errno = $error["type"];
@@ -90,8 +90,8 @@ 
 
             if (self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) {
                 SlackHelper::getInstance()->trace('Slow service endpoint', '', '', [
-                    'time' => round(self::getTs(), 3) . ' secs',
-                    'memory' => round(self::getMem('MBytes'), 3) . ' Mb',
+                    'time' => round(self::getTs(), 3).' secs',
+                    'memory' => round(self::getMem('MBytes'), 3).' Mb',
                 ]);
             }
             return false;
@@ -106,7 +106,7 @@ 
         Inspector::stats('[SystemTrait] Initializing stats (mem + ts)');
         if (ServerHelper::hasServerValue('REQUEST_TIME_FLOAT')) {
             $this->ts = (float)ServerHelper::getServerValue('REQUEST_TIME_FLOAT');
-        } else {
+        }else {
             $this->ts = PSFS_START_TS;
         }
         $this->mem = PSFS_START_MEM;

src/base/config/Config.php

Spacing +8 added lines, -8 removed lines

@@ -97,7 +97,7 @@ 
      */
     protected function init()
     {
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE)) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) {
             $this->loadConfigData();
         }
         return $this;
@@ -212,13 +212,13 @@ 
         $finalData = self::saveExtraParams($data);
         $saved = false;
         try {
-            $finalData = array_filter($finalData, function ($key, $value) {
+            $finalData = array_filter($finalData, function($key, $value) {
                 return in_array($key, self::$required, true) || !empty($value);
             }, ARRAY_FILTER_USE_BOTH);
-            $saved = (false !== file_put_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE, json_encode($finalData, JSON_PRETTY_PRINT)));
+            $saved = (false !== file_put_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, json_encode($finalData, JSON_PRETTY_PRINT)));
             self::getInstance()->loadConfigData();
             $saved = true;
-        } catch (ConfigException $e) {
+        }catch (ConfigException $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $saved;
@@ -250,7 +250,7 @@ 
      */
     public function loadConfigData(): void
     {
-        $this->config = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE), true) ?: [];
+        $this->config = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE), true) ?: [];
         $this->debug = array_key_exists('debug', $this->config) ? (bool)$this->config['debug'] : FALSE;
         if (array_key_exists('cache.var', $this->config)) {
             Security::getInstance()->setSessionKey('config.cache.var', $this->config['cache.var']);
@@ -275,7 +275,7 @@ 
     public static function getParam($key, $defaultValue = null, $module = null)
     {
         if (null !== $module) {
-            return self::getParam(strtolower($module) . '.' . $key, self::getParam($key, $defaultValue));
+            return self::getParam(strtolower($module).'.'.$key, self::getParam($key, $defaultValue));
         }
         $param = self::getInstance()->get($key);
         return (null !== $param) ? $param : $defaultValue;
@@ -291,8 +291,8 @@ 
     {
         $done = true;
         foreach (self::$cleanable_config_files as $configFile) {
-            if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . $configFile)) {
-                if (!unlink(CONFIG_DIR . DIRECTORY_SEPARATOR . $configFile)) {
+            if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.$configFile)) {
+                if (!unlink(CONFIG_DIR.DIRECTORY_SEPARATOR.$configFile)) {
                     $done = false;
                 }
             }