Fix some tests (work in progress)

klapaudius · Oct 9, 2024 · 8286352 · 8286352
1 parent 3cfb456
commit 8286352
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/Tests/Controller/AuthorizeControllerTest.php b/Tests/Controller/AuthorizeControllerTest.php
@@ -114,8 +114,7 @@ public function setUp(): void
             $this->eventDispatcher
         );
 
-        /** @var MockObject&Request $request */
-        $request = $this->getMockBuilder(Request::class)
+        $this->request = $this->getMockBuilder(Request::class)
             ->disableOriginalConstructor()
             ->getMock()
         ;
@@ -127,9 +126,6 @@ public function setUp(): void
             ->disableOriginalConstructor()
             ->getMock()
         ;
-        $request->query = $this->requestQuery;
-        $request->request = $this->requestRequest;
-        $this->request = $request;
         $this->user = $this->getMockBuilder(UserInterface::class)
             ->disableOriginalConstructor()
             ->getMock()
@@ -374,7 +370,6 @@ public function testAuthorizeActionWillEnsureLogout(): void
             ->expects($this->exactly(1))
             ->method('set')
             ->with('_fos_oauth_server.ensure_logout', true)
-            ->willReturn(null)
         ;
 
         $propertyReflection = new ReflectionProperty(AuthorizeController::class, 'client');
@@ -426,6 +421,10 @@ public function testAuthorizeActionWillEnsureLogout(): void
         $this->assertEquals($response, $this->instance->authorizeAction($this->request));
     }
 
+    /**
+     * @TODO Rewrite this test since Request::$query and Request::$request are now typed with final classes
+     *       Than can't be mocked anymore
+     */
     public function testAuthorizeActionWillProcessAuthorizationForm(): void
     {
         $token = $this->getMockBuilder(TokenInterface::class)

diff --git a/Tests/DependencyInjection/Compiler/GrantExtensionsCompilerPassTest.php b/Tests/DependencyInjection/Compiler/GrantExtensionsCompilerPassTest.php
@@ -44,7 +44,7 @@ public function testProcessWillNotDoAnythingIfTheStorageDoesNotImplementOurInter
     {
         $container = $this->getMockBuilder(ContainerBuilder::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'findDefinition',
                 'getParameterBag',
             ])
@@ -201,7 +201,7 @@ public function testProcess(): void
     {
         $container = $this->getMockBuilder(ContainerBuilder::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'findDefinition',
                 'getParameterBag',
                 'findTaggedServiceIds',

diff --git a/Tests/DependencyInjection/Compiler/RequestStackCompilerPassTest.php b/Tests/DependencyInjection/Compiler/RequestStackCompilerPassTest.php
@@ -39,7 +39,7 @@ public function setUp(): void
     {
         $this->container = $this->getMockBuilder(ContainerBuilder::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'has',
                 'getDefinition',
             ])

diff --git a/Tests/FOSOAuthServerBundleTest.php b/Tests/FOSOAuthServerBundleTest.php
@@ -33,7 +33,7 @@ public function testConstruction(): void
         /** @var ContainerBuilder|\PHPUnit_Framework_MockObject_MockObject $containerBuilder */
         $containerBuilder = $this->getMockBuilder(ContainerBuilder::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'getExtension',
                 'addCompilerPass',
             ])