Skip to content

[BUGFIX] make ContentArgumentName non required argument #1302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Kanti wants to merge 1 commit into from
Closed

[BUGFIX] make ContentArgumentName non required argument #1302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/Core/Parser/TemplateParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ protected function parseArguments(ParsingState $state, string $argumentsString,
$this->escapingEnabled = $escapingEnabledBackup;
}
}
$this->abortIfRequiredArgumentsAreMissing($argumentDefinitions, $argumentsObjectTree);
$this->abortIfRequiredArgumentsAreMissing($argumentDefinitions, $argumentsObjectTree, $viewHelperNode->getUninitializedViewHelper()->getContentArgumentName());
$viewHelperNode->getUninitializedViewHelper()->validateAdditionalArguments($undeclaredArguments);
return $argumentsObjectTree + $undeclaredArguments;
}
Expand Down Expand Up @@ -816,7 +816,7 @@ protected function recursiveArrayHandler(ParsingState $state, string $arrayText,
}
}
if ($viewHelperNode instanceof ViewHelperNode) {
$this->abortIfRequiredArgumentsAreMissing($argumentDefinitions, $arrayToBuild);
$this->abortIfRequiredArgumentsAreMissing($argumentDefinitions, $arrayToBuild, $viewHelperNode->getUninitializedViewHelper()->getContentArgumentName());
$viewHelperNode->getUninitializedViewHelper()->validateAdditionalArguments($undeclaredArguments);
}
return $arrayToBuild + $undeclaredArguments;
Expand Down Expand Up @@ -851,10 +851,14 @@ protected function createParsingState(string $templateIdentifier): ParsingState
* @param NodeInterface[] $actualArguments Actual arguments
* @throws Exception
*/
protected function abortIfRequiredArgumentsAreMissing(array $expectedArguments, array $actualArguments): void
protected function abortIfRequiredArgumentsAreMissing(array $expectedArguments, array $actualArguments, ?string $contentArgumentName): void
{
$actualArgumentNames = array_keys($actualArguments);
foreach ($expectedArguments as $name => $expectedArgument) {
if ($name === $contentArgumentName) {
continue;
}

if ($expectedArgument->isRequired() && !in_array($name, $actualArgumentNames)) {
throw new Exception('Required argument "' . $name . '" was not supplied.', 1237823699);
}
Expand Down