From 36a705a83fd45b37fc7b2a5dd7bc2319979b9dbd Mon Sep 17 00:00:00 2001
From: Helmut Hummel <info@helhum.io>
Date: Fri, 24 Jun 2016 16:12:29 +0200
Subject: [PATCH] [CLEANUP] Make URI Builder call readable in View Helpers
The configuration calls in one line are hardly readable and should be
spanned over one line each.
Resolves: #76788
Releases: master, 7.6
Change-Id: I07fb3f7cb36ee1f652393113746e3188bdf57094
Reviewed-on: https://review.typo3.org/48671
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../ViewHelpers/Link/ActionViewHelper.php | 16 +++++++++++++++-
.../Classes/ViewHelpers/Uri/ActionViewHelper.php | 16 +++++++++++++++-
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
index 25211408e3e2..f32b53d724c9 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
@@ -72,7 +72,21 @@ class ActionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBased
public function render($action = null, array $arguments = array(), $controller = null, $extensionName = null, $pluginName = null, $pageUid = null, $pageType = 0, $noCache = false, $noCacheHash = false, $section = '', $format = '', $linkAccessRestrictedPages = false, array $additionalParams = array(), $absolute = false, $addQueryString = false, array $argumentsToBeExcludedFromQueryString = array(), $addQueryStringMethod = null)
{
$uriBuilder = $this->renderingContext->getControllerContext()->getUriBuilder();
- $uri = $uriBuilder->reset()->setTargetPageUid($pageUid)->setTargetPageType($pageType)->setNoCache($noCache)->setUseCacheHash(!$noCacheHash)->setSection($section)->setFormat($format)->setLinkAccessRestrictedPages($linkAccessRestrictedPages)->setArguments($additionalParams)->setCreateAbsoluteUri($absolute)->setAddQueryString($addQueryString)->setArgumentsToBeExcludedFromQueryString($argumentsToBeExcludedFromQueryString)->setAddQueryStringMethod($addQueryStringMethod)->uriFor($action, $arguments, $controller, $extensionName, $pluginName);
+ $uri = $uriBuilder
+ ->reset()
+ ->setTargetPageUid($pageUid)
+ ->setTargetPageType($pageType)
+ ->setNoCache($noCache)
+ ->setUseCacheHash(!$noCacheHash)
+ ->setSection($section)
+ ->setFormat($format)
+ ->setLinkAccessRestrictedPages($linkAccessRestrictedPages)
+ ->setArguments($additionalParams)
+ ->setCreateAbsoluteUri($absolute)
+ ->setAddQueryString($addQueryString)
+ ->setArgumentsToBeExcludedFromQueryString($argumentsToBeExcludedFromQueryString)
+ ->setAddQueryStringMethod($addQueryStringMethod)
+ ->uriFor($action, $arguments, $controller, $extensionName, $pluginName);
$this->tag->addAttribute('href', $uri);
$this->tag->setContent($this->renderChildren());
$this->tag->forceClosingTag(true);
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php
index 940ce86edc04..bed74f943ccd 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php
@@ -52,7 +52,21 @@ class ActionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelp
public function render($action = null, array $arguments = array(), $controller = null, $extensionName = null, $pluginName = null, $pageUid = null, $pageType = 0, $noCache = false, $noCacheHash = false, $section = '', $format = '', $linkAccessRestrictedPages = false, array $additionalParams = array(), $absolute = false, $addQueryString = false, array $argumentsToBeExcludedFromQueryString = array(), $addQueryStringMethod = null)
{
$uriBuilder = $this->controllerContext->getUriBuilder();
- $uri = $uriBuilder->reset()->setTargetPageUid($pageUid)->setTargetPageType($pageType)->setNoCache($noCache)->setUseCacheHash(!$noCacheHash)->setSection($section)->setFormat($format)->setLinkAccessRestrictedPages($linkAccessRestrictedPages)->setArguments($additionalParams)->setCreateAbsoluteUri($absolute)->setAddQueryString($addQueryString)->setArgumentsToBeExcludedFromQueryString($argumentsToBeExcludedFromQueryString)->setAddQueryStringMethod($addQueryStringMethod)->uriFor($action, $arguments, $controller, $extensionName, $pluginName);
+ $uri = $uriBuilder
+ ->reset()
+ ->setTargetPageUid($pageUid)
+ ->setTargetPageType($pageType)
+ ->setNoCache($noCache)
+ ->setUseCacheHash(!$noCacheHash)
+ ->setSection($section)
+ ->setFormat($format)
+ ->setLinkAccessRestrictedPages($linkAccessRestrictedPages)
+ ->setArguments($additionalParams)
+ ->setCreateAbsoluteUri($absolute)
+ ->setAddQueryString($addQueryString)
+ ->setArgumentsToBeExcludedFromQueryString($argumentsToBeExcludedFromQueryString)
+ ->setAddQueryStringMethod($addQueryStringMethod)
+ ->uriFor($action, $arguments, $controller, $extensionName, $pluginName);
return $uri;
}
}
--
GitLab