psfs / core

src/base/types/helpers/ResponseHelper.php

Spacing +6 added lines, -6 removed lines

@@ -76,9 +76,9 @@ 
             Logger::log('Adding debug headers to render response');
             $vars["__DEBUG__"]["includes"] = get_included_files();
             $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            header('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s');
-            header('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes');
-            header('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened');
+            header('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s');
+            header('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes');
+            header('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened');
         }
 
         return $vars;
@@ -93,7 +93,7 @@ 
      */
     public static function httpNotFound(Exception $exception = NULL, $isJson = false)
     {
-        if(self::isTest()) {
+        if (self::isTest()) {
             return 404;
         }
         Inspector::stats('[Router] Throw not found exception', Inspector::SCOPE_DEBUG);
@@ -108,9 +108,9 @@ 
         }
 
         $notFoundRoute = Config::getParam('route.404');
-        if(null !== $notFoundRoute) {
+        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/types/helpers/SecurityHelper.php

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
             && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false))
         ) {
             if (!self::isTest() &&
-                null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) {
+                null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) {
                 throw new AdminCredentialsException();
             }
             if (!Security::getInstance()->checkAdmin()) {
@@ -54,8 +54,8 @@ 
         $token = '';
         $length = strlen($timestamp);
         for ($i = 0; $i < $length; $i++) {
-            $token = substr($hash, $i, 1) .
-                substr($timestamp, $i, 1) .
+            $token = substr($hash, $i, 1).
+                substr($timestamp, $i, 1).
                 $token;
         }
         return $token;
@@ -74,16 +74,16 @@ 
         $charsLength = strlen(self::RAND_SEP) - 1;
         $tsLength = strlen($timestamp);
         $i = 0;
-        $partCount = ceil($hashRest / 4);
-        $part = substr($hash, $tsLength + $partCount * $i, $partCount);
+        $partCount = ceil($hashRest/4);
+        $part = substr($hash, $tsLength + $partCount*$i, $partCount);
         while (false !== $part) {
-            $mixedToken .= $part .
-                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) .
+            $mixedToken .= $part.
+                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1).
                 substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1);
-            $part = substr($hash, $tsLength + $partCount * $i, $partCount);
+            $part = substr($hash, $tsLength + $partCount*$i, $partCount);
             $i++;
         }
