psfs / core

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 +22 added lines, -22 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,9 +146,9 @@ 
             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' " .
-            "crossorigin='anonymous' integrity='sha384-" . $sri . "'>";
+        }else {
+            echo "\t\t<link href='".$baseUrl."/css/".$hash.".css' rel='stylesheet' ".
+            "crossorigin='anonymous' integrity='sha384-".$sri."'>";
         }
     }
 }

src/base/extension/traits/JsTrait.php

Spacing +16 added lines, -16 removed lines

@@ -24,9 +24,9 @@ 
             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'" .
-                " crossorigin='anonymous' integrity='sha384-" . $sri . "'></script>\n";
+        }else {
+            echo "\t\t<script type='text/javascript' src='".$baseUrl."/js/".$hash.".js'".
+                " crossorigin='anonymous' integrity='sha384-".$sri."'></script>\n";
         }
     }
 
@@ -41,12 +41,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;
     }
@@ -62,9 +62,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();
@@ -73,15 +73,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 {
+                if ($debug) {
+                    AssetsHelper::storeContents($base.$hash.".js", $data);
+                }else {
                     $this->dumpJs($hash, $base, $minifier);
                 }
                 unset($minifier);
@@ -102,9 +102,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");
         }
     }
 }