[TASK] Adapt usages of removed TYPO3 CMS classes

Use corresponding classes from TYPO3Fluid/Fluid where possible.
dkd · Jan 8, 2020 · 457b422 · 457b422
1 parent eca7ca1
commit 457b422
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 23 deletions.
diff --git a/Classes/ViewHelpers/Form/SelectViewHelper.php b/Classes/ViewHelpers/Form/SelectViewHelper.php
@@ -8,8 +8,6 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
-
 /**
  * Select ViewHelper (with support for Optgroup and Option subnodes).
  *

diff --git a/Classes/ViewHelpers/Format/DateRangeViewHelper.php b/Classes/ViewHelpers/Format/DateRangeViewHelper.php
@@ -9,7 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;

diff --git a/Classes/ViewHelpers/Format/Json/DecodeViewHelper.php b/Classes/ViewHelpers/Format/Json/DecodeViewHelper.php
@@ -9,7 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;

diff --git a/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php b/Classes/ViewHelpers/Format/Json/EncodeViewHelper.php
@@ -11,7 +11,7 @@
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
 use TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface;
 use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;

diff --git a/Classes/ViewHelpers/Format/MarkdownViewHelper.php b/Classes/ViewHelpers/Format/MarkdownViewHelper.php
@@ -13,7 +13,7 @@
 use TYPO3\CMS\Core\Cache\Frontend\VariableFrontend;
 use TYPO3\CMS\Core\Utility\CommandUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;

diff --git a/Classes/ViewHelpers/Math/AbstractMultipleMathViewHelper.php b/Classes/ViewHelpers/Math/AbstractMultipleMathViewHelper.php
@@ -9,7 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 
 /**

diff --git a/Classes/ViewHelpers/Media/AudioViewHelper.php b/Classes/ViewHelpers/Media/AudioViewHelper.php
@@ -10,7 +10,7 @@
 
 use FluidTYPO3\Vhs\Traits\TagViewHelperTrait;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 
 /**
  * Renders HTML code to embed a HTML5 audio player. NOTICE: This is

diff --git a/Classes/ViewHelpers/Media/Image/AbstractImageInfoViewHelper.php b/Classes/ViewHelpers/Media/Image/AbstractImageInfoViewHelper.php
@@ -12,7 +12,7 @@
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**

diff --git a/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php b/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php
@@ -15,7 +15,7 @@
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 
 /**
  * Base class for image related view helpers adapted from FLUID

diff --git a/Classes/ViewHelpers/Media/ImageViewHelper.php b/Classes/ViewHelpers/Media/ImageViewHelper.php
@@ -90,7 +90,7 @@ public function initializeArguments()
      * Render method
      *
      * @return string
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception
+     * @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
      */
     public function render()
     {

diff --git a/Classes/ViewHelpers/Media/PictureViewHelper.php b/Classes/ViewHelpers/Media/PictureViewHelper.php
@@ -9,8 +9,8 @@
  */
 
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
-use TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
 /**

diff --git a/Classes/ViewHelpers/Media/SizeViewHelper.php b/Classes/ViewHelpers/Media/SizeViewHelper.php
@@ -9,7 +9,7 @@
  */
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;

diff --git a/Classes/ViewHelpers/Media/VideoViewHelper.php b/Classes/ViewHelpers/Media/VideoViewHelper.php
@@ -10,7 +10,7 @@
 
 use FluidTYPO3\Vhs\Traits\TagViewHelperTrait;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 
 /**
  * Renders HTML code to embed a HTML5 video player. NOTICE: This is

diff --git a/Classes/ViewHelpers/Menu/DeferredViewHelper.php b/Classes/ViewHelpers/Menu/DeferredViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 
 /**
  * ### Page: Deferred menu rendering ViewHelper
@@ -34,7 +34,7 @@ public function initializeArguments()
 
     /**
      * @return NULL|string
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception
+     * @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
      */
     public function render()
     {

diff --git a/Classes/ViewHelpers/Page/Header/AlternateViewHelper.php b/Classes/ViewHelpers/Page/Header/AlternateViewHelper.php
@@ -14,7 +14,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
 use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder;
+use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
@@ -36,7 +36,7 @@ class AlternateViewHelper extends AbstractViewHelper
     protected $objectManager;
 
     /**
-     * @var \TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder
+     * @var \TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder
      */
     protected $tagBuilder;
 

diff --git a/Classes/ViewHelpers/Resource/AbstractImageViewHelper.php b/Classes/ViewHelpers/Resource/AbstractImageViewHelper.php
@@ -12,7 +12,7 @@
 use TYPO3\CMS\Core\TypoScript\TemplateService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 
 /**
  * Base class for image related view helpers adapted from FLUID

diff --git a/Classes/ViewHelpers/Security/AllowViewHelper.php b/Classes/ViewHelpers/Security/AllowViewHelper.php
@@ -8,8 +8,6 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use TYPO3\CMS\Fluid\Core\ViewHelper\Facets\ChildNodeAccessInterface;
-
 /**
  * ### Security: Allow
  *
@@ -27,6 +25,6 @@
  *
  * Is the mirror opposite of `v:security.deny`.
  */
-class AllowViewHelper extends AbstractSecurityViewHelper implements ChildNodeAccessInterface
+class AllowViewHelper extends AbstractSecurityViewHelper
 {
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,8 +8,6 @@ @@
      * LICENSE.md file that was distributed with this source code.
      */
-    use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
     /**
      * Select ViewHelper (with support for Optgroup and Option subnodes).
      *
@@ Expand Down @@