NGP-6240 Fix Symfony 6.3 deprecations

.github/workflows/continuous-integration.yaml

@@ -64,8 +64,7 @@ jobs:
         include:
           - dependencies: 'beta'
         symfony_version:
-          - 5.4
-          - 6.0
+          - 6.3
     env:
       SYMFONY_VERSION: '${{ matrix.symfony_version }}'
     steps:

Command/CleanCommand.php

@@ -15,14 +15,17 @@
 
 use FOS\OAuthServerBundle\Model\AuthCodeManagerInterface;
 use FOS\OAuthServerBundle\Model\TokenManagerInterface;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(
+    name: 'fos:oauth-server:clean',
+    description: 'Clean expired tokens',
+)]
 class CleanCommand extends Command
 {
-    protected static $defaultName = 'fos:oauth-server:clean';
-
     private $accessTokenManager;
     private $refreshTokenManager;
     private $authCodeManager;
@@ -39,10 +42,7 @@ public function __construct(
         $this->authCodeManager = $authCodeManager;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -57,9 +57,6 @@ protected function configure()
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         foreach ([$this->accessTokenManager, $this->refreshTokenManager, $this->authCodeManager] as $service) {

Command/CreateClientCommand.php

@@ -14,16 +14,19 @@
 namespace FOS\OAuthServerBundle\Command;
 
 use FOS\OAuthServerBundle\Model\ClientManagerInterface;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
+#[AsCommand(
+    name: 'fos:oauth-server:create-client',
+    description: 'Creates a new client',
+)]
 class CreateClientCommand extends Command
 {
-    protected static $defaultName = 'fos:oauth-server:create-client';
-
     private $clientManager;
 
     public function __construct(ClientManagerInterface $clientManager)
@@ -33,10 +36,7 @@ public function __construct(ClientManagerInterface $clientManager)
         $this->clientManager = $clientManager;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -66,9 +66,6 @@ protected function configure()
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);

DependencyInjection/Compiler/GrantExtensionsCompilerPass.php

@@ -23,7 +23,7 @@
  */
 class GrantExtensionsCompilerPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $storageDefinition = $container->findDefinition('fos_oauth_server.storage');
         $className = $container->getParameterBag()->resolveValue($storageDefinition->getClass());

DependencyInjection/Compiler/RequestStackCompilerPass.php

@@ -24,10 +24,7 @@
  */
 final class RequestStackCompilerPass implements CompilerPassInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if ($container->has('request_stack')) {
             return;

DependencyInjection/Configuration.php

@@ -24,9 +24,6 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('fos_oauth_server');

DependencyInjection/FOSOAuthServerExtension.php

@@ -24,10 +24,7 @@
 
 class FOSOAuthServerExtension extends Extension
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $processor = new Processor();
         $configuration = new Configuration();
@@ -101,9 +98,6 @@ public function load(array $configs, ContainerBuilder $container)
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getAlias(): string
     {
         return 'fos_oauth_server';

DependencyInjection/Security/Factory/OAuthFactory.php

@@ -26,9 +26,6 @@
  */
 class OAuthFactory implements AuthenticatorFactoryInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function createAuthenticator(ContainerBuilder $container, string $id, array $config, string $userProviderId): array|string
     {
         $providerId = 'fos_oauth_server.security.authentication.authenticator.'.$id;
@@ -42,9 +39,6 @@ public function createAuthenticator(ContainerBuilder $container, string $id, arr
         return $providerId;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint): array
     {
         $providerId = 'security.authentication.provider.fos_oauth_server.'.$id;
@@ -60,34 +54,22 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         return [$providerId, $listenerId, 'fos_oauth_server.security.entry_point'];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPosition(): string
     {
         return 'pre_auth';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority(): int
     {
         return 0;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getKey(): string
     {
         return 'fos_oauth';
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
     }
 }

Document/AuthCodeManager.php

@@ -46,43 +46,28 @@ public function __construct(DocumentManager $dm, $class)
         $this->class = $class;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getClass()
     {
         return $this->class;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function findAuthCodeBy(array $criteria)
     {
         return $this->repository->findOneBy($criteria);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function updateAuthCode(AuthCodeInterface $authCode)
     {
         $this->dm->persist($authCode);
         $this->dm->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function deleteAuthCode(AuthCodeInterface $authCode)
     {
         $this->dm->remove($authCode);
         $this->dm->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function deleteExpired()
     {
         $result = $this

Document/ClientManager.php

@@ -46,34 +46,22 @@ public function __construct(DocumentManager $dm, $class)
         $this->class = $class;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getClass()
     {
         return $this->class;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function findClientBy(array $criteria)
     {
         return $this->repository->findOneBy($criteria);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function updateClient(ClientInterface $client)
     {
         $this->dm->persist($client);
         $this->dm->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function deleteClient(ClientInterface $client)
     {
         $this->dm->remove($client);

Document/TokenManager.php

@@ -46,43 +46,28 @@ public function __construct(DocumentManager $dm, $class)
         $this->class = $class;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getClass()
     {
         return $this->class;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function findTokenBy(array $criteria)
     {
         return $this->repository->findOneBy($criteria);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function updateToken(TokenInterface $token)
     {
         $this->dm->persist($token);
         $this->dm->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function deleteToken(TokenInterface $token)
     {
         $this->dm->remove($token);
         $this->dm->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function deleteExpired()
     {
         $result = $this

Entity/AuthCodeManager.php

@@ -38,43 +38,28 @@ public function __construct(EntityManagerInterface $em, $class)
         $this->class = $class;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getClass()
     {
         return $this->class;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function findAuthCodeBy(array $criteria)
     {
         return $this->em->getRepository($this->class)->findOneBy($criteria);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function updateAuthCode(AuthCodeInterface $authCode)
     {
         $this->em->persist($authCode);
         $this->em->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function deleteAuthCode(AuthCodeInterface $authCode)
     {
         $this->em->remove($authCode);
         $this->em->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function deleteExpired()
     {
         /** @var \Doctrine\ORM\EntityRepository $repository */