psfs / core

src/base/extension/AssetsParser.php

Spacing +14 added lines, -14 removed lines

@@ -13,8 +13,8 @@ 
 use PSFS\base\types\helpers\GeneratorHelper;
 use PSFS\base\types\helpers\Inspector;
 
-defined('CSS_SRI_FILENAME') or define('CSS_SRI_FILENAME', CACHE_DIR . DIRECTORY_SEPARATOR . 'css.sri.json');
-defined('JS_SRI_FILENAME') or define('JS_SRI_FILENAME', CACHE_DIR . DIRECTORY_SEPARATOR . 'js.sri.json');
+defined('CSS_SRI_FILENAME') or define('CSS_SRI_FILENAME', CACHE_DIR.DIRECTORY_SEPARATOR.'css.sri.json');
+defined('JS_SRI_FILENAME') or define('JS_SRI_FILENAME', CACHE_DIR.DIRECTORY_SEPARATOR.'js.sri.json');
 
 /**
  * Class AssetsParser
@@ -81,7 +81,7 @@ 
     public function __construct($type = 'js')
     {
         $this->type = $type;
-        $this->path = WEB_DIR . DIRECTORY_SEPARATOR;
+        $this->path = WEB_DIR.DIRECTORY_SEPARATOR;
         $this->domains = Template::getDomains(true);
         $this->cdnPath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl());
     }
@@ -94,12 +94,12 @@ 
      */
     public function addFile($filename)
     {
-        if (file_exists($this->path . $filename) && preg_match('/\.' . $this->type . '$/i', $filename)) {
+        if (file_exists($this->path.$filename) && preg_match('/\.'.$this->type.'$/i', $filename)) {
             $this->files[] = $filename;
         } elseif (!empty($this->domains)) {
             foreach ($this->domains as $domain => $paths) {
                 $domainFilename = str_replace($domain, $paths["public"], $filename);
-                if (file_exists($domainFilename) && preg_match('/\.' . $this->type . '$/i', $domainFilename)) {
+                if (file_exists($domainFilename) && preg_match('/\.'.$this->type.'$/i', $domainFilename)) {
                     $this->files[] = $domainFilename;
                 }
             }
@@ -116,7 +116,7 @@ 
     public function setHash($hash)
     {
         $cache = Config::getParam('cache.var', '');
-        $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
+        $this->hash = $hash.(strlen($cache) ? '.' : '').$cache;
         return $this;
     }
 
@@ -178,7 +178,7 @@ 
             $sourceFile = explode("?", $sourceFile);
             $sourceFile = $sourceFile[0];
         }
-        $orig = realpath(dirname($filenamePath) . DIRECTORY_SEPARATOR . $sourceFile);
+        $orig = realpath(dirname($filenamePath).DIRECTORY_SEPARATOR.$sourceFile);
         return $orig;
     }
 
@@ -197,13 +197,13 @@ 
                 $orig = self::calculateResourcePathname($filenamePath, $source);
                 if (!empty($orig)) {
                     $orig_part = preg_split("/Public/i", $orig);
-                    $dest = WEB_DIR . $orig_part[1];
+                    $dest = WEB_DIR.$orig_part[1];
                     GeneratorHelper::createDir(dirname($dest));
                     if (@copy($orig, $dest) === false) {
-                        throw new ConfigException("Can't copy " . $orig . " to " . $dest);
+                        throw new ConfigException("Can't copy ".$orig." to ".$dest);
                     }
-                } else {
-                    Logger::log($filenamePath . ' has an empty origin with the url ' . $source, LOG_WARNING);
+                }else {
+                    Logger::log($filenamePath.' has an empty origin with the url '.$source, LOG_WARNING);
                 }
             }
         }
@@ -219,9 +219,9 @@ 
     {
         if (array_key_exists($hash, $this->sri)) {
             $sriHash = $this->sri[$hash];
-        } else {
-            Inspector::stats('[SRITrait] Generating SRI for ' . $hash, Inspector::SCOPE_DEBUG);
-            $filename = WEB_DIR . DIRECTORY_SEPARATOR . $type . DIRECTORY_SEPARATOR . $hash . '.' . $type;
+        }else {
+            Inspector::stats('[SRITrait] Generating SRI for '.$hash, Inspector::SCOPE_DEBUG);
+            $filename = WEB_DIR.DIRECTORY_SEPARATOR.$type.DIRECTORY_SEPARATOR.$hash.'.'.$type;
             $sriHash = base64_encode(hash("sha384", file_get_contents($filename), true));
             $this->sri[$hash] = $sriHash;
             Cache::getInstance()->storeData($this->sriFilename, $this->sri, Cache::JSON, true);

src/base/extension/CustomTranslateExtension.php

Spacing +8 added lines, -8 removed lines

@@ -48,7 +48,7 @@ 
     {
         // Gather always the base translations
         $standardTranslations = [];
-        self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale . '.json']);
+        self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale.'.json']);
         if (file_exists(self::$filename)) {
             $standardTranslations = json_decode(file_get_contents(self::$filename), true);
         }
