psfs / core

src/base/extension/AssetsNode.php

Spacing +3 added lines, -3 removed lines

@@ -30,16 +30,16 @@
         $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");
 
         //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/AssetsTokenParser.php

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
         $tmp = array();
         if (NULL === $node) {
             $node = $value;
-        } else {
+        }else {
             $tmp = $this->getTmpAttribute($node);
         }
         $tmp[] = $value->getAttribute("value");

src/base/extension/AssetsParser.php

Spacing +50 added lines, -50 removed lines

@@ -32,7 +32,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->debug = Config::getInstance()->getDebugMode();
     }
@@ -54,7 +54,7 @@ 
             $source_file = explode("?", $source_file);
             $source_file = $source_file[0];
         }
-        $orig = realpath(dirname($filename_path) . DIRECTORY_SEPARATOR . $source_file);
+        $orig = realpath(dirname($filename_path).DIRECTORY_SEPARATOR.$source_file);
         return $orig;
     }
 
@@ -67,12 +67,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) {
                 $domain_filename = str_replace($domain, $paths["public"], $filename);
-                if (file_exists($domain_filename) && preg_match('/\.' . $this->type . '$/i', $domain_filename)) {
+                if (file_exists($domain_filename) && preg_match('/\.'.$this->type.'$/i', $domain_filename)) {
                     $this->files[] = $domain_filename;
                 }
             }
@@ -89,7 +89,7 @@ 
     public function setHash($hash)
     {
         $cache = Config::getInstance()->get('cache.var') ?: '';
-        $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
+        $this->hash = $hash.(strlen($cache) ? '.' : '').$cache;
         return $this;
     }
 
@@ -123,15 +123,15 @@ 
      */
     protected function compileCss()
     {
-        $base = $this->path . "css" . DIRECTORY_SEPARATOR;
-        if ($this->debug || !file_exists($base . $this->hash . ".css")) {
+        $base = $this->path."css".DIRECTORY_SEPARATOR;
+        if ($this->debug || !file_exists($base.$this->hash.".css")) {
             $data = '';
             if (0 < count($this->files)) {
                 foreach ($this->files as $file) {
                     $data = $this->processCssLine($file, $base, $data);
                 }
             }
-            $this->storeContents($base . $this->hash . ".css", \CssMin::minify($data));
+            $this->storeContents($base.$this->hash.".css", \CssMin::minify($data));
             unset($cssMinifier);
         }
         return $this;
@@ -144,8 +144,8 @@ 
      */
     protected function compileJs()
     {
-        $base = $this->path . "js" . DIRECTORY_SEPARATOR;
-        if ($this->debug || !file_exists($base . $this->hash . ".js")) {
+        $base = $this->path."js".DIRECTORY_SEPARATOR;
+        if ($this->debug || !file_exists($base.$this->hash.".js")) {
             $data = '';
             if (0 < count($this->files)) {
                 foreach ($this->files as $file) {
@@ -153,7 +153,7 @@ 
                     if (file_exists($file)) {
                         if ($this->debug) {
                             $data = $this->putDebugJs($path_parts, $base, $file);
-                        } elseif (!file_exists($base . $this->hash . ".js")) {
+                        } elseif (!file_exists($base.$this->hash.".js")) {
                             $data = $this->putProductionJs($base, $file, $data);
                         }
                     }
@@ -161,11 +161,11 @@ 
             }
             try {
                 $minifiedJs = Minifier::minify($data);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR);
                 $minifiedJs = false;
             }
-            $this->storeContents($base . $this->hash . ".js", (false !== $minifiedJs) ? $minifiedJs : $data);
+            $this->storeContents($base.$this->hash.".js", (false !== $minifiedJs) ? $minifiedJs : $data);
         }
         return $this;
     }
@@ -180,7 +180,7 @@ 
     {
         GeneratorHelper::createDir(dirname($path));
         if ("" !== $content && false === file_put_contents($path, $content)) {
-            throw new ConfigException(_('No se tienen permisos para escribir en ' . $path));
+            throw new ConfigException(_('No se tienen permisos para escribir en '.$path));
         }
     }
 
@@ -209,8 +209,8 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
             }
-        } else {
-            echo "\t\t<script type='text/javascript' src='/js/" . $this->hash . ".js'></script>\n";
+        }else {
+            echo "\t\t<script type='text/javascript' src='/js/".$this->hash.".js'></script>\n";
         }
     }
 
@@ -223,8 +223,8 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>";
             }
