Fix Issue 612 (jeroennoten#651)

* [src/Menu]: Make changes on the active checker to cover issues when url generator scheme is forced to https.

* [src/Menu]: Fix code style.

src/Menu/ActiveChecker.php

@@ -32,12 +32,11 @@ class ActiveChecker
     /**
      * Constructor.
      *
-     * @param Request $request
      * @param UrlGenerator $url
      */
-    public function __construct(Request $request, UrlGenerator $url)
+    public function __construct(UrlGenerator $url)
     {
-        $this->request = $request;
+        $this->request = $url->getRequest();
         $this->url = $url;
 
         // Fill the map with tests. These tests will check if a menu item is
@@ -135,6 +134,8 @@ protected function checkPattern($pattern)
         // If pattern is not a regex, check if the requested url matches the
         // absolute path to the given pattern.
 
-        return Str::is($this->url->to($pattern), $this->request->url());
+        $pattern = preg_replace('@^https?:https://@', '*', $this->url->to($pattern));
+
+        return Str::is($pattern, $this->request->url());
     }
 }

tests/Menu/ActiveCheckerTest.php

@@ -176,4 +176,18 @@ public function testActivefallbackToUrl()
 
         $this->assertTrue($isActive);
     }
+
+    public function testWithForcedScheme()
+    {
+        $checker = $this->makeActiveChecker('https://example.com/about', 'https');
+
+        $isActive = $checker->isActive(['url' => 'about']);
+        $this->assertTrue($isActive);
+
+        $isActive = $checker->isActive(['url' => 'https://example.com/about']);
+        $this->assertTrue($isActive);
+
+        $isActive = $checker->isActive(['url' => 'https://example.com/about']);
+        $this->assertTrue($isActive);
+    }
 }

tests/TestCase.php

@@ -49,9 +49,9 @@ protected function makeTranslator($locale = 'en')
         return $translator;
     }
 
-    protected function makeActiveChecker($uri = 'https://example.com')
+    protected function makeActiveChecker($uri = 'https://example.com', $scheme = null)
     {
-        return new ActiveChecker($this->makeRequest($uri), $this->makeUrlGenerator($uri));
+        return new ActiveChecker($this->makeUrlGenerator($uri, $scheme));
     }
 
     private function makeRequest($uri)
@@ -64,9 +64,18 @@ protected function makeAdminLte()
         return new AdminLte($this->getFilters(), $this->getDispatcher(), $this->makeContainer());
     }
 
-    protected function makeUrlGenerator($uri = 'https://example.com')
+    protected function makeUrlGenerator($uri = 'https://example.com', $scheme = null)
     {
-        return new UrlGenerator($this->getRouteCollection(), $this->makeRequest($uri));
+        $UrlGenerator = new UrlGenerator(
+            $this->getRouteCollection(),
+            $this->makeRequest($uri)
+        );
+
+        if ($scheme) {
+            $UrlGenerator->forceScheme($scheme);
+        }
+
+        return $UrlGenerator;
     }
 
     protected function makeGate()