[TASK] Raise testing framework to ~6.1.0

composer require --dev typo3/testing-framework:~6.1.0

Also reverts changes to tests for phpunit 8.3 only.

Resolves: #89833
Releases: master
Change-Id: I834f70452775ea18960da162bb2affe459b8556a
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/62519
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Susanne Moog <look@susi.dev>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Susanne Moog <look@susi.dev>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>

composer.json

@@ -79,7 +79,7 @@
 		"phpspec/prophecy": "^1.7.5",
 		"rector/rector": "^0.5.0",
 		"typo3/cms-styleguide": "~10.0.2",
-		"typo3/testing-framework": "~6.0.0"
+		"typo3/testing-framework": "~6.1.0"
 	},
 	"suggest": {
 		"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",

typo3/sysext/core/composer.json

@@ -57,7 +57,7 @@
 		"friendsofphp/php-cs-fixer": "^2.16.1",
 		"phpspec/prophecy": "^1.7.5",
 		"typo3/cms-styleguide": "~10.0.2",
-		"typo3/testing-framework": "~6.0.0"
+		"typo3/testing-framework": "~6.1.0"
 	},
 	"suggest": {
 		"ext-fileinfo": "Used for proper file type detection in the file abstraction layer",

typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php

@@ -37,7 +37,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->renderingContext = $this->getMockBuilder(RenderingContext::class)
-            ->setMethods(['dummy'])
+            ->addMethods(['dummy'])
             ->disableOriginalConstructor()
             ->getMock();
     }
@@ -48,7 +48,7 @@ protected function setUp(): void
     public function setControllerContextWithSubpackageKeySetsExpectedControllerContext()
     {
         $renderingContext = $this->getMockBuilder(RenderingContext::class)
-            ->setMethods(['setControllerAction', 'setControllerName'])
+            ->onlyMethods(['setControllerAction', 'setControllerName'])
             ->disableOriginalConstructor()
             ->getMock();
         $request = $this->getMockBuilder(Request::class)
@@ -106,7 +106,7 @@ public function viewHelperVariableContainerCanBeReadCorrectly()
     public function setControllerActionProcessesInputCorrectly($input, $expected)
     {
         $subject = $this->getMockBuilder(RenderingContext::class)
-            ->setMethods(['dummy'])
+            ->addMethods(['dummy'])
             ->disableOriginalConstructor()
             ->getMock();
         $request = $this->getMockBuilder(Request::class)->setMethods(['setControllerActionName'])->getMock();

typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php

@@ -95,7 +95,7 @@ protected function setUp(): void
         $this->controllerContext = $this->createMock(ControllerContext::class);
         $this->controllerContext->expects(self::any())->method('getRequest')->willReturn($this->request);
         $this->renderingContext = $this->getMockBuilder(RenderingContext::class)
-            ->setMethods(['getControllerContext'])
+            ->onlyMethods(['getControllerContext'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->renderingContext->expects(self::any())->method('getControllerContext')->willReturn($this->controllerContext);

typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php

@@ -62,7 +62,7 @@ protected function setUp(): void
         $this->controllerContext->expects(self::any())->method('getRequest')->willReturn($this->request->reveal());
         $this->arguments = [];
         $this->renderingContext = $this->getMockBuilder(RenderingContext::class)
-            ->setMethods(['getControllerContext'])
+            ->onlyMethods(['getControllerContext'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->renderingContext->expects(self::any())->method('getControllerContext')->willReturn($this->controllerContext);