[TASK] Update typo3/testing-framework to 4.10.0 21/58621/6
authorNicole Cordes <typo3@cordes.co>
Fri, 12 Oct 2018 10:07:05 +0000 (12:07 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Mon, 29 Oct 2018 12:01:12 +0000 (13:01 +0100)
Update from 4.9.0 to 4.10.0.
Notable change: The fluid RenderingContextFixture is
now provided by typo3/testing-framework, so core
namespace references can be adapted.

composer require --dev typo3/testing-framework ~4.10.0

Change-Id: Ifff354a2d418e09f08cf8818c3cd12ab87bf1ba8
Resolves: #86786
Releases: master
Reviewed-on: https://review.typo3.org/58621
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
composer.json
composer.lock
typo3/sysext/core/composer.json
typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextFixture.php [deleted file]
typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php

index 942394b..b7b54e3 100644 (file)
@@ -68,7 +68,7 @@
                "fiunchinho/phpunit-randomizer": "^4.0",
                "friendsofphp/php-cs-fixer": "^2.12.2",
                "typo3/cms-styleguide": "~9.2.1",
-               "typo3/testing-framework": "~4.9.0"
+               "typo3/testing-framework": "~4.10.0"
        },
        "suggest": {
                "ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
index cec32c5..448277a 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": "f8e5feb86fc0e17fea565b96cf73f75a",
+    "content-hash": "1ffc278cee5e98990949d683354301e8",
     "packages": [
         {
             "name": "cogpowered/finediff",
         },
         {
             "name": "typo3/testing-framework",
-            "version": "4.9.0",
+            "version": "4.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/testing-framework.git",
-                "reference": "32f7d2eced0c7930c6535d7b60eef24775e4c207"
+                "reference": "aa2cde856fc41c475e903d641d80e37ac3c7d2fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/32f7d2eced0c7930c6535d7b60eef24775e4c207",
-                "reference": "32f7d2eced0c7930c6535d7b60eef24775e4c207",
+                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/aa2cde856fc41c475e903d641d80e37ac3c7d2fe",
+                "reference": "aa2cde856fc41c475e903d641d80e37ac3c7d2fe",
                 "shasum": ""
             },
             "require": {
                 "tests",
                 "typo3"
             ],
-            "time": "2018-09-17T14:26:30+00:00"
+            "time": "2018-10-29T11:25:44+00:00"
         },
         {
             "name": "webmozart/assert",
index 5703cf1..297e33d 100644 (file)
@@ -51,7 +51,7 @@
                "fiunchinho/phpunit-randomizer": "^4.0",
                "friendsofphp/php-cs-fixer": "^2.12.2",
                "typo3/cms-styleguide": "~9.2.1",
-               "typo3/testing-framework": "~4.9.0"
+               "typo3/testing-framework": "~4.10.0"
        },
        "suggest": {
                "ext-fileinfo": "Used for proper file type detection in the file abstraction layer",
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextFixture.php b/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextFixture.php
deleted file mode 100644 (file)
index 827e744..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-namespace TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
-
-/**
- * Fixture for RenderingContext
- */
-class RenderingContextFixture extends RenderingContext
-{
-    /**
-     * Replacement NOOP constructor
-     */
-    public function __construct()
-    {
-    }
-}
index 084db9b..3da1120 100644 (file)
@@ -13,9 +13,11 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering;
  *
  * The TYPO3 project - inspiring people to share!
  */
+
 use TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext;
 use TYPO3\CMS\Extbase\Mvc\Request;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+use TYPO3\TestingFramework\Fluid\Unit\Core\Rendering\RenderingContextFixture;
 use TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider;
 use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
 
index a3ea41c..6079315 100644 (file)
@@ -25,8 +25,8 @@ use TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder;
 use TYPO3\CMS\Fluid\Core\Widget\Exception\MissingControllerException;
 use TYPO3\CMS\Fluid\Core\Widget\WidgetContext;
 use TYPO3\CMS\Fluid\Core\Widget\WidgetRequest;
-use TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+use TYPO3\TestingFramework\Fluid\Unit\Core\Rendering\RenderingContextFixture;
 use TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler;
 use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\AbstractNode;
 use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode;
index 602069c..0d6af97 100644 (file)
@@ -17,6 +17,7 @@ use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3\CMS\Fluid\View\AbstractTemplateView;
 use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+use TYPO3\TestingFramework\Fluid\Unit\Core\Rendering\RenderingContextFixture;
 use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
 
 /**
@@ -47,7 +48,7 @@ class AbstractTemplateViewTest extends UnitTestCase
         $this->viewHelperVariableContainer = $this->getMockBuilder(ViewHelperVariableContainer::class)
             ->setMethods(['setView'])
             ->getMock();
-        $this->renderingContext = $this->getMockBuilder(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class)
+        $this->renderingContext = $this->getMockBuilder(RenderingContextFixture::class)
             ->setMethods(['getViewHelperVariableContainer'])
             ->getMock();
         $this->renderingContext->expects($this->any())->method('getViewHelperVariableContainer')->will($this->returnValue($this->viewHelperVariableContainer));
index 98f3818..d1aa51a 100644 (file)
@@ -17,9 +17,9 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Link;
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
-use TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture;
 use TYPO3\CMS\Fluid\ViewHelpers\Link\TypolinkViewHelper;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+use TYPO3\TestingFramework\Fluid\Unit\Core\Rendering\RenderingContextFixture;
 use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 
 /**