Check for Symfony version for security extends

Author: Vincz

src/Security/Security.php

@@ -5,22 +5,42 @@
 namespace Overblog\GraphQLBundle\Security;
 
 use LogicException;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Security\Core\Security as CoreSecurity;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Bundle\SecurityBundle\Security as BundleSecurity;
 
 use function array_reduce;
 
-final class Security
+if (Kernel::VERSION_ID >= 60200) {
+    final class Security extends BaseSecurity
+    {
+        public function __construct(?BundleSecurity $security)
+        {
+            parent::__construct($security);
+        }
+    }
+} else {
+    final class Security extends BaseSecurity
+    {
+        public function __construct(?CoreSecurity $security)
+        {
+            parent::__construct($security);
+        }
+    }
+}
+
+abstract class BaseSecurity
 {
     /**
-     * @var CoreSecurity
+     * @var CoreSecurity|BundleSecurity
      */
     private $coreSecurity;
 
-    public function __construct(?CoreSecurity $security)
+    public function __construct($security)
     {
         // @phpstan-ignore-next-line
-        $this->coreSecurity = $security ?? new class() {
+        $this->coreSecurity = $security ?? new class () {
             public function isGranted(): bool
             {
                 throw new LogicException('The "symfony/security-core" component is required.');

tests/ExpressionLanguage/ExpressionFunction/Security/GetUserTest.php

@@ -11,6 +11,8 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Security as CoreSecurity;
+use Symfony\Bundle\SecurityBundle\Security as BundleSecurity;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Core\User\User;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -22,14 +24,32 @@ protected function getFunctions()
         return [new GetUser()];
     }
 
+    protected function getMockedSecurity()
+    {
+        if (Kernel::VERSION_ID >= 60200) {
+            return $this->createMock(BundleSecurity::class);
+        } else {
+            return $this->createMock(CoreSecurity::class);
+        }
+    }
+
+    protected function getSecurityWithStorage(TokenStorageInterface $storage)
+    {
+        if (Kernel::VERSION_ID >= 60200) {
+            return new BundleSecurity($this->getDIContainerMock(['security.token_storage' => $storage]));
+        } else {
+            return new CoreSecurity($this->getDIContainerMock(['security.token_storage' => $storage]));
+        }
+    }
+
     public function testEvaluator(): void
     {
         if (class_exists(InMemoryUser::class)) {
             $testUser = new InMemoryUser('testUser', 'testPassword');
         } else {
             $testUser = new User('testUser', 'testPassword');
         }
-        $coreSecurity = $this->createMock(CoreSecurity::class);
+        $coreSecurity = $this->getMockedSecurity();
         $coreSecurity->method('getUser')->willReturn($testUser);
         $services = $this->createGraphQLServices(['security' => new Security($coreSecurity)]);
 
@@ -40,7 +60,7 @@ public function testEvaluator(): void
     public function testGetUserNoTokenStorage(): void
     {
         ${TypeGenerator::GRAPHQL_SERVICES} = $this->createGraphQLServices(
-            ['security' => new Security($this->createMock(CoreSecurity::class))]
+            ['security' => new Security($this->getMockedSecurity())]
         );
         ${TypeGenerator::GRAPHQL_SERVICES}->get('security');
         $this->assertNull(eval($this->getCompileCode()));
@@ -51,11 +71,7 @@ public function testGetUserNoToken(): void
         $tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)->getMock();
         ${TypeGenerator::GRAPHQL_SERVICES} = $this->createGraphQLServices(
             [
-                'security' => new Security(
-                    new CoreSecurity(
-                        $this->getDIContainerMock(['security.token_storage' => $tokenStorage])
-                    )
-                ),
+                'security' => new Security($this->getSecurityWithStorage($tokenStorage)),
             ]
         );
         ${TypeGenerator::GRAPHQL_SERVICES}->get('security');
@@ -77,11 +93,7 @@ public function testGetUser($user, $expectedUser): void
 
         ${TypeGenerator::GRAPHQL_SERVICES} = $this->createGraphQLServices(
             [
-                'security' => new Security(
-                    new CoreSecurity(
-                        $this->getDIContainerMock(['security.token_storage' => $tokenStorage])
-                    )
-                ),
+                'security' => new Security($this->getSecurityWithStorage($tokenStorage)),
             ]
         );
         ${TypeGenerator::GRAPHQL_SERVICES}->get('security');

tests/ExpressionLanguage/TestCase.php

@@ -19,6 +19,8 @@
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\ExpressionLanguage\ExpressionFunction;
 use Symfony\Component\Security\Core\Security as CoreSecurity;
+use Symfony\Bundle\SecurityBundle\Security as BundleSecurity;
+use Symfony\Component\HttpKernel\Kernel;
 
 use function array_keys;
 use function call_user_func_array;
@@ -102,10 +104,17 @@ protected function getSecurityIsGrantedWithExpectation($with, $expects = null, $
      */
     private function getCoreSecurityMock()
     {
-        return $this->getMockBuilder(CoreSecurity::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['isGranted'])
-            ->getMock();
+        if (Kernel::VERSION_ID >= 60200) {
+            return $this->getMockBuilder(BundleSecurity::class)
+                ->disableOriginalConstructor()
+                ->setMethods(['isGranted'])
+                ->getMock();
+        } else {
+            return $this->getMockBuilder(CoreSecurity::class)
+                ->disableOriginalConstructor()
+                ->setMethods(['isGranted'])
+                ->getMock();
+        }
     }
 
     protected function createGraphQLServices(array $services = []): GraphQLServices