psfs / core

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

Indentation +8 added lines, -8 removed lines

@@ -143,14 +143,14 @@
         return $header ?: $default;
     }
 
-	/**
-	 * @param string $language
-	 * @return void
-	 */
-	public static function setLanguageHeader(string $language)
-	{
-		self::getInstance()->header['X-API-LANG'] = $language;
-	}
+    /**
+     * @param string $language
+     * @return void
+     */
+    public static function setLanguageHeader(string $language)
+    {
+        self::getInstance()->header['X-API-LANG'] = $language;
+    }
 
     /**
      * Método que devuelve la url solicitada

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');
 }
 
 /**
@@ -57,10 +57,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()
     {
         $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/extension/AssetsNode.php

Spacing +4 added lines, -4 removed lines

@@ -34,20 +34,20 @@
         $scripts = $this->getNode("scripts");
 
         //Creamos el parser
-        $compiler->addDebugInfo($scripts)->write('$parser = new \\PSFS\\base\\extension\\AssetsParser(\'' . $this->type . '\')')
+        $compiler->addDebugInfo($scripts)->write('$parser = new \\PSFS\\base\\extension\\AssetsParser(\''.$this->type.'\')')
             ->raw(";\n");
 
         //Asociamos el hash
-        $compiler->write('$parser->setHash(\'' . $this->hash . '\')')
+        $compiler->write('$parser->setHash(\''.$this->hash.'\')')
             ->raw(";\n");
 
         //Inicializamos SRI
-        $compiler->write('$parser->init(\'' . $this->type . '\')')
+        $compiler->write('$parser->init(\''.$this->type.'\')')
             ->raw(";\n");
 
         //Asociamos los ficheros
         foreach ($scripts->getAttribute("value") as $value) {
-            $compiler->write('$parser->addFile(\'' . $value . '\')')->raw(";\n");
+            $compiler->write('$parser->addFile(\''.$value.'\')')->raw(";\n");
         }
 
         //Procesamos los ficheros

src/base/extension/AssetsParser.php

Spacing +17 added lines, -17 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
  * @package PSFS\base\extension
@@ -66,7 +66,7 @@ 
         /** @var Cache $cache */
         $cache = Cache::getInstance();
         $this->sri = $cache->getDataFromFile($this->sriFilename, Cache::JSON, true);
-        if(empty($this->sri)) {
+        if (empty($this->sri)) {
             $this->sri = [];
         }
     }
@@ -79,7 +79,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());
     }
@@ -92,12 +92,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;
                 }
             }
@@ -114,7 +114,7 @@ 
     public function setHash($hash)
     {
         $cache = Config::getParam('cache.var', '');
-        $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
+        $this->hash = $hash.(strlen($cache) ? '.' : '').$cache;
         return $this;
     }
 
@@ -177,7 +177,7 @@ 
             $sourceFile = explode("?", $sourceFile);
             $sourceFile = $sourceFile[0];
         }
-        $orig = realpath(dirname($filenamePath) . DIRECTORY_SEPARATOR . $sourceFile);
+        $orig = realpath(dirname($filenamePath).DIRECTORY_SEPARATOR.$sourceFile);
         return $orig;
     }
 
@@ -194,15 +194,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);
                 }
             }
         }
@@ -215,11 +215,11 @@ 
      * @throws \PSFS\base\exception\GeneratorException
      */
     protected function getSriHash($hash, $type = 'js') {
-        if(array_key_exists($hash, $this->sri)) {
+        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/traits/CssTrait.php

Spacing +21 added lines, -21 removed lines

@@ -30,8 +30,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();
@@ -39,15 +39,15 @@ 
                     $data = $this->processCssLine($file, $base, $data, $hash);
                 }
             }
-            if($debug) {
-                AssetsHelper::storeContents($base . $hash . ".css", $data);
-            } else {
+            if ($debug) {
+                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);
         }
@@ -67,21 +67,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;
@@ -113,25 +113,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);
     }
 
     /**
@@ -146,8 +146,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/functions.php

Spacing +10 added lines, -10 removed lines

@@ -35,16 +35,16 @@ 
     {
         $html = '<style>*{margin: 0} body{background: rgb(36,36,36); padding: 5px;}</style>';
         $html .= '<pre style="padding: 10px; margin: 5px; display: block; background: rgb(41,41,41); color: white; border-radius: 5px;">';
-        if(is_null($var)) {
-            if($varName) $html .= $varName . ' ==> <b>NULL</b>';
-        } else {
-            $html .= print_r('(' . gettype($var) . ') ', TRUE);
-            if($varName) $html .= $varName . ' ==> ';
-            if("boolean" === gettype($var)) {
+        if (is_null($var)) {
+            if ($varName) $html .= $varName.' ==> <b>NULL</b>';
+        }else {
+            $html .= print_r('('.gettype($var).') ', TRUE);
+            if ($varName) $html .= $varName.' ==> ';
+            if ("boolean" === gettype($var)) {
                 $html .= print_r($var ? "TRUE" : "FALSE", TRUE);
-            } else if((is_array($var) && !empty($var)) || (!is_array($var)) ||  ($var === 0)) {
+            }else if ((is_array($var) && !empty($var)) || (!is_array($var)) || ($var === 0)) {
                 $html .= print_r($var, TRUE);
-            } else {
+            }else {
                 $html .= 'empty';
             }
         }
@@ -79,14 +79,14 @@ 
     /* @var $file SplFileInfo */
     foreach ($finder as $file) {
         $path = $file->getRealPath();
-        if(!in_array($path, $loaded_files)) {
+        if (!in_array($path, $loaded_files)) {
             $loaded_files[] = $path;
             require_once($path);
         }
     }
 }
 
-if(!function_exists('t')) {
+if (!function_exists('t')) {
     function t($message, $key = null, $reload = false) {
         return CustomTranslateExtension::_($message, $key, $reload);
     }

Braces +9 added lines, -4 removed lines

@@ -36,10 +36,14 @@ 
         $html = '<style>*{margin: 0} body{background: rgb(36,36,36); padding: 5px;}</style>';
         $html .= '<pre style="padding: 10px; margin: 5px; display: block; background: rgb(41,41,41); color: white; border-radius: 5px;">';
         if(is_null($var)) {
-            if($varName) $html .= $varName . ' ==> <b>NULL</b>';
+            if($varName) {
+                $html .= $varName . ' ==> <b>NULL</b>';
+            }
         } else {
             $html .= print_r('(' . gettype($var) . ') ', TRUE);
-            if($varName) $html .= $varName . ' ==> ';
+            if($varName) {
+                $html .= $varName . ' ==> ';
+            }
             if("boolean" === gettype($var)) {
                 $html .= print_r($var ? "TRUE" : "FALSE", TRUE);
             } else if((is_array($var) && !empty($var)) || (!is_array($var)) ||  ($var === 0)) {
@@ -63,9 +67,10 @@ 
     function getallheaders()
     {
         $headers = [];
-        foreach ($_SERVER as $h => $v)
-            if (preg_match('/HTTP_(.+)/', $h, $hp)) {
+        foreach ($_SERVER as $h => $v) {
+                    if (preg_match('/HTTP_(.+)/', $h, $hp)) {
                 $headers[$hp[1]] = $v;
+        }
             }
         return $headers;
     }