@@ -67,7 +67,7 @@ 
         $session_locale = $session->getSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY);
         self::$locale = $forceReload ? $session_locale : I18nHelper::extractLocale($session_locale);
         $version = $session->getSessionKey(self::LOCALE_CACHED_VERSION);
-        $configVersion = self::$locale . '_' . Config::getParam('cache.var', 'v1');
+        $configVersion = self::$locale.'_'.Config::getParam('cache.var', 'v1');
         if ($forceReload) {
             Inspector::stats('[translationsCheckLoad] Force translations reload', Inspector::SCOPE_DEBUG);
             self::dropInstance();
@@ -80,19 +80,19 @@ 
             if (null !== $version && $version === $configVersion) {
                 Inspector::stats('[translationsCheckLoad] Translations loaded from session', Inspector::SCOPE_DEBUG);
                 self::$translations = $session->getSessionKey(self::LOCALE_CACHED_TAG);
-            } else {
+            }else {
                 if (!$useBase) {
                     $customKey = $customKey ?: $session->getSessionKey(self::CUSTOM_LOCALE_SESSION_KEY);
                 }
                 $standardTranslations = self::extractBaseTranslations();
                 // If the project has custom translations, gather them
                 if (null !== $customKey) {
-                    Logger::log('[' . self::class . '] Custom key detected: ' . $customKey, LOG_INFO);
-                    self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale . '.json']);
+                    Logger::log('['.self::class.'] Custom key detected: '.$customKey, LOG_INFO);
+                    self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale.'.json']);
                 }
                 // Finally we merge base and custom translations to complete all the i18n set
                 if (file_exists(self::$filename)) {
-                    Logger::log('[' . self::class . '] Custom locale detected: ' . $customKey . ' [' . self::$locale . ']', LOG_INFO);
+                    Logger::log('['.self::class.'] Custom locale detected: '.$customKey.' ['.self::$locale.']', LOG_INFO);
                     self::$translations = array_merge($standardTranslations, json_decode(file_get_contents(self::$filename), true));
                     $session->setSessionKey(self::LOCALE_CACHED_TAG, self::$translations);
                     $session->setSessionKey(self::LOCALE_CACHED_VERSION, $configVersion);
@@ -118,7 +118,7 @@ 
     public function getFilters()
     {
         return array(
-            new TwigFilter('trans', function ($message) {
+            new TwigFilter('trans', function($message) {
                 return self::_($message);
             }),
         );
@@ -145,7 +145,7 @@ 
         }
         if (is_array(self::$translations) && array_key_exists($message, self::$translations)) {
             $translation = self::$translations[$message];
-        } else {
+        }else {
             $translation = gettext($message);
         }
         if (self::$generate) {

src/base/extension/traits/JsTrait.php

Spacing +14 added lines, -14 removed lines

@@ -25,8 +25,8 @@ 
             foreach ($compiledFiles as $file) {
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
             }
-        } else {
-            echo "\t\t<script type='text/javascript' src='" . $baseUrl . "/js/" . $hash . ".js'" .
+        }else {
+            echo "\t\t<script type='text/javascript' src='".$baseUrl."/js/".$hash.".js'".
                 "></script>\n";
         }
     }
@@ -42,12 +42,12 @@ 
      */
     protected function putDebugJs($pathParts, $base, $file, $hash, array &$compiledFiles)
     {
-        $filePath = $hash . "_" . $pathParts[count($pathParts) - 1];
-        $compiledFiles[] = "/js/" . $filePath;
+        $filePath = $hash."_".$pathParts[count($pathParts) - 1];
+        $compiledFiles[] = "/js/".$filePath;
         $data = "";
-        if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($file)) {
+        if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($file)) {
             $data = file_get_contents($file);
-            AssetsHelper::storeContents($base . $filePath, $data);
+            AssetsHelper::storeContents($base.$filePath, $data);
         }
         return $data;
     }
@@ -63,9 +63,9 @@ 
      */
     protected function compileJs(array $files, $basePath, $hash, array &$compiledFiles)
     {
-        $base = $basePath . "js" . DIRECTORY_SEPARATOR;
+        $base = $basePath."js".DIRECTORY_SEPARATOR;
         $debug = Config::getParam('debug');
-        if ($debug || !file_exists($base . $hash . ".js")) {
+        if ($debug || !file_exists($base.$hash.".js")) {
             $data = '';
             if (0 < count($files)) {
                 $minifier = new JS();
@@ -74,15 +74,15 @@ 
                     if (file_exists($file)) {
                         if ($debug) {
                             $data = $this->putDebugJs($pathParts, $base, $file, $hash, $compiledFiles);
-                        } elseif (!file_exists($base . $hash . ".js")) {
+                        } elseif (!file_exists($base.$hash.".js")) {
                             $minifier->add($file);
                             //$data = $this->putProductionJs($base, $file, $data);
                         }
                     }
                 }
                 if ($debug) {
-                    AssetsHelper::storeContents($base . $hash . ".js", $data);
-                } else {
+                    AssetsHelper::storeContents($base.$hash.".js", $data);
+                }else {
                     $this->dumpJs($hash, $base, $minifier);
                 }
                 unset($minifier);
@@ -103,9 +103,9 @@ 
         ini_set('memory_limit', -1);
         GeneratorHelper::createDir($base);
         if (Config::getParam('assets.obfuscate', false)) {
-            $minifier->gzip($base . $hash . ".js");
-        } else {
-            $minifier->minify($base . $hash . ".js");
+            $minifier->gzip($base.$hash.".js");
+        }else {
+            $minifier->minify($base.$hash.".js");
         }
     }
 }

src/base/extension/traits/CssTrait.php

Spacing +20 added lines, -20 removed lines

@@ -32,8 +32,8 @@ 
     protected function compileCss($basePath, $hash)
     {
         $debug = Config::getParam('debug');
-        $base = $basePath . "css" . DIRECTORY_SEPARATOR;
-        if ($debug || !file_exists($base . $hash . ".css")) {
+        $base = $basePath."css".DIRECTORY_SEPARATOR;
+        if ($debug || !file_exists($base.$hash.".css")) {
             $data = '';
             if (0 < count($this->files)) {
                 $minifier = new CSS();
@@ -42,14 +42,14 @@ 
                 }
             }
             if ($debug) {
-                AssetsHelper::storeContents($base . $hash . ".css", $data);
-            } else {
+                AssetsHelper::storeContents($base.$hash.".css", $data);
+            }else {
                 $minifier = new CSS();
                 $minifier->add($data);
                 ini_set('max_execution_time', -1);
                 ini_set('memory_limit', -1);
                 GeneratorHelper::createDir($base);
-                $minifier->minify($base . $hash . ".css");
+                $minifier->minify($base.$hash.".css");
             }
             unset($minifier);
         }
@@ -69,21 +69,21 @@ 
         if (file_exists($file)) {
             $debug = Config::getParam('debug');
             $pathParts = explode("/", $file);
-            $filePath = $this->hash . "_" . $pathParts[count($pathParts) - 1];
-            if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($file) || $debug) {
+            $filePath = $this->hash."_".$pathParts[count($pathParts) - 1];
+            if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($file) || $debug) {
                 //Si tenemos modificaciones tenemos que compilar de nuevo todos los ficheros modificados
-                if (file_exists($base . $hash . ".css") && @unlink($base . $hash . ".css") === false) {
-                    throw new ConfigException("Can't unlink file " . $base . $hash . ".css");
+                if (file_exists($base.$hash.".css") && @unlink($base.$hash.".css") === false) {
+                    throw new ConfigException("Can't unlink file ".$base.$hash.".css");
                 }
                 $this->loopCssLines($file);
             }
             if ($debug) {
                 $data = file_get_contents($file);
-                AssetsHelper::storeContents($base . $filePath, $data);
-            } else {
+                AssetsHelper::storeContents($base.$filePath, $data);
+            }else {
                 $data .= file_get_contents($file);
             }
-            $this->compiledFiles[] = "/css/" . $filePath;
+            $this->compiledFiles[] = "/css/".$filePath;
         }
 
         return $data;
@@ -115,25 +115,25 @@ 
      */
     protected function extractCssResources($source, $file)
     {
-        Inspector::stats('[CssTrait] Start collecting resources from ' . $file, Inspector::SCOPE_DEBUG);
+        Inspector::stats('[CssTrait] Start collecting resources from '.$file, Inspector::SCOPE_DEBUG);
         $sourceFile = AssetsHelper::extractSourceFilename($source);
-        $orig = realpath(dirname($file) . DIRECTORY_SEPARATOR . $sourceFile);
+        $orig = realpath(dirname($file).DIRECTORY_SEPARATOR.$sourceFile);
         $origPart = preg_split('/(\/|\\\)public(\/|\\\)/i', $orig);
         try {
             if (count($source) > 1 && array_key_exists(1, $origPart)) {
-                $dest = $this->path . $origPart[1];
+                $dest = $this->path.$origPart[1];
                 GeneratorHelper::createDir(dirname($dest));
                 if (!file_exists($dest) || filemtime($orig) > filemtime($dest)) {
                     if (@copy($orig, $dest) === FALSE) {
-                        throw new \RuntimeException('Can\' copy ' . $dest . '');
+                        throw new \RuntimeException('Can\' copy '.$dest.'');
                     }
                     Logger::log("$orig copiado a $dest", LOG_INFO);
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
-        Inspector::stats('[CssTrait] End collecting resources from ' . $file, Inspector::SCOPE_DEBUG);
+        Inspector::stats('[CssTrait] End collecting resources from '.$file, Inspector::SCOPE_DEBUG);
     }
 
     /**
@@ -147,8 +147,8 @@ 
             foreach ($compiledFiles as $file) {
                 echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>";
             }
-        } else {
-            echo "\t\t<link href='" . $baseUrl . "/css/" . $hash . ".css' rel='stylesheet' " .
+        }else {
+            echo "\t\t<link href='".$baseUrl."/css/".$hash.".css' rel='stylesheet' ".
                 //"crossorigin='anonymous' integrity='sha384-" . $sri . "'>";
                 "media='screen, print'>";
         }

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