~ changes to fix error message: Cannot mock Symfony\Component\Routing\Router::addExpressionLanguageProvider() because a class or interface used in the signature is not loaded

Author: dinamic

Controller/AuthorizeController.php

@@ -27,7 +27,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Routing\Router;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -85,7 +85,7 @@ class AuthorizeController implements ContainerAwareInterface
     private $tokenStorage;
 
     /**
-     * @var Router
+     * @var UrlGeneratorInterface
      */
     private $router;
 
@@ -126,7 +126,7 @@ public function setContainer(ContainerInterface $container = null)
      * @param OAuth2                 $oAuth2Server
      * @param EngineInterface        $templating
      * @param TokenStorageInterface  $tokenStorage
-     * @param Router                 $router
+     * @param UrlGeneratorInterface  $router
      * @param ClientManagerInterface $clientManager
      * @param EventDispatcher        $eventDispatcher
      * @param string                 $templateEngineType
@@ -139,7 +139,7 @@ public function __construct(
         OAuth2 $oAuth2Server,
         EngineInterface $templating,
         TokenStorageInterface $tokenStorage,
-        Router $router,
+        UrlGeneratorInterface $router,
         ClientManagerInterface $clientManager,
         EventDispatcher $eventDispatcher,
         $templateEngineType = 'twig'
@@ -259,7 +259,7 @@ protected function getClient()
 
         if (null === $clientId = $request->get('client_id')) {
             $formData = $request->get($this->authorizeForm->getName(), []);
-            $clientId = $formData['client_id'] ?? null;
+            $clientId = isset($formData['client_id']) ? $formData['client_id'] : null;
         }
 
         $this->client = $this->clientManager->findClientByPublicId($clientId);

Tests/Controller/AuthorizeControllerTest.php

@@ -16,7 +16,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Symfony\Component\Routing\Router;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -61,7 +61,7 @@ class AuthorizeControllerTest extends \PHPUnit_Framework_TestCase
     protected $tokenStorage;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Router
+     * @var \PHPUnit_Framework_MockObject_MockObject|UrlGeneratorInterface
      */
     protected $router;
 
@@ -119,7 +119,7 @@ public function setUp()
         $this->oAuth2Server = $this->createMock(OAuth2::class);
         $this->templateEngine = $this->createMock(EngineInterface::class);
         $this->tokenStorage = $this->createMock(TokenStorageInterface::class);
-        $this->router = $this->createMock(Router::class);
+        $this->router = $this->createMock(UrlGeneratorInterface::class);
         $this->clientManager = $this->createMock(ClientManagerInterface::class);
         $this->eventDispatcher = $this->createMock(EventDispatcher::class);
         $this->templateEngineType = 'twig';