Symfony 4.4.* / 5.0.*

.gitignore

@@ -1,7 +1,10 @@
+phpstan.neon
 phpunit.xml
 Tests/autoload.php
+var/
 vendor/
 Propel/om/
 Propel/map/
 composer.lock
 .php_cs.cache
+.phpunit.result.cache

.travis.yml

@@ -2,7 +2,6 @@ language: php
 
 sudo: true
 php:
-  - 7.1
   - 7.2
 
 service:
@@ -12,12 +11,18 @@ service:
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
-      env: SYMFONY_VERSION=3.4.*
     - php: 7.2
-      env: SYMFONY_VERSION=4.0.*
+      env: SYMFONY_VERSION=4.4.*
     - php: 7.2
-      env: SYMFONY_VERSION=4.0.* DEPENDENCIES=beta
+      env: SYMFONY_VERSION=5.0.*
+    - php: 7.3
+      env: SYMFONY_VERSION=4.4.*
+    - php: 7.3
+      env: SYMFONY_VERSION=5.0.*
+    - php: 7.4
+      env: SYMFONY_VERSION=4.4.*
+    - php: 7.4
+      env: SYMFONY_VERSION=5.0.*
 
 cache:
   directories:

Command/CleanCommand.php

@@ -21,15 +21,20 @@
 
 class CleanCommand extends Command
 {
+    /** @var TokenManagerInterface */
     private $accessTokenManager;
+
+    /** @var TokenManagerInterface */
     private $refreshTokenManager;
+
+    /** @var AuthCodeManagerInterface */
     private $authCodeManager;
 
     public function __construct(
         TokenManagerInterface $accessTokenManager,
         TokenManagerInterface $refreshTokenManager,
-        AuthCodeManagerInterface $authCodeManager)
-    {
+        AuthCodeManagerInterface $authCodeManager
+    ) {
         parent::__construct();
 
         $this->accessTokenManager = $accessTokenManager;
@@ -40,7 +45,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -63,7 +68,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         foreach ([$this->accessTokenManager, $this->refreshTokenManager, $this->authCodeManager] as $service) {
             $result = $service->deleteExpired();
-            $output->writeln(sprintf('Removed <info>%d</info> items from <comment>%s</comment> storage.', $result, get_class($service)));
+            $output->writeln(
+                sprintf(
+                    'Removed <info>%d</info> items from <comment>%s</comment> storage.',
+                    $result,
+                    get_class($service)
+                )
+            );
         }
+
+        return 0;
     }
 }

Command/CreateClientCommand.php

