Skip to content

Commit

Permalink
[BUGFIX] Remove usage of fluid legacy classes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
NeoBlack authored and lolli42 committed Feb 8, 2018
1 parent 140e85a commit e48b91c
Show file tree
Hide file tree
Showing 19 changed files with 48 additions and 19 deletions.
Expand Up @@ -15,13 +15,14 @@
*/
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
Expand Down
Expand Up @@ -14,12 +14,14 @@
* 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
Expand Down
Expand Up @@ -14,12 +14,14 @@
* 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';

Expand Down
Expand Up @@ -14,10 +14,12 @@
* 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
Expand Down
Expand Up @@ -14,6 +14,8 @@
* 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
Expand Down Expand Up @@ -42,7 +44,7 @@
* localized selectbox
* <output>
*/
class ActionMenuItemViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
class ActionMenuItemViewHelper extends AbstractTagBasedViewHelper
{
/**
* @var string
Expand Down
Expand Up @@ -16,6 +16,7 @@

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
Expand Down Expand Up @@ -45,7 +46,7 @@
* localized selectbox
* <output>
*/
class ActionMenuViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
class ActionMenuViewHelper extends AbstractTagBasedViewHelper
{
/**
* @var string
Expand Down
Expand Up @@ -14,6 +14,8 @@
* 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.
*
Expand Down Expand Up @@ -45,7 +47,7 @@
*
* @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.
Expand Down
Expand Up @@ -14,6 +14,8 @@
* 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.
*
Expand Down Expand Up @@ -54,7 +56,7 @@
*
* @api
*/
class IfHasRoleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper
class IfHasRoleViewHelper extends AbstractConditionViewHelper
{
/**
* Initializes the "role" argument.
Expand Down
3 changes: 2 additions & 1 deletion typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
Expand Up @@ -16,6 +16,7 @@

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;

/**
Expand Down Expand Up @@ -62,7 +63,7 @@
* Could not get image resource for "NonExistingImage.png".
* </output>
*/
class ImageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
class ImageViewHelper extends AbstractTagBasedViewHelper
{
/**
* @var string
Expand Down
Expand Up @@ -14,6 +14,8 @@
* The TYPO3 project - inspiring people to share!
*/

use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;

/**
* A view helper for creating links to extbase actions.
*
Expand All @@ -27,7 +29,7 @@
* (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
Expand Down
Expand Up @@ -14,6 +14,8 @@
* 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.
Expand All @@ -35,7 +37,7 @@
* <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
Expand Down
Expand Up @@ -14,6 +14,8 @@
* The TYPO3 project - inspiring people to share!
*/

use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;

/**
* A view helper for creating links to external targets.
*
Expand All @@ -35,7 +37,7 @@
*
* @api
*/
class ExternalViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
class ExternalViewHelper extends AbstractTagBasedViewHelper
{
/**
* @var string
Expand Down
Expand Up @@ -14,6 +14,8 @@
* The TYPO3 project - inspiring people to share!
*/

use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;

/**
* A view helper for creating links to TYPO3 pages.
*
Expand Down Expand Up @@ -43,7 +45,7 @@
* (depending on your TS configuration)
* </output>
*/
class PageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
class PageViewHelper extends AbstractTagBasedViewHelper
{
/**
* @var string
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/fluid/Classes/ViewHelpers/MediaViewHelper.php
Expand Up @@ -21,7 +21,7 @@
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.
Expand Down
Expand Up @@ -14,6 +14,8 @@
* 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.
*
Expand Down Expand Up @@ -45,7 +47,7 @@
*
* @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.
Expand Down
Expand Up @@ -14,6 +14,8 @@
* 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.
*
Expand Down Expand Up @@ -54,7 +56,7 @@
*
* @api
*/
class IfHasRoleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper
class IfHasRoleViewHelper extends AbstractConditionViewHelper
{
/**
* Initializes the "role" argument.
Expand Down
Expand Up @@ -14,6 +14,8 @@
* The TYPO3 project - inspiring people to share!
*/

use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;

/**
* A view helper for creating Links to extbase actions within widets.
*
Expand All @@ -29,7 +31,7 @@
*
* @api
*/
class LinkViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper
class LinkViewHelper extends AbstractTagBasedViewHelper
{
/**
* @var string
Expand Down
Expand Up @@ -17,9 +17,9 @@

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
Expand Down
Expand Up @@ -14,8 +14,8 @@
* 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;

/**
Expand Down

0 comments on commit e48b91c

Please sign in to comment.