-        } else {
-            echo "\t\t<link href='/css/" . $this->hash . ".css' rel='stylesheet'>";
+        }else {
+            echo "\t\t<link href='/css/".$this->hash.".css' rel='stylesheet'>";
         }
     }
 
@@ -235,20 +235,20 @@ 
     protected function extractCssResources($source, $file)
     {
         $source_file = $this->extractSourceFilename($source);
-        $orig = realpath(dirname($file) . DIRECTORY_SEPARATOR . $source_file);
+        $orig = realpath(dirname($file).DIRECTORY_SEPARATOR.$source_file);
         $orig_part = preg_split('/(\/|\\\)public(\/|\\\)/i', $orig);
         try {
             if (count($source) > 1 && array_key_exists(1, $orig_part)) {
-                $dest = $this->path . $orig_part[1];
+                $dest = $this->path.$orig_part[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);
         }
     }
@@ -265,21 +265,21 @@ 
     {
         if (file_exists($file)) {
             $path_parts = explode("/", $file);
-            $file_path = $this->hash . "_" . $path_parts[count($path_parts) - 1];
-            if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($file) || $this->debug) {
+            $file_path = $this->hash."_".$path_parts[count($path_parts) - 1];
+            if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($file) || $this->debug) {
                 //Si tenemos modificaciones tenemos que compilar de nuevo todos los ficheros modificados
-                if (file_exists($base . $this->hash . ".css") && @unlink($base . $this->hash . ".css") === false) {
-                    throw new ConfigException("Can't unlink file " . $base . $this->hash . ".css");
+                if (file_exists($base.$this->hash.".css") && @unlink($base.$this->hash.".css") === false) {
+                    throw new ConfigException("Can't unlink file ".$base.$this->hash.".css");
                 }
                 $this->loopCssLines($file);
             }
             if ($this->debug) {
                 $data = file_get_contents($file);
-                $this->storeContents($base . $file_path, $data);
-            } else {
+                $this->storeContents($base.$file_path, $data);
+            }else {
                 $data .= file_get_contents($file);
             }
-            $this->compiled_files[] = "/css/" . $file_path;
+            $this->compiled_files[] = "/css/".$file_path;
         }
 
         return $data;
@@ -294,12 +294,12 @@ 
      */
     protected function putDebugJs($path_parts, $base, $file)
     {
-        $file_path = $this->hash . "_" . $path_parts[count($path_parts) - 1];
-        $this->compiled_files[] = "/js/" . $file_path;
+        $file_path = $this->hash."_".$path_parts[count($path_parts) - 1];
+        $this->compiled_files[] = "/js/".$file_path;
         $data = "";
-        if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($file)) {
+        if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($file)) {
             $data = file_get_contents($file);
-            $this->storeContents($base . $file_path, $data);
+            $this->storeContents($base.$file_path, $data);
         }
         return $data;
     }
@@ -316,8 +316,8 @@ 
     {
         $js = file_get_contents($file);
         try {
-            $data .= ";\n" . $js;
-        } catch (\Exception $e) {
+            $data .= ";\n".$js;
+        }catch (\Exception $e) {
             throw new ConfigException($e->getMessage());
         }
         return $data;
@@ -360,50 +360,50 @@ 
     {
         $ppath = explode("/", $string);
         $original_filename = $ppath[count($ppath) - 1];
-        $base = WEB_DIR . DIRECTORY_SEPARATOR;
+        $base = WEB_DIR.DIRECTORY_SEPARATOR;
         $file = "";
         $html_base = "";
         $debug = Config::getInstance()->getDebugMode();
         $cache = Config::getInstance()->get('cache.var');
-        $cache = $cache ? '.' . $cache : '';
+        $cache = $cache ? '.'.$cache : '';
         if (preg_match('/\.css$/i', $string)) {
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.css";
+            $file = "/".substr(md5($string), 0, 8)."$cache.css";
             $html_base = "css";
             if ($debug) {
-                $file = str_replace(".css", "_" . $original_filename, $file);
+                $file = str_replace(".css", "_".$original_filename, $file);
             }
         } elseif (preg_match('/\.js$/i', $string)) {
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.js";
+            $file = "/".substr(md5($string), 0, 8)."$cache.js";
             $html_base = "js";
             if ($debug) {
-                $file = str_replace(".js", "_" . $original_filename, $file);
+                $file = str_replace(".js", "_".$original_filename, $file);
             }
         } elseif (preg_match("/image/i", mime_content_type($filename_path))) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $html_base = "img";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
             }
         } elseif (preg_match("/(doc|pdf)/i", mime_content_type($filename_path))) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $html_base = "docs";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
             }
         } elseif (preg_match("/(video|audio|ogg)/i", mime_content_type($filename_path))) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $html_base = "media";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
             }
         } elseif (!$return && !is_null($name)) {
             $html_base = '';
             $file = $name;
         }
