use coalesesce operator when possible

samsonasik · Apr 11, 2018 · 404b083 · 404b083
1 parent a121b8a
commit 404b083
Showing 1 changed file with 10 additions and 17 deletions.
diff --git a/src/HttpsTrait.php b/src/HttpsTrait.php
@@ -57,14 +57,10 @@ private function isSkippedHttpStrictTransportSecurity(string $uriScheme, $match,
      */
     private function withWwwPrefixWhenRequired(string $httpsRequestUri) : string
     {
-        if (
-            ! isset($this->config['add_www_prefix']) ||
-            ! $this->config['add_www_prefix'] ||
-            (
-                $this->config['add_www_prefix'] === true &&
-                \substr($httpsRequestUri, 8, 4) === 'www.'
-            )
-        ) {
+        $addWwwPrefix        = $this->config['add_www_prefix'] ?? false;
+        $alreadyHasWwwPrefix = \substr($httpsRequestUri, 8, 4) === 'www.';
+
+        if (! $addWwwPrefix || $alreadyHasWwwPrefix) {
             return $httpsRequestUri;
         }
 
@@ -77,18 +73,15 @@ private function withWwwPrefixWhenRequired(string $httpsRequestUri) : string
      */
     private function withoutWwwPrefixWhenNotRequired(string $httpsRequestUri) : string
     {
-        if (isset($this->config['add_www_prefix']) && $this->config['add_www_prefix'] === true) {
+        $addWwwPrefix = $this->config['add_www_prefix'] ?? false;
+        if ($addWwwPrefix) {
             return $httpsRequestUri;
         }
 
-        if (
-            ! isset($this->config['remove_www_prefix']) ||
-            ! $this->config['remove_www_prefix'] ||
-            (
-                $this->config['remove_www_prefix'] === true &&
-                \substr($httpsRequestUri, 8, 4) !== 'www.'
-            )
-        ) {
+        $removeWwwPrefix     = $this->config['remove_www_prefix'] ?? false;
+        $alreadyHasWwwPrefix = \substr($httpsRequestUri, 8, 4) === 'www.';
+
+        if (! $removeWwwPrefix || ! $alreadyHasWwwPrefix) {
             return $httpsRequestUri;
         }