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\Extensionmanager\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\Extensionmanager\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\Extensionmanager\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\Extensionmanager\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;
/**
......
......@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Core\Utility\VersionNumberUtility;
use TYPO3\CMS\Extensionmanager\Domain\Model\Dependency;
use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
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\Filelist\ViewHelpers\Uri;
use Closure;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Class DeleteFileViewHelper
......
......@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use Closure;
use TYPO3\CMS\Backend\Utility\BackendUtility;
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;
/**
......
......@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use Closure;
use TYPO3\CMS\Backend\Utility\BackendUtility;
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;
/**
......
......@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use Closure;
use TYPO3\CMS\Backend\Utility\BackendUtility;
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;
/**
......
......@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use Closure;
use TYPO3\CMS\Backend\Utility\BackendUtility;
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;
/**
......
......@@ -132,6 +132,7 @@ class RenderingContext extends \TYPO3Fluid\Fluid\Core\Rendering\RenderingContext
$this->setTemplateProcessors(array(
$objectManager->get(XmlnsNamespaceTemplatePreProcessor::class),
));
/** @var FluidTemplateCache $cache */
$cache = $objectManager->get(CacheManager::class)->getCache('fluid_template');
if (is_a($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['fluid_template']['frontend'], FluidTemplateCache::class, true)) {
$this->setCache($cache);
......
......@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
*
* @api
*/
abstract class AbstractViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper implements ViewHelperInterface
abstract class AbstractViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper implements \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface
{
/**
* TRUE if arguments have already been initialized
......@@ -60,7 +60,7 @@ abstract class AbstractViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\Abst
protected $controllerContext;
/**
* @var \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface
* @var \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface
*/
protected $renderingContext;
......@@ -90,15 +90,17 @@ abstract class AbstractViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\Abst
protected $objectManager;
/**
* @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
* @param \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
* @return void
*/
public function setRenderingContext(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext)
public function setRenderingContext(\TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $renderingContext)
{
$this->renderingContext = $renderingContext;
$this->controllerContext = $renderingContext->getControllerContext();
$this->templateVariableContainer = $renderingContext->getVariableProvider();
$this->viewHelperVariableContainer = $renderingContext->getViewHelperVariableContainer();
if ($renderingContext instanceof \TYPO3\CMS\Fluid\Core\Rendering\RenderingContext) {
$this->controllerContext = $renderingContext->getControllerContext();
}
}
/**
......@@ -128,7 +130,7 @@ abstract class AbstractViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\Abst
* @param string $description Description of the argument
* @param bool $required If TRUE, argument is required. Defaults to FALSE.
* @param mixed $defaultValue Default value of argument
* @return ViewHelperInterface $this, to allow chaining.
* @return \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface $this, to allow chaining.
* @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
* @api
*/
......@@ -151,7 +153,7 @@ abstract class AbstractViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\Abst
* @param string $description Description of the argument
* @param bool $required If TRUE, argument is required. Defaults to FALSE.
* @param mixed $defaultValue Default value of argument
* @return ViewHelperInterface $this, to allow chaining.
* @return \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface $this, to allow chaining.
* @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
* @api
*/
......@@ -198,7 +200,7 @@ abstract class AbstractViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\Abst
{
$renderMethodParameters = array();
foreach ($this->argumentDefinitions as $argumentName => $argumentDefinition) {
if ($argumentDefinition->isMethodParameter()) {
if ($argumentDefinition instanceof \TYPO3\CMS\Fluid\Core\ViewHelper\ArgumentDefinition && $argumentDefinition->isMethodParameter()) {
$renderMethodParameters[$argumentName] = $this->arguments[$argumentName];
}
}
......
......@@ -54,7 +54,7 @@ class ViewHelperResolver extends \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperRes
/**
* @param string $viewHelperClassName
* @return ViewHelperInterface
* @return \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface
*/
public function createViewHelperInstanceFromClassName($viewHelperClassName)
{
......
......@@ -70,7 +70,7 @@ class WidgetContext
* Only available inside non-AJAX requests.
* @todo rename to something more meaningful.
*
* @var \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface
* @var \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface
* @transient
*/
protected $viewHelperChildNodeRenderingContext;
......@@ -249,10 +249,10 @@ class WidgetContext
/**
* @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode $viewHelperChildNodes
* @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $viewHelperChildNodeRenderingContext
* @param \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $viewHelperChildNodeRenderingContext
* @return void
*/
public function setViewHelperChildNodes(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode $viewHelperChildNodes, \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $viewHelperChildNodeRenderingContext)
public function setViewHelperChildNodes(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode $viewHelperChildNodes, \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $viewHelperChildNodeRenderingContext)
{
$this->viewHelperChildNodes = $viewHelperChildNodes;
$this->viewHelperChildNodeRenderingContext = $viewHelperChildNodeRenderingContext;
......@@ -267,7 +267,7 @@ class WidgetContext
}
/**
* @return \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface
* @return \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface
*/
public function getViewHelperChildNodeRenderingContext()
{
......
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\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;
/**
......
......@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Buttons;
*/
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
/**
......
......@@ -16,7 +16,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Buttons;
use TYPO3\CMS\Backend\Template\DocumentTemplate;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
/**
......
......@@ -14,7 +14,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
......
......@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* View helper which return page info icon as known from TYPO3 backend modules
......
......@@ -16,7 +16,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* View helper which returns the current page path as known from TYPO3 backend modules
......
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