psfs / core

src/controller/UserController.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
                 Logger::log('Configuration saved successful');
                 Security::getInstance()->setFlash("callback_message", t("Usuario agregado correctamente"));
                 Security::getInstance()->setFlash("callback_route", Router::getInstance()->getRoute("admin", true));
-            } else {
+            }else {
                 throw new ConfigException(t('Error al guardar los administradores, prueba a cambiar los permisos'));
             }
         }
@@ -99,7 +99,7 @@ 
     {
         if ($this->isAdmin()) {
             $this->redirect('admin');
-        } else {
+        }else {
             return Admin::staticAdminLogon();
         }
     }

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