Merge remote-tracking branch 'origin/3.0' into 3.0

# Conflicts: # Security/Authenticator/Oauth2Authenticator.php
klapaudius · Jul 17, 2021 · 082c365 · 082c365
2 parents 565d05f + 87615ae
commit 082c365
Show file tree

Hide file tree

Showing 58 changed files with 381 additions and 504 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,14 +14,6 @@ service:
 matrix:
   fast_finish: true
   include:
-    - php: 7.2
-      env: SYMFONY_VERSION=4.4.*
-    - php: 7.3
-      env: SYMFONY_VERSION=4.4.*
-    - php: 7.4
-      env: SYMFONY_VERSION=4.4.*
-    - php: 8.0
-      env: SYMFONY_VERSION=4.4.*
     - php: 7.2
       env: SYMFONY_VERSION=5.3.*
     - php: 7.3

diff --git a/Controller/AuthorizeController.php b/Controller/AuthorizeController.php
@@ -97,16 +97,6 @@ class AuthorizeController
      * Thus, this is considered a bad practice to fetch services directly from container.
      *
      * @todo This controller could be refactored to not rely on so many dependencies
-     *
-     * @param RequestStack             $requestStack
-     * @param Form                     $authorizeForm
-     * @param AuthorizeFormHandler     $authorizeFormHandler
-     * @param OAuth2                   $oAuth2Server
-     * @param Environment              $twig
-     * @param TokenStorageInterface    $tokenStorage
-     * @param UrlGeneratorInterface    $router
-     * @param ClientManagerInterface   $clientManager
-     * @param EventDispatcherInterface $eventDispatcher
      */
     public function __construct(
         RequestStack $requestStack,
@@ -132,8 +122,7 @@ public function __construct(
 
     /**
      * Authorize.
-     * @param Request $request
-     * @return Response
+     *
      * @throws OAuth2RedirectException
      */
     public function authorizeAction(Request $request): Response
@@ -144,7 +133,7 @@ public function authorizeAction(Request $request): Response
             throw new AccessDeniedException('This user does not have access to this section.');
         }
 
-        if ( ! empty( $request->getSession() ) && true === $request->getSession()->get('_fos_oauth_server.ensure_logout')) {
+        if (!empty($request->getSession()) && true === $request->getSession()->get('_fos_oauth_server.ensure_logout')) {
             $request->getSession()->invalidate(600);
             $request->getSession()->set('_fos_oauth_server.ensure_logout', true);
         }
@@ -176,16 +165,9 @@ public function authorizeAction(Request $request): Response
         return $this->renderAuthorize($data);
     }
 
-    /**
-     * @param UserInterface        $user
-     * @param AuthorizeFormHandler $formHandler
-     * @param Request              $request
-     *
-     * @return Response
-     */
     protected function processSuccess(UserInterface $user, AuthorizeFormHandler $formHandler, Request $request): Response
     {
-        if ( ! empty( $request->getSession() ) && true === $request->getSession()->get('_fos_oauth_server.ensure_logout')) {
+        if (!empty($request->getSession()) && true === $request->getSession()->get('_fos_oauth_server.ensure_logout')) {
             $this->tokenStorage->setToken(null);
             $request->getSession()->invalidate();
         }
@@ -211,28 +193,19 @@ protected function processSuccess(UserInterface $user, AuthorizeFormHandler $for
 
     /**
      * Generate the redirection url when the authorize is completed.
-     *
-     * @param UserInterface $user
-     *
-     * @return string
      */
-    protected function getRedirectionUrl(UserInterface $user)
+    protected function getRedirectionUrl(UserInterface $user): string
     {
         return $this->router->generate('fos_oauth_server_profile_show');
     }
 
-    /**
-     * @return ClientInterface
-     */
     protected function getClient(): ClientInterface
     {
         if (null !== $this->client) {
             return $this->client;
         }
 
-        if (null === $request = $this->getCurrentRequest()) {
-            throw new NotFoundHttpException('Client not found.');
-        }
+        $request = $this->getCurrentRequest();
 
         if (null === $clientId = $request->get('client_id')) {
             $formData = $request->get($this->authorizeForm->getName(), []);
@@ -249,8 +222,7 @@ protected function getClient(): ClientInterface
     }
 
     /**
-     * @param array $data
-     * @return Response
+     * @param array<string , mixed> $data Various data to be passed to the twig template
      * @throws LoaderError
      * @throws RuntimeError
      * @throws SyntaxError
@@ -262,13 +234,10 @@ protected function renderAuthorize(array $data): Response
             $data
         );
 
-        return $response instanceof Response ? $response : new Response($response);
+        return new Response($response);
     }
 
-    /**
-     * @return Request|null
-     */
-    private function getCurrentRequest()
+    private function getCurrentRequest(): Request
     {
         $request = $this->requestStack->getCurrentRequest();
         if (null === $request) {

diff --git a/Controller/TokenController.php b/Controller/TokenController.php
@@ -25,20 +25,12 @@ class TokenController
      */
     protected $server;
 
-    /**
-     * @param OAuth2 $server
-     */
     public function __construct(OAuth2 $server)
     {
         $this->server = $server;
     }
 
-    /**
-     * @param Request $request
-     *
-     * @return Response
-     */
-    public function tokenAction(Request $request)
+    public function tokenAction(Request $request): Response
     {
         try {
             return $this->server->grantAccessToken($request);

diff --git a/DependencyInjection/Compiler/GrantExtensionsCompilerPass.php b/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());

diff --git a/DependencyInjection/Compiler/RequestStackCompilerPass.php b/DependencyInjection/Compiler/RequestStackCompilerPass.php
@@ -27,7 +27,7 @@ final class RequestStackCompilerPass implements CompilerPassInterface
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if ($container->has('request_stack')) {
             return;

diff --git a/DependencyInjection/Compiler/TokenStorageCompilerPass.php b/DependencyInjection/Compiler/TokenStorageCompilerPass.php
@@ -25,7 +25,7 @@ class TokenStorageCompilerPass implements CompilerPassInterface
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $definition = $container->getDefinition('fos_oauth_server.security.authentication.listener');
 

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -27,7 +27,7 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         /** @var ArrayNodeDefinition $rootNode */
         $treeBuilder = new TreeBuilder('fos_oauth_server');

diff --git a/Document/AuthCodeManager.php b/Document/AuthCodeManager.php
@@ -49,15 +49,15 @@ public function __construct(DocumentManager $dm, $class)
     /**
      * {@inheritdoc}
      */
-    public function getClass()
+    public function getClass(): string
     {
         return $this->class;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function findAuthCodeBy(array $criteria)
+    public function findAuthCodeBy(array $criteria): ?AuthCodeInterface
     {
         return $this->repository->findOneBy($criteria);
     }
@@ -83,7 +83,7 @@ public function deleteAuthCode(AuthCodeInterface $authCode)
     /**
      * {@inheritdoc}
      */
-    public function deleteExpired()
+    public function deleteExpired(): int
     {
         $result = $this
             ->repository

diff --git a/Document/ClientManager.php b/Document/ClientManager.php
@@ -49,15 +49,15 @@ public function __construct(DocumentManager $dm, $class)
     /**
      * {@inheritdoc}
      */
-    public function getClass()
+    public function getClass(): string
     {
         return $this->class;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function findClientBy(array $criteria)
+    public function findClientBy(array $criteria): ?ClientInterface
     {
         return $this->repository->findOneBy($criteria);
     }

diff --git a/Document/TokenManager.php b/Document/TokenManager.php
@@ -49,15 +49,15 @@ public function __construct(DocumentManager $dm, $class)
     /**
      * {@inheritdoc}
      */
-    public function getClass()
+    public function getClass(): string
     {
         return $this->class;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function findTokenBy(array $criteria)
+    public function findTokenBy(array $criteria): ?TokenInterface
     {
         return $this->repository->findOneBy($criteria);
     }
@@ -83,7 +83,7 @@ public function deleteToken(TokenInterface $token)
     /**
      * {@inheritdoc}
      */
-    public function deleteExpired()
+    public function deleteExpired(): int
     {
         $result = $this
             ->repository

diff --git a/Entity/AuthCodeManager.php b/Entity/AuthCodeManager.php
@@ -29,11 +29,7 @@ class AuthCodeManager extends BaseAuthCodeManager
      */
     protected $class;
 
-    /**
-     * @param EntityManagerInterface $em
-     * @param string                 $class
-     */
-    public function __construct(EntityManagerInterface $em, $class)
+    public function __construct(EntityManagerInterface $em, string $class)
     {
         $this->em = $em;
         $this->class = $class;
@@ -42,15 +38,15 @@ public function __construct(EntityManagerInterface $em, $class)
     /**
      * {@inheritdoc}
      */
-    public function getClass()
+    public function getClass(): string
     {
         return $this->class;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function findAuthCodeBy(array $criteria)
+    public function findAuthCodeBy(array $criteria): ?AuthCodeInterface
     {
         return $this->em->getRepository($this->class)->findOneBy($criteria);
     }
@@ -76,7 +72,7 @@ public function deleteAuthCode(AuthCodeInterface $authCode)
     /**
      * {@inheritdoc}
      */
-    public function deleteExpired()
+    public function deleteExpired(): int
     {
         /** @var \Doctrine\ORM\EntityRepository $repository */
         $repository = $this->em->getRepository($this->class);

diff --git a/Entity/ClientManager.php b/Entity/ClientManager.php
@@ -49,15 +49,15 @@ public function __construct(EntityManagerInterface $em, $class)
     /**
      * {@inheritdoc}
      */
-    public function getClass()
+    public function getClass(): string
     {
         return $this->class;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function findClientBy(array $criteria)
+    public function findClientBy(array $criteria): ?ClientInterface
     {
         return $this->repository->findOneBy($criteria);
     }

diff --git a/Entity/TokenManager.php b/Entity/TokenManager.php
@@ -49,15 +49,15 @@ public function __construct(EntityManagerInterface $em, $class)
     /**
      * {@inheritdoc}
      */
-    public function getClass()
+    public function getClass(): string
     {
         return $this->class;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function findTokenBy(array $criteria)
+    public function findTokenBy(array $criteria): ?TokenInterface
     {
         return $this->repository->findOneBy($criteria);
     }
@@ -83,7 +83,7 @@ public function deleteToken(TokenInterface $token)
     /**
      * {@inheritdoc}
      */
-    public function deleteExpired()
+    public function deleteExpired(): int
     {
         $qb = $this->repository->createQueryBuilder('t');
         $qb

diff --git a/Event/OAuthEvent.php b/Event/OAuthEvent.php
@@ -40,9 +40,6 @@ class OAuthEvent extends Event
 
     /**
      * OAuthEvent constructor.
-     * @param UserInterface $user
-     * @param ClientInterface $client
-     * @param bool $isAuthorizedClient
      */
     public function __construct(UserInterface $user, ClientInterface $client, bool $isAuthorizedClient = false)
     {

diff --git a/Form/Handler/AuthorizeFormHandler.php b/Form/Handler/AuthorizeFormHandler.php
@@ -40,7 +40,6 @@ class AuthorizeFormHandler
     private $requestStack;
 
     /**
-     * @param FormInterface        $form
      * @param Request|RequestStack $requestStack
      */
     public function __construct(FormInterface $form, $requestStack = null)
@@ -94,7 +93,7 @@ public function process()
         }
 
         $this->form->handleRequest($request);
-        if ($this->form->isSubmitted() && ! $this->form->isValid()) {
+        if ($this->form->isSubmitted() && !$this->form->isValid()) {
             return false;
         }
 

diff --git a/Form/Model/Authorize.php b/Form/Model/Authorize.php
@@ -48,10 +48,6 @@ class Authorize
      */
     public $scope;
 
-    /**
-     * @param bool  $accepted
-     * @param array $query
-     */
     public function __construct(bool $accepted, array $query = [])
     {
         foreach ($query as $key => $value) {

diff --git a/Model/AuthCodeManager.php b/Model/AuthCodeManager.php
@@ -18,7 +18,7 @@ abstract class AuthCodeManager implements AuthCodeManagerInterface
     /**
      * {@inheritdoc}
      */
-    public function createAuthCode()
+    public function createAuthCode(): AuthCodeInterface
     {
         $class = $this->getClass();
 
@@ -28,7 +28,7 @@ public function createAuthCode()
     /**
      * {@inheritdoc}
      */
-    public function findAuthCodeByToken($token)
+    public function findAuthCodeByToken(string $token): ?AuthCodeInterface
     {
         return $this->findAuthCodeBy(['token' => $token]);
     }