From 80c01c6f025a9e75a771c870a75c5829e3deba45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 18 Apr 2017 18:24:17 +0300 Subject: [PATCH] php-cs-fixer fix --- lib/Minify.php | 1 - lib/Minify/CSS.php | 1 + lib/Minify/CSS/Compressor.php | 4 ++++ lib/Minify/CSS/UriRewriter.php | 4 +++- lib/Minify/Cache/APC.php | 3 ++- lib/Minify/Cache/File.php | 1 + lib/Minify/Source.php | 1 - 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/Minify.php b/lib/Minify.php index 7741931..97f4313 100644 --- a/lib/Minify.php +++ b/lib/Minify.php @@ -517,7 +517,6 @@ class Minify if ($file && !isset($minifyOptions['currentDir']) && !isset($minifyOptions['prependRelativePath'])) { - $minifyOptions['currentDir'] = dirname($file); $source->setMinifierOptions($minifyOptions); } diff --git a/lib/Minify/CSS.php b/lib/Minify/CSS.php index c311f2e..e45b061 100644 --- a/lib/Minify/CSS.php +++ b/lib/Minify/CSS.php @@ -89,6 +89,7 @@ class Minify_CSS $currentDir = $options['currentDir']; $docRoot = $options['docRoot']; $symlinks = $options['symlinks']; + return Minify_CSS_UriRewriter::rewrite($css, $currentDir, $docRoot, $symlinks); } else { return Minify_CSS_UriRewriter::prepend($css, $options['prependRelativePath']); diff --git a/lib/Minify/CSS/Compressor.php b/lib/Minify/CSS/Compressor.php index ee3c7d6..3465061 100644 --- a/lib/Minify/CSS/Compressor.php +++ b/lib/Minify/CSS/Compressor.php @@ -217,6 +217,7 @@ class Minify_CSS_Compressor if (preg_match($pattern, $m, $n)) { // end hack mode after this comment, but preserve the hack and comment content $this->_inHack = false; + return "/*/{$n[1]}/**/"; } } @@ -224,18 +225,21 @@ class Minify_CSS_Compressor if (substr($m, -1) === '\\') { // comment ends like \*/ // begin hack mode and preserve hack $this->_inHack = true; + return '/*\\*/'; } if ($m !== '' && $m[0] === '/') { // comment looks like /*/ foo */ // begin hack mode and preserve hack $this->_inHack = true; + return '/*/*/'; } if ($this->_inHack) { // a regular comment ends hack mode but should be preserved $this->_inHack = false; + return '/**/'; } diff --git a/lib/Minify/CSS/UriRewriter.php b/lib/Minify/CSS/UriRewriter.php index acd1a2c..c3a63f0 100644 --- a/lib/Minify/CSS/UriRewriter.php +++ b/lib/Minify/CSS/UriRewriter.php @@ -52,7 +52,6 @@ class Minify_CSS_UriRewriter // normalize symlinks in order to map to link foreach ($symlinks as $link => $target) { - $link = ($link === '//') ? self::$_docRoot : str_replace('//', self::$_docRoot . '/', $link); $link = strtr($link, '/', DIRECTORY_SEPARATOR); @@ -272,6 +271,7 @@ class Minify_CSS_UriRewriter \\s* \\) # ) /x'; + return preg_replace($pattern, 'url($1)', $css); } @@ -337,6 +337,7 @@ class Minify_CSS_UriRewriter private static function _owlifySvgPaths($css) { $pattern = '~\b((?:clip-path|mask|-webkit-mask)\s*\:\s*)url(\(\s*#\w+\s*\))~'; + return preg_replace($pattern, '$1owl$2', $css); } @@ -351,6 +352,7 @@ class Minify_CSS_UriRewriter private static function _unOwlify($css) { $pattern = '~\b((?:clip-path|mask|-webkit-mask)\s*\:\s*)owl~'; + return preg_replace($pattern, '$1url', $css); } } diff --git a/lib/Minify/Cache/APC.php b/lib/Minify/Cache/APC.php index 479938d..85a0b49 100644 --- a/lib/Minify/Cache/APC.php +++ b/lib/Minify/Cache/APC.php @@ -62,7 +62,7 @@ class Minify_Cache_APC implements Minify_CacheInterface if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) { return mb_strlen($this->_data, '8bit'); } else { - return strlen($this->_data);; + return strlen($this->_data); } } @@ -124,6 +124,7 @@ class Minify_Cache_APC implements Minify_CacheInterface $ret = apc_fetch($id); if (false === $ret) { $this->_id = null; + return false; } diff --git a/lib/Minify/Cache/File.php b/lib/Minify/Cache/File.php index 7f57472..8d56fc9 100644 --- a/lib/Minify/Cache/File.php +++ b/lib/Minify/Cache/File.php @@ -109,6 +109,7 @@ class Minify_Cache_File implements Minify_CacheInterface { if (!$this->locking) { readfile($this->path . '/' . $id); + return; } diff --git a/lib/Minify/Source.php b/lib/Minify/Source.php index 1769d6e..94eb6dd 100644 --- a/lib/Minify/Source.php +++ b/lib/Minify/Source.php @@ -208,7 +208,6 @@ class Minify_Source implements Minify_SourceInterface if ($this->filepath && !isset($this->minifyOptions['currentDir']) && !isset($this->minifyOptions['prependRelativePath'])) { - $this->minifyOptions['currentDir'] = dirname($this->filepath); } }