Remove HttpKernelInterface::MASTER_REQUEST references

nelmio · Dec 3, 2023 · 7fd2127 · 7fd2127
1 parent 892f208
commit 7fd2127
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 32 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -40,21 +40,3 @@ parameters:
 			count: 1
 			path: tests/DependencyInjection/ConfigurationTest.php
 
-		-
-			message: """
-				#^Fetching deprecated class constant MASTER_REQUEST of class Symfony\\\\Component\\\\HttpKernel\\\\HttpKernelInterface\\:
-				since symfony/http\\-kernel 5\\.3, use MAIN_REQUEST instead\\.
-				            To ease the migration, this constant won't be removed until Symfony 7\\.0\\.$#
-			"""
-			count: 1
-			path: tests/Listener/ListenerTestCase.php
-
-		-
-			message: """
-				#^Fetching deprecated class constant MASTER_REQUEST of class Symfony\\\\Component\\\\HttpKernel\\\\HttpKernelInterface\\:
-				since symfony/http\\-kernel 5\\.3, use MAIN_REQUEST instead\\.
-				            To ease the migration, this constant won't be removed until Symfony 7\\.0\\.$#
-			"""
-			count: 1
-			path: tests/Twig/IntegrationTest.php
-
diff --git a/tests/Listener/ListenerTestCase.php b/tests/Listener/ListenerTestCase.php
@@ -78,9 +78,6 @@ private function getRequestType(bool $mainRequest): int
             return HttpKernelInterface::SUB_REQUEST;
         }
 
-        return \defined(HttpKernelInterface::class.'::MAIN_REQUEST')
-            ? HttpKernelInterface::MAIN_REQUEST
-            : HttpKernelInterface::MASTER_REQUEST
-        ;
+        return HttpKernelInterface::MAIN_REQUEST;
     }
 }
diff --git a/tests/Twig/IntegrationTest.php b/tests/Twig/IntegrationTest.php
@@ -64,7 +64,7 @@ public function testItWorksDynamically(): void
         $listener->onKernelRequest(new RequestEvent(
             $this->createStub(HttpKernelInterface::class),
             Request::create('/'),
-            $this->getMasterRequestType()
+            HttpKernelInterface::MAIN_REQUEST
         ));
 
         $this->assertSame('<script type="text/javascript">console.log(\'123456\');</script>
@@ -113,7 +113,7 @@ public function testItWorksStatically(): void
         $listener->onKernelRequest(new RequestEvent(
             $this->createStub(HttpKernelInterface::class),
             Request::create('/'),
-            $this->getMasterRequestType()
+            HttpKernelInterface::MAIN_REQUEST
         ));
 
         $this->assertSame('<script type="text/javascript">console.log(\'Hello\');</script>
@@ -127,12 +127,4 @@ public function testItWorksStatically(): void
 
         $this->assertSame(['script-src' => ['sha-script'], 'style-src' => ['sha-style']], $getSha($listener));
     }
-
-    private function getMasterRequestType(): int
-    {
-        return \defined(HttpKernelInterface::class.'::MAIN_REQUEST')
-            ? HttpKernelInterface::MAIN_REQUEST
-            : HttpKernelInterface::MASTER_REQUEST
-        ;
-    }
 }