Commit f0e046b7 authored by Markus Klein's avatar Markus Klein Committed by Wouter Wolters
Browse files

[BUGFIX] Do not use Fluid legacy classes

Any class listed in the LegacyClassesForIde file must not be used
by Core anymore.

Resolves: #75376
Releases: master
Change-Id: If69782eb9227270c511a47ecf229ff31c7892fb6
Reviewed-on: https://review.typo3.org/47493

Reviewed-by: default avatarHelmut Hummel <helmut.hummel@typo3.org>
Tested-by: default avatarHelmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
parent da3ac98a
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Uri;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* A view helper for creating URIs to resources.
......
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Uri;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\CMS\Frontend\Service\TypoLinkCodecService;
......
......@@ -24,7 +24,7 @@ class RenderingContextTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
/**
* Parsing state
*
* @var \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface
* @var \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface
*/
protected $renderingContext;
......
......@@ -136,7 +136,7 @@ class AbstractWidgetViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
$rootNode->expects($this->at(1))->method('addChildNode')->with($node2);
$rootNode->expects($this->at(2))->method('addChildNode')->with($node3);
$this->objectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode::class)->will($this->returnValue($rootNode));
$renderingContext = $this->getMock(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface::class);
$renderingContext = $this->getMock(\TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface::class);
$this->viewHelper->_set('renderingContext', $renderingContext);
$this->widgetContext->expects($this->once())->method('setViewHelperChildNodes')->with($rootNode, $renderingContext);
$this->viewHelper->setChildNodes(array($node1, $node2, $node3));
......
......@@ -116,7 +116,7 @@ class WidgetContextTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
public function viewHelperChildNodesCanBeReadAgain()
{
$viewHelperChildNodes = $this->getMock(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode::class);
$renderingContext = $this->getMock(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface::class);
$renderingContext = $this->getMock(\TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface::class);
$this->widgetContext->setViewHelperChildNodes($viewHelperChildNodes, $renderingContext);
$this->assertSame($viewHelperChildNodes, $this->widgetContext->getViewHelperChildNodes());
$this->assertSame($renderingContext, $this->widgetContext->getViewHelperChildNodeRenderingContext());
......
......@@ -45,7 +45,7 @@ class StandaloneViewTest extends UnitTestCase
protected $view;
/**
* @var \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface|\PHPUnit_Framework_MockObject_MockObject
* @var \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $mockRenderingContext;
......
......@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures;
/**
* [Enter description here]
*/
class EmptySyntaxTreeNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode
class EmptySyntaxTreeNode extends \TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode
{
public function __construct()
{
......
......@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Resource\FileInterface;
use TYPO3\CMS\Core\Resource\FileReference;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Service\TypoScriptService;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
......
......@@ -15,7 +15,7 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers\Format;
*/
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -15,7 +15,7 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers;
*/
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -17,7 +17,7 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Install\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Install\ViewHelpers\File;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Install\ViewHelpers\File;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Install\ViewHelpers\File;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Install\ViewHelpers\File;
*/
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Install\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Install\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment