Merge pull request #19 from martinlutter/null-request

handle null request
everlutionsk · Mar 14, 2019 · 1d8bf09 · 1d8bf09
2 parents c5e0123 + 8d93fcd
commit 1d8bf09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Bridge/Item/RequestAttributesContainer.php b/src/Bridge/Item/RequestAttributesContainer.php
@@ -22,8 +22,12 @@ public function __construct(RequestStack $requestStack)
         $this->request = $requestStack->getMasterRequest();
     }
 
-    public function get(string $name, string $default = null): string
+    public function get(string $name, string $default = ''): string
     {
+        if (!$this->request) {
+            return '';
+        }
+
         return $this->request->get($name, $default);
     }
 }
diff --git a/src/Bridge/Matcher.php b/src/Bridge/Matcher.php
@@ -30,7 +30,7 @@ public function __construct(RequestStack $requestStack, UrlMatchVoterInterface $
 
     public function isCurrent($item): bool
     {
-        if (!$item instanceof MatchableInterface) {
+        if (!$this->request || !$item instanceof MatchableInterface) {
             return false;
         }