Make tests compatible with PHPUnit 8

Tests/Command/CleanCommandTest.php

@@ -27,17 +27,17 @@ class CleanCommandTest extends \PHPUnit\Framework\TestCase
     private $command;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|TokenManagerInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|TokenManagerInterface
      */
     private $accessTokenManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|TokenManagerInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|TokenManagerInterface
      */
     private $refreshTokenManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|AuthCodeManagerInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|AuthCodeManagerInterface
      */
     private $authCodeManager;
 
@@ -64,7 +64,7 @@ protected function setUp(): void
     /**
      * Delete expired tokens for provided classes.
      */
-    public function testItShouldRemoveExpiredToken()
+    public function testItShouldRemoveExpiredToken(): void
     {
         $expiredAccessTokens = 5;
         $this->accessTokenManager
@@ -100,7 +100,7 @@ public function testItShouldRemoveExpiredToken()
     /**
      * Skip classes for deleting expired tokens that do not implement AuthCodeManagerInterface or TokenManagerInterface.
      */
-    public function testItShouldNotRemoveExpiredTokensForOtherClasses()
+    public function testItShouldNotRemoveExpiredTokensForOtherClasses(): void
     {
         $this->markTestIncomplete('Needs a better way of testing this');
 

Tests/Command/CreateClientCommandTest.php

@@ -27,7 +27,7 @@ class CreateClientCommandTest extends TestCase
     private $command;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ClientManagerInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|ClientManagerInterface
      */
     private $clientManager;
 
@@ -53,7 +53,7 @@ protected function setUp(): void
      *
      * @param string $client a fully qualified class name
      */
-    public function testItShouldCreateClient($client)
+    public function testItShouldCreateClient($client): void
     {
         $this
             ->clientManager

Tests/Controller/AuthorizeControllerTest.php

@@ -38,52 +38,52 @@
 class AuthorizeControllerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|RequestStack
+     * @var \PHPUnit\Framework\MockObject\MockObject|RequestStack
      */
     protected $requestStack;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|SessionInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|SessionInterface
      */
     protected $session;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Form
+     * @var \PHPUnit\Framework\MockObject\MockObject|Form
      */
     protected $form;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|AuthorizeFormHandler
+     * @var \PHPUnit\Framework\MockObject\MockObject|AuthorizeFormHandler
      */
     protected $authorizeFormHandler;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|OAuth2
+     * @var \PHPUnit\Framework\MockObject\MockObject|OAuth2
      */
     protected $oAuth2Server;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|TokenStorageInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|TokenStorageInterface
      */
     protected $tokenStorage;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|TwigEnvironment
+     * @var \PHPUnit\Framework\MockObject\MockObject|TwigEnvironment
      */
     protected $twig;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|UrlGeneratorInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|UrlGeneratorInterface
      */
     protected $router;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ClientManagerInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|ClientManagerInterface
      */
     protected $clientManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|EventDispatcherInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|EventDispatcherInterface
      */
     protected $eventDispatcher;
 
@@ -93,46 +93,46 @@ class AuthorizeControllerTest extends \PHPUnit\Framework\TestCase
     protected $instance;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Request
+     * @var \PHPUnit\Framework\MockObject\MockObject|Request
      */
     protected $request;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ParameterBag
+     * @var \PHPUnit\Framework\MockObject\MockObject|ParameterBag
      */
     protected $requestQuery;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ParameterBag
+     * @var \PHPUnit\Framework\MockObject\MockObject|ParameterBag
      */
     protected $requestRequest;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|UserInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|UserInterface
      */
     protected $user;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ClientInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|ClientInterface
      */
     protected $client;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|PreAuthorizationEvent
+     * @var \PHPUnit\Framework\MockObject\MockObject|PreAuthorizationEvent
      */
     protected $preAuthorizationEvent;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|PostAuthorizationEvent
+     * @var \PHPUnit\Framework\MockObject\MockObject|PostAuthorizationEvent
      */
     protected $postAuthorizationEvent;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|FormView
+     * @var \PHPUnit\Framework\MockObject\MockObject|FormView
      */
     protected $formView;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->requestStack = $this->getMockBuilder(RequestStack::class)
             ->disableOriginalConstructor()
@@ -188,7 +188,7 @@ public function setUp()
             $this->session
         );
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject&Request $request */
+        /** @var \PHPUnit\Framework\MockObject\MockObject&Request $request */
         $request = $this->getMockBuilder(Request::class)
             ->disableOriginalConstructor()
             ->getMock()
@@ -228,7 +228,7 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testAuthorizeActionWillThrowAccessDeniedException()
+    public function testAuthorizeActionWillThrowAccessDeniedException(): void
     {
         $token = $this->getMockBuilder(TokenInterface::class)
             ->disableOriginalConstructor()
@@ -253,7 +253,7 @@ public function testAuthorizeActionWillThrowAccessDeniedException()
         $this->instance->authorizeAction($this->request);
     }
 
-    public function testAuthorizeActionWillRenderTemplate()
+    public function testAuthorizeActionWillRenderTemplate(): void
     {
         $token = $this->getMockBuilder(TokenInterface::class)
             ->disableOriginalConstructor()
@@ -325,7 +325,7 @@ public function testAuthorizeActionWillRenderTemplate()
         $this->assertSame($responseBody, $this->instance->authorizeAction($this->request)->getContent());
     }
 
-    public function testAuthorizeActionWillFinishClientAuthorization()
+    public function testAuthorizeActionWillFinishClientAuthorization(): void
     {
         $token = $this->getMockBuilder(TokenInterface::class)
             ->disableOriginalConstructor()
@@ -394,7 +394,7 @@ public function testAuthorizeActionWillFinishClientAuthorization()
         $this->assertSame($response, $this->instance->authorizeAction($this->request));
     }
 
-    public function testAuthorizeActionWillEnsureLogout()
+    public function testAuthorizeActionWillEnsureLogout(): void
     {
         $token = $this->getMockBuilder(TokenInterface::class)
             ->disableOriginalConstructor()
@@ -480,7 +480,7 @@ public function testAuthorizeActionWillEnsureLogout()
         $this->assertSame($responseBody, $this->instance->authorizeAction($this->request)->getContent());
     }
 
-    public function testAuthorizeActionWillProcessAuthorizationForm()
+    public function testAuthorizeActionWillProcessAuthorizationForm(): void
     {
         $token = $this->getMockBuilder(TokenInterface::class)
             ->disableOriginalConstructor()

Tests/DependencyInjection/Compiler/GrantExtensionsCompilerPassTest.php

@@ -33,14 +33,14 @@ class GrantExtensionsCompilerPassTest extends \PHPUnit\Framework\TestCase
      */
     protected $instance;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->instance = new GrantExtensionsCompilerPass();
 
         parent::setUp();
     }
 
-    public function testProcessWillNotDoAnythingIfTheStorageDoesNotImplementOurInterface()
+    public function testProcessWillNotDoAnythingIfTheStorageDoesNotImplementOurInterface(): void
     {
         $container = $this->getMockBuilder(ContainerBuilder::class)
             ->disableOriginalConstructor()
@@ -93,7 +93,7 @@ public function testProcessWillNotDoAnythingIfTheStorageDoesNotImplementOurInter
         $this->assertNull($this->instance->process($container));
     }
 
-    public function testProcessWillFailIfUriIsEmpty()
+    public function testProcessWillFailIfUriIsEmpty(): void
     {
         $container = $this->getMockBuilder(ContainerBuilder::class)
             ->disableOriginalConstructor()
@@ -197,7 +197,7 @@ public function testProcessWillFailIfUriIsEmpty()
         $this->assertNull($this->instance->process($container));
     }
 
-    public function testProcess()
+    public function testProcess(): void
     {
         $container = $this->getMockBuilder(ContainerBuilder::class)
             ->disableOriginalConstructor()

Tests/DependencyInjection/Compiler/RequestStackCompilerPassTest.php

@@ -31,11 +31,11 @@ class RequestStackCompilerPassTest extends \PHPUnit\Framework\TestCase
     protected $instance;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ContainerBuilder
+     * @var \PHPUnit\Framework\MockObject\MockObject|ContainerBuilder
      */
     protected $container;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->container = $this->getMockBuilder(ContainerBuilder::class)
             ->disableOriginalConstructor()
@@ -51,7 +51,7 @@ public function setUp()
         parent::setUp();
     }
 
-    public function testProcessWithoutRequestStackDoesNothing()
+    public function testProcessWithoutRequestStackDoesNothing(): void
     {
         $this->container
             ->expects($this->once())
@@ -63,7 +63,7 @@ public function testProcessWithoutRequestStackDoesNothing()
         $this->assertNull($this->instance->process($this->container));
     }
 
-    public function testProcess()
+    public function testProcess(): void
     {
         $this->container
             ->expects($this->once())

Tests/DependencyInjection/ConfigurationTest.php

@@ -20,14 +20,14 @@
 
 class ConfigurationTest extends \PHPUnit\Framework\TestCase
 {
-    public function testShouldImplementConfigurationInterface()
+    public function testShouldImplementConfigurationInterface(): void
     {
         $rc = new \ReflectionClass(Configuration::class);
 
         $this->assertTrue($rc->implementsInterface(ConfigurationInterface::class));
     }
 
-    public function testCouldBeConstructedWithoutAnyArguments()
+    public function testCouldBeConstructedWithoutAnyArguments(): void
     {
         try {
             new Configuration();
@@ -39,7 +39,7 @@ public function testCouldBeConstructedWithoutAnyArguments()
         }
     }
 
-    public function testShouldNotMandatoryServiceIfNotCustomDriverIsUsed()
+    public function testShouldNotMandatoryServiceIfNotCustomDriverIsUsed(): void
     {
         $configuration = new Configuration();
         $processor = new Processor();
@@ -69,7 +69,7 @@ public function testShouldNotMandatoryServiceIfNotCustomDriverIsUsed()
         ], $config);
     }
 
-    public function testShouldMakeClientManagerServiceMandatoryIfCustomDriverIsUsed()
+    public function testShouldMakeClientManagerServiceMandatoryIfCustomDriverIsUsed(): void
     {
         $configuration = new Configuration();
         $processor = new Processor();
@@ -86,7 +86,7 @@ public function testShouldMakeClientManagerServiceMandatoryIfCustomDriverIsUsed(
         ]]);
     }
 
