[!!!][TASK] Remove old fluid related class aliases 27/59227/4
authorChristian Kuhn <lolli@schwarzbu.ch>
Wed, 19 Dec 2018 19:50:11 +0000 (20:50 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Wed, 19 Dec 2018 21:33:58 +0000 (22:33 +0100)
Drops old fluid class aliases. Note most of them have
been deprecated with core v8 already.

Resolves: #87230
Releases: master
Change-Id: I509019be4e1df77bfeb94a7498a1ba795c128e86
Reviewed-on: https://review.typo3.org/59227
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
27 files changed:
composer.json
composer.lock
typo3/sysext/backend/Classes/Template/ModuleTemplate.php
typo3/sysext/beuser/Classes/ViewHelpers/PermissionsViewHelper.php
typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst
typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php
typo3/sysext/extbase/Migrations/Code/LegacyClassesForIde.php
typo3/sysext/fluid/Classes/Core/Rendering/RenderingContext.php
typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
typo3/sysext/fluid/Classes/View/StandaloneView.php
typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/CheckboxViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/CaseViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
typo3/sysext/fluid/Migrations/Code/ClassAliasMap.php [deleted file]
typo3/sysext/fluid/Migrations/Code/LegacyClassesForIde.php [deleted file]
typo3/sysext/fluid/Tests/Unit/ViewHelpers/CObjectViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php
typo3/sysext/fluid/composer.json
typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php

index dc660e8..8605a2e 100644 (file)
@@ -87,8 +87,7 @@
                        "always-add-alias-loader": true,
                        "class-alias-maps": [
                                "typo3/sysext/adminpanel/Migrations/Code/ClassAliasMap.php",
-                               "typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php",
-                               "typo3/sysext/fluid/Migrations/Code/ClassAliasMap.php"
+                               "typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php"
                        ]
                },
                "branch-alias": {
index 6cd6fa4..0875abe 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": "1dcde7150f5c1c6b8b5a0f9d06f8c466",
+    "content-hash": "a2b364b4595fbcc3d807b94080bf390e",
     "packages": [
         {
             "name": "cogpowered/finediff",
index 6875734..358ce7f 100644 (file)
@@ -27,8 +27,8 @@ use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\HttpUtility;
-use TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException;
 use TYPO3\CMS\Fluid\View\StandaloneView;
+use TYPO3Fluid\Fluid\View\Exception\InvalidTemplateResourceException;
 
 /**
  * A class taking care of the "outer" HTML of a module, especially
index 70c2ff8..7fe19f8 100644 (file)
@@ -59,7 +59,7 @@ class PermissionsViewHelper extends AbstractViewHelper
      * @param \Closure $renderChildrenClosure
      * @param RenderingContextInterface $renderingContext
      * @return string
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception
+     * @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
      */
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
index 6ca5caf..9d8ed65 100644 (file)
@@ -52,8 +52,34 @@ The following PHP class aliases that have been previously deprecated for v9 have
 * :php:`TYPO3\CMS\Core\Tree\TableConfiguration\ExtJsArrayTreeRenderer`
 * :php:`TYPO3\CMS\ContextHelp\Controller\ContextHelpAjaxController`
 * :php:`TYPO3\CMS\Cshmanual\Domain\Repository\TableManualRepository`
+* :php:`TYPO3\CMS\Extbase\Mvc\Exception\InvalidTemplateResourceException`
 * :php:`TYPO3\CMS\Frontend\Controller\PageInformationController`
 * :php:`TYPO3\CMS\Frontend\Controller\TranslationStatusController`
+* :php:`TYPO3\CMS\Fluid\Core\Compiler\TemplateCompiler`
+* :php:`TYPO3\CMS\Fluid\Core\Exception`
+* :php:`TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode`
+* :php:`TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface`
+* :php:`TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface`
+* :php:`TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode`
+* :php:`TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\ViewHelperNode`
+* :php:`TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface`
+* :php:`TYPO3\CMS\Fluid\Core\Variables\CmsVariableProvider`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\ArgumentDefinition`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\Exception`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\Facets\ChildNodeAccessInterface`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\Facets\PostParseInterface`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperInterface`
+* :php:`TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer`
+* :php:`TYPO3\CMS\Fluid\View\Exception`
+* :php:`TYPO3\CMS\Fluid\View\Exception\InvalidSectionException`
+* :php:`TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException`
 * :php:`TYPO3\CMS\InfoPagetsconfig\Controller\InfoPageTyposcriptConfigController`
 * :php:`TYPO3\CMS\Lang\LanguageService`
 * :php:`TYPO3\CMS\Lowlevel\Command\WorkspaceVersionRecordsCommand`
index 2e7255b..241ed76 100644 (file)
@@ -56,7 +56,6 @@ return [
 
     // Fluid
     'TYPO3\\CMS\\Extbase\\Mvc\\Exception\\InvalidViewHelperException' => \TYPO3\CMS\Extbase\Exception::class,
-    'TYPO3\\CMS\\Extbase\\Mvc\\Exception\\InvalidTemplateResourceException' => \TYPO3Fluid\Fluid\View\Exception\InvalidTemplateResourceException::class,
 
     // Service
     'TYPO3\\CMS\\Extbase\\Service\\FlexFormService' => \TYPO3\CMS\Core\Service\FlexFormService::class,
index 4cda7ce..3a9aff6 100644 (file)
@@ -38,9 +38,6 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception {
     class InvalidViewHelperException extends \TYPO3\CMS\Extbase\Exception
     {
     }
-    class InvalidTemplateResourceException extends \TYPO3Fluid\Fluid\View\Exception\InvalidTemplateResourceException
-    {
-    }
 }
 
 namespace TYPO3\CMS\Extbase\Object\Container\Exception {
index 4ffc0c5..12577e9 100644 (file)
@@ -18,11 +18,11 @@ use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Fluid\Core\Cache\FluidTemplateCache;
-use TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface;
 use TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperResolver;
 use TYPO3\CMS\Fluid\View\TemplatePaths;
 use TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler;
 use TYPO3Fluid\Fluid\Core\Parser\Configuration;
+use TYPO3Fluid\Fluid\Core\Parser\InterceptorInterface;
 use TYPO3Fluid\Fluid\Core\Parser\TemplateParser;
 use TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider;
 use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInvoker;
index a02a9c9..3d6fbd1 100644 (file)
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Fluid\View;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
-use TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\View\Exception\InvalidTemplateResourceException;
 use TYPO3Fluid\Fluid\View\TemplateView;
 
 /**
index 60c410b..8eeac0c 100644 (file)
@@ -21,8 +21,8 @@ use TYPO3\CMS\Extbase\Mvc\Web\Request as WebRequest;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
-use TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+use TYPO3Fluid\Fluid\View\Exception\InvalidTemplateResourceException;
 
 /**
  * A standalone template view.
index e9ce211..bf2fb49 100644 (file)
@@ -93,7 +93,7 @@ class CObjectViewHelper extends AbstractViewHelper
      * @param \Closure $renderChildrenClosure
      * @param RenderingContextInterface $renderingContext
      * @return mixed
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception
+     * @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
      */
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
@@ -123,7 +123,7 @@ class CObjectViewHelper extends AbstractViewHelper
         $setup = static::getConfigurationManager()->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
         foreach ($pathSegments as $segment) {
             if (!array_key_exists($segment . '.', $setup)) {
-                throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception(
+                throw new \TYPO3Fluid\Fluid\Core\ViewHelper\Exception(
                     'TypoScript object path "' . $typoscriptObjectPath . '" does not exist',
                     1253191023
                 );
@@ -131,7 +131,7 @@ class CObjectViewHelper extends AbstractViewHelper
             $setup = $setup[$segment . '.'];
         }
         if (!isset($setup[$lastSegment])) {
-            throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception(
+            throw new \TYPO3Fluid\Fluid\Core\ViewHelper\Exception(
                 'No Content Object definition found at TypoScript object path "' . $typoscriptObjectPath . '"',
                 1540246570
             );
index 6f9fd52..2940384 100644 (file)
@@ -76,7 +76,7 @@ class CheckboxViewHelper extends AbstractFormFieldViewHelper
     /**
      * Renders the checkbox.
      *
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception
+     * @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
      * @return string
      */
     public function render()
index 089dc68..5306d94 100644 (file)
@@ -219,7 +219,7 @@ class SelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
                         if (method_exists($key, '__toString')) {
                             $key = (string)$key;
                         } else {
-                            throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception('Identifying value for object of class "' . get_class($value) . '" was an object.', 1247827428);
+                            throw new \TYPO3Fluid\Fluid\Core\ViewHelper\Exception('Identifying value for object of class "' . get_class($value) . '" was an object.', 1247827428);
                         }
                     }
                 } elseif ($this->persistenceManager->getIdentifierByObject($value) !== null) {
@@ -228,7 +228,7 @@ class SelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
                 } elseif (method_exists($value, '__toString')) {
                     $key = (string)$value;
                 } else {
-                    throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception('No identifying value for object of class "' . get_class($value) . '" found.', 1247826696);
+                    throw new \TYPO3Fluid\Fluid\Core\ViewHelper\Exception('No identifying value for object of class "' . get_class($value) . '" found.', 1247826696);
                 }
                 if ($this->hasArgument('optionLabelField')) {
                     $value = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getPropertyPath($value, $this->arguments['optionLabelField']);
@@ -236,7 +236,7 @@ class SelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
                         if (method_exists($value, '__toString')) {
                             $value = (string)$value;
                         } else {
-                            throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception('Label value for object of class "' . get_class($value) . '" was an object without a __toString() method.', 1247827553);
+                            throw new \TYPO3Fluid\Fluid\Core\ViewHelper\Exception('Label value for object of class "' . get_class($value) . '" was an object without a __toString() method.', 1247827553);
                         }
                     }
                 } elseif (method_exists($value, '__toString')) {
index 1ad185e..89fd609 100644 (file)
@@ -14,9 +14,9 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 /**
@@ -113,7 +113,7 @@ class CaseViewHelper extends AbstractViewHelper
      * @param \Closure $renderChildrenClosure
      * @param RenderingContextInterface $renderingContext
      * @return string
-     * @throws InvalidVariableException
+     * @throws Exception
      */
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
     {
@@ -147,7 +147,7 @@ class CaseViewHelper extends AbstractViewHelper
                 $output = mb_convert_case($value, MB_CASE_TITLE, 'utf-8');
                 break;
             default:
-                throw new InvalidVariableException('The case mode "' . $mode . '" supplied to Fluid\'s format.case ViewHelper is not supported.', 1358349150);
+                throw new Exception('The case mode "' . $mode . '" supplied to Fluid\'s format.case ViewHelper is not supported.', 1358349150);
         }
 
         return $output;
index 1820cfd..f12908a 100644 (file)
@@ -15,9 +15,9 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
  */
 
 use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
 
 /**
index bd4102e..a564cfb 100644 (file)
@@ -15,11 +15,11 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
  */
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Frontend\Service\TypoLinkCodecService;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 /**
index dedb94b..7b56c02 100644 (file)
@@ -15,9 +15,9 @@ namespace TYPO3\CMS\Fluid\ViewHelpers;
  */
 
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 /**
@@ -104,7 +104,7 @@ class TranslateViewHelper extends AbstractViewHelper
      * @param array $arguments
      * @param \Closure $renderChildrenClosure
      * @param RenderingContextInterface $renderingContext
-     * @throws InvalidVariableException
+     * @throws Exception
      * @return string
      */
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
@@ -121,7 +121,7 @@ class TranslateViewHelper extends AbstractViewHelper
         }
 
         if ((string)$id === '') {
-            throw new InvalidVariableException('An argument "key" or "id" has to be provided', 1351584844);
+            throw new Exception('An argument "key" or "id" has to be provided', 1351584844);
         }
 
         $request = $renderingContext->getControllerContext()->getRequest();
diff --git a/typo3/sysext/fluid/Migrations/Code/ClassAliasMap.php b/typo3/sysext/fluid/Migrations/Code/ClassAliasMap.php
deleted file mode 100644 (file)
index 31d32da..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-return [
-    // Base classes removed in TYPO3 v9
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\AbstractViewHelper' => \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper::class,
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\AbstractConditionViewHelper' => \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractConditionViewHelper::class,
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\AbstractTagBasedViewHelper' => \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper::class,
-
-    // Compiler/parser related aliases
-    'TYPO3\\CMS\\Fluid\\Core\\Compiler\\TemplateCompiler' => \TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler::class,
-    'TYPO3\\CMS\\Fluid\\Core\\Parser\\InterceptorInterface' => \TYPO3Fluid\Fluid\Core\Parser\InterceptorInterface::class,
-    'TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\NodeInterface' => \TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\NodeInterface::class,
-    'TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\AbstractNode' => \TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode::class,
-    'TYPO3\\CMS\\Fluid\\Core\\Rendering\\RenderingContextInterface' => \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface::class,
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\ViewHelperInterface' => \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface::class,
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\Facets\\ChildNodeAccessInterface' => \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface::class,
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\Facets\\CompilableInterface' => \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface::class,
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\Facets\\PostParseInterface' => \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface::class,
-
-    // Fluid-specific errors
-    'TYPO3\\CMS\\Fluid\\Core\\Exception' => \TYPO3Fluid\Fluid\Core\Exception::class,
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\Exception' => \TYPO3Fluid\Fluid\Core\ViewHelper\Exception::class,
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\Exception\\InvalidVariableException' => \TYPO3Fluid\Fluid\Core\Exception::class,
-    'TYPO3\\CMS\\Fluid\\View\\Exception' => \TYPO3Fluid\Fluid\View\Exception::class,
-    'TYPO3\\CMS\\Fluid\\View\\Exception\\InvalidSectionException' => \TYPO3Fluid\Fluid\View\Exception\InvalidSectionException::class,
-    'TYPO3\\CMS\\Fluid\\View\\Exception\\InvalidTemplateResourceException' => \TYPO3Fluid\Fluid\View\Exception\InvalidTemplateResourceException::class,
-
-    // Fluid variable containers, ViewHelpers, interfaces
-    'TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\RootNode' => \TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode::class,
-    'TYPO3\\CMS\\Fluid\\Core\\Parser\\SyntaxTree\\ViewHelperNode' => \TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode::class,
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\ArgumentDefinition' => \TYPO3Fluid\Fluid\Core\ViewHelper\ArgumentDefinition::class,
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\TemplateVariableContainer' => \TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider::class,
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\ViewHelperVariableContainer' => \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer::class,
-    'TYPO3\\CMS\\Fluid\\Core\\Variables\\CmsVariableProvider' => \TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider::class,
-
-    // Semi API level classes; mainly used in unit tests
-    'TYPO3\\CMS\\Fluid\\Core\\ViewHelper\\TagBuilder' => \TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder::class
-];
diff --git a/typo3/sysext/fluid/Migrations/Code/LegacyClassesForIde.php b/typo3/sysext/fluid/Migrations/Code/LegacyClassesForIde.php
deleted file mode 100644 (file)
index e0a97a5..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-namespace {
-    die('Access denied');
-}
-
-namespace TYPO3\CMS\Fluid\Core\Parser {
-    interface InterceptorInterface extends \TYPO3Fluid\Fluid\Core\Parser\InterceptorInterface
-    {
-    }
-}
-
-namespace TYPO3\CMS\Fluid\Core\Parser\SyntaxTree {
-    interface NodeInterface extends \TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\NodeInterface
-    {
-    }
-}
-
-namespace TYPO3\CMS\Fluid\Core\Rendering {
-    interface RenderingContextInterface extends \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface
-    {
-    }
-
-}
-
-namespace TYPO3\CMS\Fluid\Core\ViewHelper {
-    interface ViewHelperInterface extends \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface
-    {
-    }
-}
-
-namespace TYPO3\CMS\Fluid\Core\ViewHelper\Facets {
-    interface ChildNodeAccessInterface extends \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface
-    {
-    }
-    interface CompilableInterface extends \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface
-    {
-    }
-    interface PostParseInterface extends \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInterface
-    {
-    }
-}
-
-namespace TYPO3\CMS\Fluid\Core {
-    class Exception extends \TYPO3Fluid\Fluid\Core\Exception
-    {
-    }
-}
-
-namespace TYPO3\CMS\Fluid\Core\ViewHelper {
-    class Exception extends \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
-    {
-    }
-}
-
-namespace TYPO3\CMS\Fluid\Core\ViewHelper\Exception {
-    class InvalidVariableException extends \TYPO3Fluid\Fluid\Core\Exception
-    {
-    }
-}
-
-namespace TYPO3\CMS\Fluid\View {
-    class Exception extends \TYPO3Fluid\Fluid\View\Exception
-    {
-    }
-}
-
-namespace TYPO3\CMS\Fluid\View\Exception {
-    class InvalidSectionException extends \TYPO3Fluid\Fluid\View\Exception\InvalidSectionException
-    {
-    }
-    class InvalidTemplateResourceException extends \TYPO3Fluid\Fluid\View\Exception\InvalidTemplateResourceException
-    {
-    }
-
-}
-
-namespace TYPO3\CMS\Fluid\Core\Compiler {
-    class TemplateCompiler extends \TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler
-    {
-    }
-}
-
-namespace TYPO3\CMS\Fluid\Core\Variables {
-    class CmsVariableProvider extends \TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider
-    {
-    }
-}
-
-namespace TYPO3\CMS\Fluid\Core\Parser\SyntaxTree {
-    class RootNode extends \TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode
-    {
-    }
-    class ViewHelperNode extends \TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode
-    {
-    }
-}
-
-namespace TYPO3\CMS\Fluid\Core\ViewHelper {
-    abstract class AbstractViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper
-    {
-    }
-    abstract class AbstractConditionViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractConditionViewHelper
-    {
-    }
-    abstract class AbstractTagBasedViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
-    {
-    }
-    class TemplateVariableContainer extends \TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider
-    {
-    }
-    class ViewHelperVariableContainer extends \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer
-    {
-    }
-    class TagBuilder extends \TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder
-    {
-    }
-}
index 6eb19c6..f2143fd 100644 (file)
@@ -145,7 +145,7 @@ class CObjectViewHelperTest extends ViewHelperBaseTestcase
             ]
         );
 
-        $this->expectException(\TYPO3\CMS\Fluid\Core\ViewHelper\Exception::class);
+        $this->expectException(\TYPO3Fluid\Fluid\Core\ViewHelper\Exception::class);
         $this->expectExceptionCode($exceptionCode);
         $this->viewHelper->initializeArgumentsAndRender();
     }
index 38682c9..7b17b29 100644 (file)
@@ -490,7 +490,7 @@ class SelectViewHelperTest extends ViewHelperBaseTestcase
         $mockPersistenceManager->expects($this->any())->method('getIdentifierByObject')->will($this->returnValue(null));
         $this->viewHelper->_set('persistenceManager', $mockPersistenceManager);
 
-        $this->expectException(\TYPO3\CMS\Fluid\Core\ViewHelper\Exception::class);
+        $this->expectException(\TYPO3Fluid\Fluid\Core\ViewHelper\Exception::class);
         $this->expectExceptionCode(1247826696);
 
         $user = new UserDomainClass(1, 'Ingmar', 'Schlecht');
index 0b16503..f6e43dc 100644 (file)
@@ -69,7 +69,7 @@ class CaseViewHelperTest extends ViewHelperBaseTestcase
      */
     public function viewHelperThrowsExceptionIfIncorrectModeIsGiven()
     {
-        $this->expectException(\TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException::class);
+        $this->expectException(\TYPO3Fluid\Fluid\Core\ViewHelper\Exception::class);
         $this->expectExceptionCode(1358349150);
         $this->setArgumentsUnderTest(
             $this->viewHelper,
index c49e512..a782cd5 100644 (file)
@@ -14,9 +14,9 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
 use TYPO3\CMS\Fluid\ViewHelpers\Format\DateViewHelper;
 use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 
 /**
  * Test case
index acf6637..1c50006 100644 (file)
@@ -64,7 +64,7 @@ class ImageViewHelperTest extends ViewHelperBaseTestcase
     {
         $this->setArgumentsUnderTest($this->viewHelper, $arguments);
 
-        $this->expectException(\TYPO3\CMS\Fluid\Core\ViewHelper\Exception::class);
+        $this->expectException(\TYPO3Fluid\Fluid\Core\ViewHelper\Exception::class);
         $this->expectExceptionCode(1382284106);
 
         $this->viewHelper->render();
index 6935711..447ac4d 100644 (file)
@@ -36,7 +36,7 @@ class TranslateViewHelperTest extends ViewHelperBaseTestcase
         $this->viewHelper = new TranslateViewHelper();
         $this->injectDependenciesIntoViewHelper($this->viewHelper);
 
-        $this->expectException(\TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException::class);
+        $this->expectException(\TYPO3Fluid\Fluid\Core\ViewHelper\Exception::class);
         $this->expectExceptionCode(1351584844);
 
         $this->setArgumentsUnderTest(
index 23fc74b..ac08910 100644 (file)
                                "partOfMinimalUsableSystem": true
                        },
                        "extension-key": "fluid"
-               },
-               "typo3/class-alias-loader": {
-                       "class-alias-maps": [
-                               "Migrations/Code/ClassAliasMap.php"
-                       ]
                }
        },
        "autoload": {
index e78dc1d..4265d5a 100644 (file)
@@ -336,6 +336,7 @@ return [
     'TYPO3\CMS\Extbase\Mvc\Exception\InvalidTemplateResourceException' => [
         'restFiles' => [
             'Deprecation-81600-UnusedExtbaseExceptions.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Extensionmanager\Utility\DatabaseUtility' => [
@@ -361,6 +362,7 @@ return [
     'TYPO3\CMS\Fluid\Core\Variables\CmsVariableProvider' => [
         'restFiles' => [
             'Important-82229-FluidImplementationOfCmsVariableProviderRemoved.rst',
+            'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
         ],
     ],
     'TYPO3\CMS\Core\FrontendEditing\FrontendEditingController' => [