@@ -22,6 +22,7 @@
 
 class CreateClientCommand extends Command
 {
+    /** @var ClientManagerInterface */
     private $clientManager;
 
     public function __construct(ClientManagerInterface $clientManager)
@@ -34,7 +35,7 @@ public function __construct(ClientManagerInterface $clientManager)
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 

Controller/AuthorizeController.php

@@ -19,7 +19,7 @@
 use FOS\OAuthServerBundle\Model\ClientManagerInterface;
 use OAuth2\OAuth2;
 use OAuth2\OAuth2ServerException;
-use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
+use RuntimeException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
@@ -31,6 +31,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Twig\Environment;
 
 /**
  * Controller handling basic authorization.
@@ -65,9 +66,9 @@ class AuthorizeController
     private $oAuth2Server;
 
     /**
-     * @var EngineInterface
+     * @var Environment
      */
-    private $templating;
+    private $twig;
 
     /**
      * @var RequestStack
@@ -89,11 +90,6 @@ class AuthorizeController
      */
     private $clientManager;
 
-    /**
-     * @var string
-     */
-    private $templateEngineType;
-
     /**
      * @var EventDispatcherInterface
      */
@@ -105,47 +101,32 @@ class AuthorizeController
      *
      * @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 EngineInterface          $templating
-     * @param TokenStorageInterface    $tokenStorage
-     * @param UrlGeneratorInterface    $router
-     * @param ClientManagerInterface   $clientManager
-     * @param EventDispatcherInterface $eventDispatcher
-     * @param SessionInterface         $session
-     * @param string                   $templateEngineType
+     * @param SessionInterface $session
      */
     public function __construct(
         RequestStack $requestStack,
         Form $authorizeForm,
         AuthorizeFormHandler $authorizeFormHandler,
         OAuth2 $oAuth2Server,
-        EngineInterface $templating,
+        Environment $twig,
         TokenStorageInterface $tokenStorage,
         UrlGeneratorInterface $router,
         ClientManagerInterface $clientManager,
         EventDispatcherInterface $eventDispatcher,
-        SessionInterface $session = null,
-        $templateEngineType = 'twig'
+        SessionInterface $session = null
     ) {
         $this->requestStack = $requestStack;
         $this->session = $session;
         $this->authorizeForm = $authorizeForm;
         $this->authorizeFormHandler = $authorizeFormHandler;
         $this->oAuth2Server = $oAuth2Server;
-        $this->templating = $templating;
+        $this->twig = $twig;
         $this->tokenStorage = $tokenStorage;
         $this->router = $router;
         $this->clientManager = $clientManager;
-        $this->templateEngineType = $templateEngineType;
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    /**
-     * Authorize.
-     */
     public function authorizeAction(Request $request)
     {
         $user = $this->tokenStorage->getToken()->getUser();
@@ -164,8 +145,11 @@ public function authorizeAction(Request $request)
 
         /** @var OAuthEvent $event */
         $event = $this->eventDispatcher->dispatch(
-            OAuthEvent::PRE_AUTHORIZATION_PROCESS,
-            new OAuthEvent($user, $this->getClient())
+            new OAuthEvent(
+                $user,
+                $this->getClient()
+            ),
+            OAuthEvent::PRE_AUTHORIZATION_PROCESS
         );
 
         if ($event->isAuthorizedClient()) {
@@ -183,26 +167,25 @@ public function authorizeAction(Request $request)
             'client' => $this->getClient(),
         ];
 
-        return $this->renderAuthorize($data, $this->templating, $this->templateEngineType);
+        return new Response(
+            $this->twig->render('@FOSOAuthServer/Authorize/authorize.html.twig', $data),
+            Response::HTTP_OK
+        );
     }
 
-    /**
-     * @param UserInterface        $user
-     * @param AuthorizeFormHandler $formHandler
-     * @param Request              $request
-     *
-     * @return Response
-     */
-    protected function processSuccess(UserInterface $user, AuthorizeFormHandler $formHandler, Request $request)
-    {
+    protected function processSuccess(
+        UserInterface $user,
+        AuthorizeFormHandler $formHandler,
+        Request $request
+    ): ?Response {
         if ($this->session && true === $this->session->get('_fos_oauth_server.ensure_logout')) {
             $this->tokenStorage->setToken(null);
             $this->session->invalidate();
         }
 
         $this->eventDispatcher->dispatch(
-            OAuthEvent::POST_AUTHORIZATION_PROCESS,
-            new OAuthEvent($user, $this->getClient(), $formHandler->isAccepted())
+            new OAuthEvent($user, $this->getClient(), $formHandler->isAccepted()),
+            OAuthEvent::POST_AUTHORIZATION_PROCESS
         );
 
         $formName = $this->authorizeForm->getName();
@@ -221,20 +204,13 @@ 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()
+    protected function getClient(): ClientInterface
     {
         if (null !== $this->client) {
             return $this->client;
@@ -246,7 +222,7 @@ protected function getClient()
 
         if (null === $clientId = $request->get('client_id')) {
             $formData = $request->get($this->authorizeForm->getName(), []);
-            $clientId = isset($formData['client_id']) ? $formData['client_id'] : null;
+            $clientId = $formData['client_id'] ?? null;
         }
 
         $this->client = $this->clientManager->findClientByPublicId($clientId);
@@ -258,25 +234,11 @@ protected function getClient()
         return $this->client;
     }
 
-    /**
-     * @throws \RuntimeException
-     */
-    protected function renderAuthorize(array $data, EngineInterface $engine, string $engineType): Response
-    {
-        return $engine->renderResponse(
-            '@FOSOAuthServer/Authorize/authorize.html.'.$engineType,
-            $data
-        );
-    }
-
-    /**
-     * @return null|Request
-     */
-    private function getCurrentRequest()
+    private function getCurrentRequest(): ?Request
     {
         $request = $this->requestStack->getCurrentRequest();
         if (null === $request) {
-            throw new \RuntimeException('No current request.');
+            throw new RuntimeException('No current request.');
         }
 
         return $request;

Controller/TokenController.php

@@ -25,17 +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)

DependencyInjection/Compiler/GrantExtensionsCompilerPass.php

@@ -13,6 +13,8 @@
 
 namespace FOS\OAuthServerBundle\DependencyInjection\Compiler;
 
+use FOS\OAuthServerBundle\Storage\GrantExtensionDispatcherInterface;
+use ReflectionClass;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
@@ -23,12 +25,12 @@
  */
 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());
-        $storageClass = new \ReflectionClass($className);
-        if (!$storageClass->implementsInterface('FOS\OAuthServerBundle\Storage\GrantExtensionDispatcherInterface')) {
+        $storageClass = new ReflectionClass($className);
+        if (!$storageClass->implementsInterface(GrantExtensionDispatcherInterface::class)) {
             return;
         }
 

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;