Skip to content

Commit

Permalink
[TASK] Make FormViewHelperTest notice free
Browse files Browse the repository at this point in the history
Releases: master
Resolves: #84370
Change-Id: I2290665353e844e29fbcd168f21e03260a56fa8c
Reviewed-on: https://review.typo3.org/56249
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
janhelke authored and lolli42 committed Mar 16, 2018
1 parent fe84835 commit 0228fa5
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 70 deletions.
40 changes: 20 additions & 20 deletions typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php
Expand Up @@ -140,13 +140,13 @@ public function initializeArguments()
public function render()
{
$this->setFormActionUri();
if (strtolower($this->arguments['method']) === 'get') {
if (isset($this->arguments['method']) && strtolower($this->arguments['method']) === 'get') {
$this->tag->addAttribute('method', 'get');
} else {
$this->tag->addAttribute('method', 'post');
}

if ($this->arguments['novalidate'] === true) {
if (isset($this->arguments['novalidate']) && $this->arguments['novalidate'] === true) {
$this->tag->addAttribute('novalidate', 'novalidate');
}

Expand All @@ -156,13 +156,13 @@ public function render()
$this->addFormFieldNamesToViewHelperVariableContainer();
$formContent = $this->renderChildren();

if ($this->arguments['hiddenFieldClassName'] !== null) {
if (isset($this->arguments['hiddenFieldClassName']) && $this->arguments['hiddenFieldClassName'] !== null) {
$content = LF . '<div class="' . htmlspecialchars($this->arguments['hiddenFieldClassName']) . '">';
} else {
$content = LF . '<div>';
}

$content .= $this->renderHiddenIdentityField($this->arguments['object'], $this->getFormObjectName());
$content .= $this->renderHiddenIdentityField($this->arguments['object'] ?? null, $this->getFormObjectName());
$content .= $this->renderAdditionalIdentityFields();
$content .= $this->renderHiddenReferrerFields();

Expand All @@ -188,27 +188,27 @@ protected function setFormActionUri()
if ($this->hasArgument('actionUri')) {
$formActionUri = $this->arguments['actionUri'];
} else {
$pageUid = (int)$this->arguments['pageUid'] > 0 ? (int)$this->arguments['pageUid'] : null;
$pageUid = (isset($this->arguments['pageUid']) && (int)$this->arguments['pageUid'] > 0) ? (int)$this->arguments['pageUid'] : null;
$uriBuilder = $this->renderingContext->getControllerContext()->getUriBuilder();
$formActionUri = $uriBuilder
->reset()
->setTargetPageUid($pageUid)
->setTargetPageType($this->arguments['pageType'])
->setNoCache($this->arguments['noCache'])
->setUseCacheHash(!$this->arguments['noCacheHash'])
->setSection($this->arguments['section'])
->setCreateAbsoluteUri($this->arguments['absolute'])
->setArguments((array)$this->arguments['additionalParams'])
->setAddQueryString($this->arguments['addQueryString'])
->setAddQueryStringMethod($this->arguments['addQueryStringMethod'])
->setArgumentsToBeExcludedFromQueryString((array)$this->arguments['argumentsToBeExcludedFromQueryString'])
->setFormat($this->arguments['format'])
->setTargetPageType($this->arguments['pageType'] ?? 0)
->setNoCache($this->arguments['noCache'] ?? false)
->setUseCacheHash(isset($this->arguments['noCacheHash']) ? !$this->arguments['noCacheHash'] : true)
->setSection($this->arguments['section'] ?? '')
->setCreateAbsoluteUri($this->arguments['absolute'] ?? false)
->setArguments(isset($this->arguments['additionalParams']) ? (array)$this->arguments['additionalParams'] : [])
->setAddQueryString($this->arguments['addQueryString'] ?? false)
->setAddQueryStringMethod($this->arguments['addQueryStringMethod'] ?? null)
->setArgumentsToBeExcludedFromQueryString(isset($this->arguments['argumentsToBeExcludedFromQueryString']) ? (array)$this->arguments['argumentsToBeExcludedFromQueryString'] : [])
->setFormat($this->arguments['format'] ?? '')
->uriFor(
$this->arguments['action'],
$this->arguments['arguments'],
$this->arguments['controller'],
$this->arguments['extensionName'],
$this->arguments['pluginName']
$this->arguments['action'] ?? null,
$this->arguments['arguments'] ?? [],
$this->arguments['controller'] ?? null,
$this->arguments['extensionName'] ?? null,
$this->arguments['pluginName'] ?? null
);
$this->formActionUriArguments = $uriBuilder->getArguments();
}
Expand Down

0 comments on commit 0228fa5

Please sign in to comment.