[BUGFIX] Remove usage of fluid legacy classes 06/55606/4
authorFrank Naegler <frank.naegler@typo3.org>
Thu, 8 Feb 2018 15:02:23 +0000 (16:02 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 8 Feb 2018 19:06:57 +0000 (20:06 +0100)
With https://review.typo3.org/#/c/54068/ a lot of fluid classes
were changed and replaced by fluid standalone classes.
Some ViewHelpers still use the legacy classes.
This patch switches all usages to the fluid standlone classes.

Resolves: #83811
Releases: master
Change-Id: If0ee1b694c573d0c8c1a4ea0d9f873997511127e
Reviewed-on: https://review.typo3.org/55606
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
19 files changed:
typo3/sysext/extensionmanager/Classes/ViewHelpers/DistributionImageViewHelper.php
typo3/sysext/extensionmanager/Classes/ViewHelpers/Link/ActionViewHelper.php
typo3/sysext/extensionmanager/Classes/ViewHelpers/ProcessAvailableActionsViewHelper.php
typo3/sysext/filelist/Classes/ViewHelpers/Link/ClickMenuOnIconViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuItemViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Menus/ActionMenuViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfAuthenticatedViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfHasRoleViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Link/EmailViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Link/ExternalViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/MediaViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Security/IfAuthenticatedViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Security/IfHasRoleViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Widget/LinkViewHelper.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/LinkViewHelperTest.php
typo3/sysext/install/Classes/ViewHelpers/Format/NoSpaceViewHelper.php

index 7a96d09..34fdb42 100644 (file)
@@ -15,13 +15,14 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  */
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
 /**
  * Renders the distribution image
  *
  * @internal
  */
-class DistributionImageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class DistributionImageViewHelper extends AbstractTagBasedViewHelper
 {
     /**
      * @var string
index d22ea77..661d3cf 100644 (file)
@@ -14,12 +14,14 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers\Link;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+
 /**
  * A view helper for creating links to extensionmanager actions
  *
  * @internal
  */
-class ActionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class ActionViewHelper extends AbstractTagBasedViewHelper
 {
     /**
      * @var string
index c4c91b9..b38c96b 100644 (file)
@@ -14,12 +14,14 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+
 /**
  * View helper to let 3rd-party extensions process the list of available
  * actions for a given extension.
  * @internal
  */
-class ProcessAvailableActionsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class ProcessAvailableActionsViewHelper extends AbstractTagBasedViewHelper
 {
     const SIGNAL_ProcessActions = 'processActions';
 
index e35797c..bc75c8e 100644 (file)
@@ -14,10 +14,12 @@ namespace TYPO3\CMS\Filelist\ViewHelpers\Link;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+
 /**
  * Class ClickMenuOnIconViewHelper
  */
-class ClickMenuOnIconViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class ClickMenuOnIconViewHelper extends AbstractTagBasedViewHelper
 {
     /**
      * @var string
index 327e004..6e0bf2c 100644 (file)
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Menus;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+
 /**
  * View helper which returns an option tag.
  * This view helper only works in conjunction with \TYPO3\CMS\Fluid\ViewHelpers\Be\Menus\ActionMenuViewHelper
@@ -42,7 +44,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Menus;
  * localized selectbox
  * <output>
  */
-class ActionMenuItemViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class ActionMenuItemViewHelper extends AbstractTagBasedViewHelper
 {
     /**
      * @var string
index 8d95575..8bc1f45 100644 (file)
@@ -16,6 +16,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Menus;
 
 use TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler;
 use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
 /**
  * View helper which returns a select box, that can be used to switch between
@@ -45,7 +46,7 @@ use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode;
  * localized selectbox
  * <output>
  */
-class ActionMenuViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class ActionMenuViewHelper extends AbstractTagBasedViewHelper
 {
     /**
      * @var string
index 768412b..b63c2a8 100644 (file)
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Security;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractConditionViewHelper;
+
 /**
  * This view helper implements an ifAuthenticated/else condition for BE users/groups.
  *
@@ -45,7 +47,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Security;
  *
  * @api
  */
-class IfAuthenticatedViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper
+class IfAuthenticatedViewHelper extends AbstractConditionViewHelper
 {
     /**
      * This method decides if the condition is TRUE or FALSE. It can be overridden in extending viewhelpers to adjust functionality.
index cf3305a..3cf6785 100644 (file)
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Security;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractConditionViewHelper;
+
 /**
  * This view helper implements an ifHasRole/else condition for BE users/groups.
  *
@@ -54,7 +56,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Security;
  *
  * @api
  */
-class IfHasRoleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper
+class IfHasRoleViewHelper extends AbstractConditionViewHelper
 {
     /**
      * Initializes the "role" argument.
index 7b20e4b..ec0139b 100644 (file)
@@ -16,6 +16,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers;
 
 use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection;
 use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 
 /**
@@ -62,7 +63,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
  * Could not get image resource for "NonExistingImage.png".
  * </output>
  */
-class ImageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class ImageViewHelper extends AbstractTagBasedViewHelper
 {
     /**
      * @var string
index 990feba..1cd52b5 100644 (file)
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+
 /**
  * A view helper for creating links to extbase actions.
  *
@@ -27,7 +29,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
  * (depending on the current page and your TS configuration)
  * </output>
  */
-class ActionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class ActionViewHelper extends AbstractTagBasedViewHelper
 {
     /**
      * @var string
index 80263fa..fa866b0 100644 (file)
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+
 /**
  * Email link view helper.
  * Generates an email link incorporating TYPO3s spamProtectEmailAddresses-settings.
@@ -35,7 +37,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
  * <a href="javascript:linkTo_UnCryptMailto('ocknvq,hqqBdct0vnf');">some custom content</a>
  * </output>
  */
-class EmailViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class EmailViewHelper extends AbstractTagBasedViewHelper
 {
     /**
      * @var string
index 7984537..734280e 100644 (file)
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+
 /**
  * A view helper for creating links to external targets.
  *
@@ -35,7 +37,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
  *
  * @api
  */
-class ExternalViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class ExternalViewHelper extends AbstractTagBasedViewHelper
 {
     /**
      * @var string
index 5a17a0e..3342611 100644 (file)
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+
 /**
  * A view helper for creating links to TYPO3 pages.
  *
@@ -43,7 +45,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
  * (depending on your TS configuration)
  * </output>
  */
-class PageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class PageViewHelper extends AbstractTagBasedViewHelper
 {
     /**
      * @var string
index 84f138c..8e19c5b 100644 (file)
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Resource\Rendering\RendererRegistry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Domain\Model\AbstractFileFolder;
 use TYPO3\CMS\Extbase\Service\ImageService;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
 
 /**
  * Render a given media file with the correct html tag.
index 4340be5..8268ab7 100644 (file)
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Security;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractConditionViewHelper;
+
 /**
  * This view helper implements an ifAuthenticated/else condition for FE users/groups.
  *
@@ -45,7 +47,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Security;
  *
  * @api
  */
-class IfAuthenticatedViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper
+class IfAuthenticatedViewHelper extends AbstractConditionViewHelper
 {
     /**
      * This method decides if the condition is TRUE or FALSE. It can be overridden in extending viewhelpers to adjust functionality.
index 1de9810..b9f61e3 100644 (file)
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Security;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractConditionViewHelper;
+
 /**
  * This view helper implements an ifHasRole/else condition for FE users/groups.
  *
@@ -54,7 +56,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Security;
  *
  * @api
  */
-class IfHasRoleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper
+class IfHasRoleViewHelper extends AbstractConditionViewHelper
 {
     /**
      * Initializes the "role" argument.
index c74c59d..0d0dc0c 100644 (file)
@@ -14,6 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Widget;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+
 /**
  * A view helper for creating Links to extbase actions within widets.
  *
@@ -29,7 +31,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Widget;
  *
  * @api
  */
-class LinkViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
+class LinkViewHelper extends AbstractTagBasedViewHelper
 {
     /**
      * @var string
index 48ff9d2..b62afba 100644 (file)
@@ -17,9 +17,9 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Be;
 
 use TYPO3\CMS\Backend\Routing\UriBuilder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder;
 use TYPO3\CMS\Fluid\ViewHelpers\Be\LinkViewHelper;
 use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
 
 /**
  * Test-case for Be\LinkViewHelper
index 93d9720..f05ee93 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Install\ViewHelpers\Format;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 /**