[TASK] Raise testing framework to ~6.1.0 19/62519/3
authorSusanne Moog <look@susi.dev>
Tue, 3 Dec 2019 08:25:13 +0000 (09:25 +0100)
committerAndreas Fernandez <a.fernandez@scripting-base.de>
Tue, 3 Dec 2019 08:49:49 +0000 (09:49 +0100)
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
composer.lock
typo3/sysext/core/composer.json
typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php

index 122c5f2..f16f111 100644 (file)
@@ -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",
index 2817fa1..55c6a5c 100644 (file)
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ad3295bdf8c8700d9be0f2e05563697e",
+    "content-hash": "2c2043fa833ab265530464d5ab0aca71",
     "packages": [
         {
             "name": "cogpowered/finediff",
         },
         {
             "name": "typo3/testing-framework",
-            "version": "6.0.0",
+            "version": "6.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/testing-framework.git",
-                "reference": "c74a87a2037fca3eaaebeaa886a874cc97fce997"
+                "reference": "89e4e0dd20ba4e4f4423d16ce63d204afbc73c09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/c74a87a2037fca3eaaebeaa886a874cc97fce997",
-                "reference": "c74a87a2037fca3eaaebeaa886a874cc97fce997",
+                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/89e4e0dd20ba4e4f4423d16ce63d204afbc73c09",
+                "reference": "89e4e0dd20ba4e4f4423d16ce63d204afbc73c09",
                 "shasum": ""
             },
             "require": {
                 "mikey179/vfsstream": "~1.6.8",
-                "phpunit/phpunit": "^8.3",
+                "phpunit/phpunit": "^8.4",
                 "typo3/cms-backend": "10.*.*@dev",
                 "typo3/cms-core": "10.*.*@dev",
                 "typo3/cms-extbase": "10.*.*@dev",
                 "tests",
                 "typo3"
             ],
-            "time": "2019-12-02T16:43:08+00:00"
+            "time": "2019-12-03T08:17:45+00:00"
         }
     ],
     "aliases": [],
index d554cec..ffb56a8 100644 (file)
@@ -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",
index 6db1b86..3b457ec 100644 (file)
@@ -37,7 +37,7 @@ class RenderingContextTest extends UnitTestCase
     {
         parent::setUp();
         $this->renderingContext = $this->getMockBuilder(RenderingContext::class)
-            ->setMethods(['dummy'])
+            ->addMethods(['dummy'])
             ->disableOriginalConstructor()
             ->getMock();
     }
@@ -48,7 +48,7 @@ class RenderingContextTest extends UnitTestCase
     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 @@ class RenderingContextTest extends UnitTestCase
     public function setControllerActionProcessesInputCorrectly($input, $expected)
     {
         $subject = $this->getMockBuilder(RenderingContext::class)
-            ->setMethods(['dummy'])
+            ->addMethods(['dummy'])
             ->disableOriginalConstructor()
             ->getMock();
         $request = $this->getMockBuilder(Request::class)->setMethods(['setControllerActionName'])->getMock();
index 4be1097..4e69f28 100644 (file)
@@ -95,7 +95,7 @@ class AbstractWidgetViewHelperTest extends UnitTestCase
         $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);
index ba53990..d790903 100644 (file)
@@ -62,7 +62,7 @@ class PageViewHelperTest extends ViewHelperBaseTestcase
         $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);