-        $file_path = $html_base . $file;
+        $file_path = $html_base.$file;
 
         return array($base, $html_base, $file_path);
     }
@@ -422,10 +422,10 @@ 
             foreach ($urls as $source) {
                 $orig = self::calculateResourcePathname($filename_path, $source);
                 $orig_part = explode("Public", $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);
                 }
             }
         }

src/base/Cache.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
      */
     private function saveTextToFile($data, $path, $absolute = false)
     {
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $filename = basename($absolutePath);
         GeneratorHelper::createDir(str_replace($filename, "", $absolutePath));
         if (false === file_put_contents($absolutePath, $data)) {
@@ -48,7 +48,7 @@ 
     public function getDataFromFile($path, $transform = Cache::TEXT, $absolute = false)
     {
         $data = null;
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         if (file_exists($absolutePath)) {
             $data = file_get_contents($absolutePath);
         }
@@ -64,7 +64,7 @@ 
      */
     private function hasExpiredCache($path, $expires = 300, $absolute = false)
     {
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $lasModificationDate = filemtime($absolutePath);
         return ($lasModificationDate + $expires <= time());
     }
@@ -144,11 +144,11 @@ 
     public function readFromCache($path, $expires = 300, callable $function, $transform = Cache::TEXT)
     {
         $data = null;
-        if (file_exists(CACHE_DIR . DIRECTORY_SEPARATOR . $path)) {
+        if (file_exists(CACHE_DIR.DIRECTORY_SEPARATOR.$path)) {
             if (null !== $function && $this->hasExpiredCache($path, $expires)) {
                 $data = call_user_func($function);
                 $this->storeData($path, $data, $transform);
-            } else {
+            }else {
                 $data = $this->getDataFromFile($path, $transform);
             }
         }
@@ -194,7 +194,7 @@ 
         $hash = "";
         $action = Security::getInstance()->getSessionKey("__CACHE__");
         if (null !== $action && $action["cache"] > 0) {
-            $hash = $action["http"] . " " . $action["slug"];
+            $hash = $action["http"]." ".$action["slug"];
         }
         return sha1($hash);
     }

src/base/Request.php

Spacing +3 added lines, -3 removed lines

@@ -216,7 +216,7 @@ 
     {
         if (null === $url) $url = $this->getServer('HTTP_ORIGIN');
         ob_start();
-        header('Location: ' . $url);
+        header('Location: '.$url);
         ob_end_clean();
         Security::getInstance()->updateSession();
         exit(_("Redireccionando..."));
@@ -261,9 +261,9 @@ 
         $host = $this->getServerName();
         $protocol = $protocol ? $this->getProtocol() : '';
         $url = '';
-        if (!empty($host) && !empty($protocol)) $url = $protocol . $host;
+        if (!empty($host) && !empty($protocol)) $url = $protocol.$host;
         if (!in_array($this->getServer('SERVER_PORT'), [80, 443])) {
-            $url .= ':' . $this->getServer('SERVER_PORT');
+            $url .= ':'.$this->getServer('SERVER_PORT');
         }
         return $url;
     }

Braces +9 added lines, -4 removed lines

@@ -8,9 +8,10 @@ 
     function getallheaders()
     {
         $headers = array();
-        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;
     }
 }
@@ -214,7 +215,9 @@ 
      */
     public function redirect($url = null)
     {
-        if (null === $url) $url = $this->getServer('HTTP_ORIGIN');
+        if (null === $url) {
+            $url = $this->getServer('HTTP_ORIGIN');
+        }
         ob_start();
         header('Location: ' . $url);
         ob_end_clean();
@@ -261,7 +264,9 @@ 
         $host = $this->getServerName();
         $protocol = $protocol ? $this->getProtocol() : '';
         $url = '';
-        if (!empty($host) && !empty($protocol)) $url = $protocol . $host;
+        if (!empty($host) && !empty($protocol)) {
+            $url = $protocol . $host;
+        }
         if (!in_array($this->getServer('SERVER_PORT'), [80, 443])) {
             $url .= ':' . $this->getServer('SERVER_PORT');
         }

src/command/PSFSConsole.php

Spacing +8 added lines, -8 removed lines

@@ -11,20 +11,20 @@
  */
 // Load custom config
 $pwd = getcwd();
-$dir = $pwd . DIRECTORY_SEPARATOR . "vendor" . DIRECTORY_SEPARATOR;
+$dir = $pwd.DIRECTORY_SEPARATOR."vendor".DIRECTORY_SEPARATOR;
 
-require_once $dir . 'autoload.php';
+require_once $dir.'autoload.php';
 
 
-$project_path = $pwd . DIRECTORY_SEPARATOR . "src" . DIRECTORY_SEPARATOR;
-if (file_exists($project_path . "bootstrap.php")) {
-    include_once($project_path . "bootstrap.php");
+$project_path = $pwd.DIRECTORY_SEPARATOR."src".DIRECTORY_SEPARATOR;
+if (file_exists($project_path."bootstrap.php")) {
+    include_once($project_path."bootstrap.php");
 }
-if (file_exists($project_path . "autoload.php")) {
-    include_once($project_path . "autoload.php");
+if (file_exists($project_path."autoload.php")) {
+    include_once($project_path."autoload.php");
 }
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'bootstrap.php';
+require_once __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'bootstrap.php';
 
 $console = new Application();
 //Hidratamos con los comandos de PSFS

Braces +6 added lines, -2 removed lines

@@ -30,7 +30,9 @@ 
 //Hidratamos con los comandos de PSFS
 $commands = new Finder();
 $commands->in(__DIR__)->notName("PSFSConsole.php");
-foreach ($commands as $com) include_once($com->getRealPath());
+foreach ($commands as $com) {
+    include_once($com->getRealPath());
+}
 
 //Hidratamos con los comandos de los módulos
 $domains = Router::getInstance()->getDomains();
@@ -38,7 +40,9 @@ 
     if (!preg_match('/ROOT/i', $domain)) {
         $commands = new Finder();
         $commands->in($paths['base'])->path("Command")->name("*.php");
-        foreach ($commands as $com) include_once($com->getRealPath());
+        foreach ($commands as $com) {
+            include_once($com->getRealPath());
+        }
     }
 }
 

src/controller/RouteController.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
             $router->simpatize();
             Security::getInstance()->setFlash("callback_message", _("Rutas generadas correctamente"));
             Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true));
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             Security::getInstance()->setFlash("callback_message", _("Algo no ha salido bien, revisa los logs"));
             Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true));