IBX-1294: Fixed deprecated RequestStack::getMasterRequest usages (#85)

adamwojs · web-flow · commit 617a9f0812cb · 2021-10-20T09:52:33.000+02:00
* IBX-1294: Fixed deprecated Symfony\Component\HttpFoundation\RequestStack::getMasterRequest usages * Adapted unit tests
diff --git a/src/lib/Server/Security/CsrfTokenManager.php b/src/lib/Server/Security/CsrfTokenManager.php
@@ -56,7 +56,7 @@ public function hasToken($tokenId)
      */
     private function resolveNamespace(RequestStack $requestStack = null)
     {
-        if ($requestStack !== null && ($request = $requestStack->getMasterRequest())) {
+        if ($requestStack !== null && ($request = $requestStack->getMainRequest())) {
             return $request->isSecure() ? 'https-' : '';
         }
 
diff --git a/tests/lib/Server/Security/CsrfTokenManagerTest.php b/tests/lib/Server/Security/CsrfTokenManagerTest.php
@@ -63,7 +63,7 @@ private function createCsrfTokenManager($https = false)
 
         $this->requestStack
             ->expects($this->once())
-            ->method('getMasterRequest')
+            ->method('getMainRequest')
             ->willReturn($request);
 
         return new CsrfTokenManager(

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function hasToken($tokenId)`
`56`	`56`	`*/`
`57`	`57`	`private function resolveNamespace(RequestStack $requestStack = null)`
`58`	`58`	`{`
`59`		`- if ($requestStack !== null && ($request = $requestStack->getMasterRequest())) {`
	`59`	`+ if ($requestStack !== null && ($request = $requestStack->getMainRequest())) {`
`60`	`60`	`return $request->isSecure() ? 'https-' : '';`
`61`	`61`	`}`
`62`	`62`