From c2f40feb0c97c5b14e55196f645d6e9f604e767f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 5 Jan 2018 14:29:16 +0200 Subject: [PATCH] split workflows (no else after return) --- lib/Minify.php | 22 +++++++++++----------- lib/Minify/CSS.php | 4 ++-- lib/Minify/CSSmin.php | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/Minify.php b/lib/Minify.php index 224fd9a..c41871d 100644 --- a/lib/Minify.php +++ b/lib/Minify.php @@ -299,20 +299,20 @@ class Minify $cg->sendHeaders(); return; - } else { - return array( - 'success' => true, - 'statusCode' => 304, - 'content' => '', - 'headers' => $cg->getHeaders(), - ); } - } else { - // client will need output - $headers = $cg->getHeaders(); - unset($cg); + + return array( + 'success' => true, + 'statusCode' => 304, + 'content' => '', + 'headers' => $cg->getHeaders(), + ); } + // client will need output + $headers = $cg->getHeaders(); + unset($cg); + if ($this->options['contentType'] === self::TYPE_CSS && $this->options['rewriteCssUris']) { $this->setupUriRewrites(); } diff --git a/lib/Minify/CSS.php b/lib/Minify/CSS.php index e45b061..22aaf2b 100644 --- a/lib/Minify/CSS.php +++ b/lib/Minify/CSS.php @@ -91,8 +91,8 @@ class Minify_CSS $symlinks = $options['symlinks']; return Minify_CSS_UriRewriter::rewrite($css, $currentDir, $docRoot, $symlinks); - } else { - return Minify_CSS_UriRewriter::prepend($css, $options['prependRelativePath']); } + + return Minify_CSS_UriRewriter::prepend($css, $options['prependRelativePath']); } } diff --git a/lib/Minify/CSSmin.php b/lib/Minify/CSSmin.php index 27ef8c6..753c510 100644 --- a/lib/Minify/CSSmin.php +++ b/lib/Minify/CSSmin.php @@ -78,11 +78,11 @@ class Minify_CSSmin ,$options['docRoot'] ,$options['symlinks'] ); - } else { - return Minify_CSS_UriRewriter::prepend( - $css - ,$options['prependRelativePath'] - ); } + + return Minify_CSS_UriRewriter::prepend( + $css + ,$options['prependRelativePath'] + ); } }