-        return $mixedToken . $token;
+        return $mixedToken.$token;
     }
 
     /**
@@ -93,7 +93,7 @@ 
     private static function getTs($isOdd = null)
     {
         $timestamp = time();
-        $tsIsOdd = (bool)((int)substr($timestamp, -1) % 2);
+        $tsIsOdd = (bool)((int)substr($timestamp, -1)%2);
         if (false === $isOdd && !$tsIsOdd) {
             $timestamp--;
         } elseif (true === $isOdd && !$tsIsOdd) {
@@ -130,9 +130,9 @@ 
         $timestamp = '';
         $part = strrev($part);
         for ($i = 0, $ct = strlen($part); $i < $ct; $i++) {
-            if ($i % 2 == 0) {
+            if ($i%2 == 0) {
                 $timestamp .= substr($part, $i, 1);
-            } else {
+            }else {
                 $partToken .= substr($part, $i, 1);
             }
         }
@@ -152,7 +152,7 @@ 
             foreach ($parts as $part) {
                 $token .= $part;
             }
-            $token = $partToken . $token;
+            $token = $partToken.$token;
         }
         return [$token, $timestamp];
     }

src/base/types/traits/Router/SluggerTrait.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     {
         $this->generateSlugs();
         GeneratorHelper::createDir(CONFIG_DIR);
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', [$this->routing, $this->getSlugs()], Cache::JSON, TRUE);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', [$this->routing, $this->getSlugs()], Cache::JSON, TRUE);
 
         return $this;
     }

src/base/types/traits/Router/ModulesTrait.php

Spacing +10 added lines, -10 removed lines

@@ -54,11 +54,11 @@ 
         if ($files->hasResults()) {
             foreach ($files->getIterator() as $file) {
                 if ($namespace !== Router::PSFS_BASE_NAMESPACE && method_exists($file, 'getRelativePathname')) {
-                    $filename = '\\' . str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname()));
-                } else {
+                    $filename = '\\'.str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname()));
+                }else {
                     $filename = str_replace('/', '\\', str_replace($origen, '', $file->getPathname()));
                 }
-                $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing, $namespace);
+                $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing, $namespace);
             }
         }
         $this->initializeFinder();
@@ -111,7 +111,7 @@ 
             if (!is_array($this->domains)) {
                 $this->domains = [];
             }
-            $domain = '@' . $class->getConstant('DOMAIN') . '/';
+            $domain = '@'.$class->getConstant('DOMAIN').'/';
             if (!array_key_exists($domain, $this->domains)) {
                 $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain);
             }
@@ -138,11 +138,11 @@ 
     private function loadExternalAutoloader($hydrateRoute, SplFileInfo $modulePath, $externalModulePath, &$routing = [])
     {
         $extModule = $modulePath->getBasename();
-        $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php');
+        $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php');
         if (file_exists($moduleAutoloader)) {
             include_once $moduleAutoloader;
             if ($hydrateRoute) {
-                $routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $routing);
+                $routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $routing);
             }
         }
     }
@@ -157,7 +157,7 @@ 
     {
         try {
             $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module);
-            $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src';
+            $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src';
             if (file_exists($externalModulePath)) {
                 $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0);
                 if ($externalModule->hasResults()) {
@@ -166,7 +166,7 @@ 
                     }
                 }
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
         }
     }
@@ -178,9 +178,9 @@ 
     public function domainExists($domainToCheck) {
         $exists = false;
         $domains = array_keys($this->getDomains());
-        foreach($domains as $domain) {
+        foreach ($domains as $domain) {
             $cleanDomain = strtolower(str_replace(['@', '/', '\\'], '', $domain));
-            if($cleanDomain === strtolower($domainToCheck)) {
+            if ($cleanDomain === strtolower($domainToCheck)) {
                 $exists = true;
                 break;
             }

src/base/extension/AssetsParser.php

Spacing +10 added lines, -10 removed lines

@@ -53,7 +53,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());
     }
@@ -66,12 +66,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;
                 }
             }
@@ -88,7 +88,7 @@ 
     public function setHash($hash)
     {
         $cache = Config::getParam('cache.var', '');
-        $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
+        $this->hash = $hash.(strlen($cache) ? '.' : '').$cache;
         return $this;
     }
 
@@ -150,7 +150,7 @@ 
             $sourceFile = explode("?", $sourceFile);
             $sourceFile = $sourceFile[0];
         }
-        $orig = realpath(dirname($filenamePath) . DIRECTORY_SEPARATOR . $sourceFile);
+        $orig = realpath(dirname($filenamePath).DIRECTORY_SEPARATOR.$sourceFile);
         return $orig;
     }
 
@@ -167,15 +167,15 @@ 
         if (preg_match_all('#url\((.*?)\)#', $line, $urls, PREG_SET_ORDER)) {
             foreach ($urls as $source) {
                 $orig = self::calculateResourcePathname($filenamePath, $source);
-                if(!empty($orig)) {
+                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);
                 }
             }
         }

src/base/extension/TemplateFunctions.php

Spacing +8 added lines, -8 removed lines

@@ -43,13 +43,13 @@ 
 
         $filePath = '';
         if (!file_exists($filePath)) {
-            $filePath = BASE_DIR . $string;
+            $filePath = BASE_DIR.$string;
         }
         $filenamePath = AssetsHelper::findDomainPath($string, $filePath);
 
         $filePath = self::processAsset($string, $name, $return, $filenamePath);
         $basePath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl());
-        $returnPath = empty($name) ? $basePath . '/' . $filePath : $name;
+        $returnPath = empty($name) ? $basePath.'/'.$filePath : $name;
         return $return ? $returnPath : '';
     }
 
@@ -66,7 +66,7 @@ 
         $router = Router::getInstance();
         try {
             return $router->getRoute($path, $absolute, $params);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $router->getRoute('', $absolute, $params);
         }
     }
@@ -213,9 +213,9 @@ 
     {
         $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);
         }
     }
 
@@ -234,9 +234,9 @@ 
         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/SlackHelper.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
             'attachments' => [
                 [
                     "author_name" => $request->getRootUrl(true),
-                    "text" => $file . ($line !== '' ? ' [' . $line . ']' : ''),
+                    "text" => $file.($line !== '' ? ' ['.$line.']' : ''),
                     "color" => Config::getParam('debug', true) ? 'warning' : "danger",
                     "title" => $message,
                     'fallback' => 'PSFS Error notifier',

src/base/types/helpers/RouterHelper.php

Spacing +14 added lines, -14 removed lines

@@ -24,11 +24,11 @@ 
     {
         Inspector::stats('[RouterHelper] Getting class to call for executing the request action', Inspector::SCOPE_DEBUG);
         Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action);
-        $actionClass = class_exists($action['class']) ? $action['class'] : "\\" . $action['class'];
+        $actionClass = class_exists($action['class']) ? $action['class'] : "\\".$action['class'];
         $reflectionClass = new ReflectionClass($actionClass);
         if ($reflectionClass->hasMethod('getInstance')) {
             $class = $reflectionClass->getMethod('getInstance')->invoke(null, $action['method']);
-        } else {
+        }else {
             $class = new $actionClass;
         }
         return $class;
@@ -62,7 +62,7 @@ 
     public static function extractComponents($route, $pattern)
     {
         Inspector::stats('[RouterHelper] Extracting parts for the request to execute', Inspector::SCOPE_DEBUG);
-        if(Config::getParam('allow.double.slashes', true)) {
+        if (Config::getParam('allow.double.slashes', true)) {
             $route = preg_replace("/\/\//", '/', $route);
         }
         $url = parse_url($route);
@@ -100,7 +100,7 @@ 
             $cleanPatternSep--;
         }
 
-        if(Config::getParam('allow.double.slashes', true)) {
+        if (Config::getParam('allow.double.slashes', true)) {
             $path = preg_replace("/\/\//", '/', $path);
         }
         $pathSep = count(explode('/', $path));
@@ -120,14 +120,14 @@ 
      */
     public static function matchRoutePattern($routePattern, $path)
     {
-        if(Config::getParam('allow.double.slashes', true)) {
+        if (Config::getParam('allow.double.slashes', true)) {
             $path = preg_replace("/\/\//", '/', $path);
         }
         $expr = preg_replace('/\{([^}]+)\}/', '%%%', $routePattern);
         $expr = preg_quote($expr, '/');
         $expr = str_replace('%%%', '(.*)', $expr);
         $expr2 = preg_replace('/\(\.\*\)$/', '', $expr);
-        $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path);
+        $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path);
         return $matched;
     }
 
