Merge pull request #1947 from stloyd/enable-63

Enable integration tests on Symfony 6

composer.json

@@ -131,6 +131,7 @@
     },
 
     "conflict": {
+        "symfony/security-bundle":      ">=6.0,<6.3.4",
         "twig/twig":                    "<1.43|>=2.0,<2.13"
     },
 

tests/Functional/IntegrationTest.php

@@ -19,7 +19,6 @@
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Security\Http\SecurityEvents;
 
 final class IntegrationTest extends WebTestCase
@@ -31,7 +30,7 @@ public static function getKernelClass(): string
 
     public function testRequestRedirect(): void
     {
-        $client = static::createClient();
+        $client = self::createClient();
         $client->disableReboot();
         $client->getContainer()->set('hwi_oauth.http_client', new MockHttpClient());
         $client->request('GET', '/private');
@@ -66,7 +65,7 @@ public function testRequestRedirect(): void
 
     public function testRequestRedirectApi(): void
     {
-        $client = static::createClient();
+        $client = self::createClient();
         $client->disableReboot();
         $client->getContainer()->set('hwi_oauth.http_client', new MockHttpClient());
         $client->request('GET', '/private');
@@ -121,7 +120,7 @@ function ($method, $url, $options) {
             }
         );
 
-        $client = static::createClient();
+        $client = self::createClient();
         $client->disableReboot();
         $container = $client->getContainer();
         $container->set('hwi_oauth.http_client', $httpClient);
@@ -149,11 +148,6 @@ function ($method, $url, $options) {
 
     public function testRequestCheckApi(): void
     {
-        // @phpstan-ignore-next-line
-        if (Kernel::MAJOR_VERSION >= 6) {
-            $this->markTestSkipped('Skipped due to bug in Symfony Security component: https://github.com/symfony/symfony/issues/51319');
-        }
-
         $redirectLoginFromService = 'http://localhost/api/check-login/google?'
             .http_build_query([
                 'code' => 'sOmeRand0m-code',
@@ -174,7 +168,7 @@ function ($method, $url, $options) {
             }
         );
 
-        $client = static::createClient();
+        $client = self::createClient();
         $client->disableReboot();
         $container = $client->getContainer();
         $container->set('hwi_oauth.http_client', $httpClient);