Fixed Symfony 5.3 RequestStack::getMasterRequest deprecation (#46)

* Switch tests to Symfony 5.3 * Fixed RequestStack::getMasterRequest deprecation
yokai-php · Jun 21, 2021 · def927c · def927c
1 parent f9111f2
commit def927c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,9 +19,9 @@ jobs:
           - php-version: 8.0
             symfony-version: 4.4.*
           - php-version: 7.4
-            symfony-version: 5.2.*
+            symfony-version: 5.3.*
           - php-version: 8.0
-            symfony-version: 5.2.*
+            symfony-version: 5.3.*
 
     steps:
       - name: "Checkout"

diff --git a/src/InformationGuesser/InformationGuesser.php b/src/InformationGuesser/InformationGuesser.php
@@ -31,7 +31,12 @@ public function __construct(RequestStack $requestStack)
      */
     public function get(): array
     {
-        $request = $this->requestStack->getMasterRequest();
+        if (\method_exists($this->requestStack, 'getMainRequest')) {
+            $request = $this->requestStack->getMainRequest();
+        } else {
+            $request = $this->requestStack->getMasterRequest();
+        }
+
         if (!$request) {
             return [];
         }