@@ -138,7 +138,7 @@ 
      */
     public static function extractDomainInfo(ReflectionClass $class, $domain)
     {
-        $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
+        $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
         $templatesPath = 'templates';
         $publicPath = 'public';
         $modelsPath = 'models';
@@ -148,13 +148,13 @@ 
             $modelsPath = ucfirst($modelsPath);
         }
         if ($class->hasConstant('TPL')) {
-            $templatesPath .= DIRECTORY_SEPARATOR . $class->getConstant('TPL');
+            $templatesPath .= DIRECTORY_SEPARATOR.$class->getConstant('TPL');
         }
         return [
             'base' => $path,
-            'template' => $path . $templatesPath,
-            'model' => $path . $modelsPath,
-            'public' => $path . $publicPath,
+            'template' => $path.$templatesPath,
+            'model' => $path.$modelsPath,
+            'public' => $path.$publicPath,
         ];
     }
 
@@ -175,12 +175,12 @@ 
             foreach ($parameters as $param) {
                 if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                     $params[$param->getName()] = $param->getDefaultValue();
-                    $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
+                    $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex);
                 } elseif (!$param->isOptional()) {
                     $requirements[] = $param->getName();
                 }
             }
-        } else {
+        }else {
             $default = $regex;
         }
 
@@ -210,7 +210,7 @@ 
             $httpMethod = AnnotationHelper::extractReflectionHttpMethod($docComments);
             $icon = AnnotationHelper::extractDocIcon($docComments);
             $label = AnnotationHelper::extractReflectionLabel(str_replace('{__API__}', $api, $docComments));
-            $route = $httpMethod . "#|#" . $regex;
+            $route = $httpMethod."#|#".$regex;
             $route = preg_replace('/(\\r|\\f|\\t|\\n)/', '', $route);
             $info = [
                 'method' => $method->getName(),

src/base/Request.php

Spacing +10 added lines, -10 removed lines

@@ -122,7 +122,7 @@ 
      */
     public static function header($name, $default = null)
     {
-        return self::getInstance()->getHeader($name,  $default);
+        return self::getInstance()->getHeader($name, $default);
     }
 
     /**
@@ -135,10 +135,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;
     }
@@ -242,7 +242,7 @@ 
             $url = $this->getServer('HTTP_ORIGIN');
         }
         ob_start();
-        header('Location: ' . $url);
+        header('Location: '.$url);
         ob_end_clean();
         Security::getInstance()->updateSession();
         exit(t('Redirect...'));
@@ -258,7 +258,7 @@ 
         $url = $this->getServerName();
         $protocol = $hasProtocol ? $this->getProtocol() : '';
         if (!empty($protocol)) {
-            $url = $protocol . $url;
+            $url = $protocol.$url;
         }
         $url = $this->checkServerPort($url);
         return $url;
@@ -272,15 +272,15 @@ 
     {
         $port = (integer)$this->getServer('SERVER_PORT');
         $host = $this->getServer('HTTP_HOST');
-        if(!empty($host)) {
+        if (!empty($host)) {
             $parts = explode(':', $host);
             $hostPort = (integer)end($parts);
-            if($hostPort !== $port && count($parts) > 1) {
+            if ($hostPort !== $port && count($parts) > 1) {
                 $port = $hostPort;
             }
         }
         if (!in_array($port, [80, 443], true)) {
-            $url .= ':' . $port;
+            $url .= ':'.$port;
         }
         return $url;
     }