-    public function testShouldMakeAccessTokenManagerServiceMandatoryIfCustomDriverIsUsed()
+    public function testShouldMakeAccessTokenManagerServiceMandatoryIfCustomDriverIsUsed(): void
     {
         $configuration = new Configuration();
         $processor = new Processor();
@@ -106,7 +106,7 @@ public function testShouldMakeAccessTokenManagerServiceMandatoryIfCustomDriverIs
         ]]);
     }
 
-    public function testShouldMakeRefreshTokenManagerServiceMandatoryIfCustomDriverIsUsed()
+    public function testShouldMakeRefreshTokenManagerServiceMandatoryIfCustomDriverIsUsed(): void
     {
         $configuration = new Configuration();
         $processor = new Processor();
@@ -127,7 +127,7 @@ public function testShouldMakeRefreshTokenManagerServiceMandatoryIfCustomDriverI
         ]]);
     }
 
-    public function testShouldMakeAuthCodeManagerServiceMandatoryIfCustomDriverIsUsed()
+    public function testShouldMakeAuthCodeManagerServiceMandatoryIfCustomDriverIsUsed(): void
     {
         $configuration = new Configuration();
         $processor = new Processor();
@@ -149,7 +149,7 @@ public function testShouldMakeAuthCodeManagerServiceMandatoryIfCustomDriverIsUse
         ]]);
     }
 
-    public function testShouldLoadCustomDriverConfig()
+    public function testShouldLoadCustomDriverConfig(): void
     {
         $configuration = new Configuration();
         $processor = new Processor();