Merge pull request #2 from bopoda/master

Fix getMasterRequest deprecation warning

.travis.yml

@@ -9,6 +9,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
 
 env:
   matrix:

src/EventListener/RequestResponseListener.php

@@ -93,7 +93,7 @@ public function handleRequest(RequestEvent $event)
     {
         // only handle master request, do not handle sub request like esi includes
         // If the device view is "not the mobile view" (e.g. we're not in the request context)
-        if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType() || $this->deviceView->isNotMobileView()) {
+        if (HttpKernelInterface::MAIN_REQUEST !== $event->getRequestType() || $this->deviceView->isNotMobileView()) {
             return;
         }
 
@@ -119,9 +119,10 @@ public function handleRequest(RequestEvent $event)
             }
         }
 
+        $viewType = $this->deviceView->getViewType();
         // Check if we must redirect to the target view and do so if needed
-        if ($this->mustRedirect($request, $this->deviceView->getViewType())) {
-            if (($response = $this->getRedirectResponse($request, $this->deviceView->getViewType()))) {
+        if ($viewType && $this->mustRedirect($request, $viewType)) {
+            if ($response = $this->getRedirectResponse($request, $viewType)) {
                 $event->setResponse($response);
             }
 

src/Helper/DeviceView.php

@@ -105,7 +105,7 @@ class DeviceView
 
     public function __construct(RequestStack $requestStack = null)
     {
-        if (!$requestStack || !$this->request = $requestStack->getMasterRequest()) {
+        if (!$requestStack || !$this->request = $requestStack->getMainRequest()) {
             $this->viewType = self::VIEW_NOT_MOBILE;
 
             return;

src/Twig/Extension/MobileDetectExtension.php

@@ -237,7 +237,7 @@ public function isAndroidOS()
     public function setRequestByRequestStack(RequestStack $requestStack = null)
     {
         if (null !== $requestStack) {
-            $this->request = $requestStack->getMasterRequest();
+            $this->request = $requestStack->getMainRequest();
         }
     }
 }

tests/DataCollector/DeviceDataCollectorTest.php

@@ -52,7 +52,7 @@ public function setUp(): void
 
         $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->disableOriginalConstructor()->getMock();
         $this->requestStack->expects($this->any())
-            ->method('getMasterRequest')
+            ->method('getMainRequest')
             ->willReturn($this->request)
         ;
 

tests/EventListener/RequestResponseListenerTest.php

@@ -73,7 +73,7 @@ public function setUp(): void
 
         $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->disableOriginalConstructor()->getMock();
         $this->requestStack->expects($this->any())
-            ->method('getMasterRequest')
+            ->method('getMainRequest')
             ->willReturn($this->request)
         ;
 
@@ -624,7 +624,7 @@ private function createGetResponseEvent(string $content, string $method = 'GET',
         $event = new ViewEvent(
             $this->createMock(HttpKernelInterface::class),
             $this->request,
-            HttpKernelInterface::MASTER_REQUEST,
+            HttpKernelInterface::MAIN_REQUEST,
             $content
         );
         $event->getRequest()->headers = new HeaderBag($headers);
@@ -646,7 +646,7 @@ private function createResponseEvent($response, $method = 'GET', $headers = [])
         $event = new ResponseEvent(
             $this->createMock(HttpKernelInterface::class),
             $this->request,
-            HttpKernelInterface::MASTER_REQUEST,
+            HttpKernelInterface::MAIN_REQUEST,
             $response
         );
         $event->getRequest()->headers = new HeaderBag($headers);

tests/Helper/DeviceViewTest.php

@@ -40,7 +40,7 @@ public function setUp(): void
         $this->request->cookies = new ParameterBag();
 
         $this->requestStack->expects($this->any())
-            ->method('getMasterRequest')
+            ->method('getMainRequest')
             ->willReturn($this->request)
         ;
     }

tests/Twig/Extension/MobileDetectExtensionTest.php

@@ -48,7 +48,7 @@ public function setUp(): void
         $this->request->cookies = new ParameterBag();
 
         $this->requestStack->expects($this->any())
-            ->method('getMasterRequest')
+            ->method('getMainRequest')
             ->willReturn($this->request)
         ;