add $needsWwwPrefix and $alreadyHasWwwPrefix properties at HttpsTrait…

… for reuse state
samsonasik · Apr 16, 2018 · 3b24734 · 3b24734
1 parent 885cde6
commit 3b24734
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/HttpsTrait.php b/src/HttpsTrait.php
@@ -11,6 +11,12 @@
 
 trait HttpsTrait
 {
+    /** @var bool */
+    private $needsWwwPrefix;
+
+    /** @var bool */
+    private $alreadyHasWwwPrefix;
+
     private function isSchemeHttps(string $uriScheme) : bool
     {
         return $uriScheme === 'https';
@@ -57,10 +63,10 @@ private function isSkippedHttpStrictTransportSecurity(string $uriScheme, $match,
      */
     private function withWwwPrefixWhenRequired(string $httpsRequestUri) : string
     {
-        $addWwwPrefix        = $this->config['add_www_prefix'] ?? false;
-        $alreadyHasWwwPrefix = \strpos($httpsRequestUri, 'www.', 8) === 8;
+        $this->needsWwwPrefix      = $this->config['add_www_prefix'] ?? false;
+        $this->alreadyHasWwwPrefix = \strpos($httpsRequestUri, 'www.', 8) === 8;
 
-        if (! $addWwwPrefix || $alreadyHasWwwPrefix) {
+        if (! $this->needsWwwPrefix || $this->alreadyHasWwwPrefix) {
             return $httpsRequestUri;
         }
 
@@ -73,15 +79,12 @@ private function withWwwPrefixWhenRequired(string $httpsRequestUri) : string
      */
     private function withoutWwwPrefixWhenNotRequired(string $httpsRequestUri) : string
     {
-        $addWwwPrefix = $this->config['add_www_prefix'] ?? false;
-        if ($addWwwPrefix) {
+        if ($this->needsWwwPrefix) {
             return $httpsRequestUri;
         }
 
         $removeWwwPrefix     = $this->config['remove_www_prefix'] ?? false;
-        $alreadyHasWwwPrefix = \strpos($httpsRequestUri, 'www.', 8) === 8;
-
-        if (! $removeWwwPrefix || ! $alreadyHasWwwPrefix) {
+        if (! $removeWwwPrefix || ! $this->alreadyHasWwwPrefix) {
             return $httpsRequestUri;
         }