@@ -12,7 +12,6 @@ |
||
| 12 | 12 | use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\Expression\ExpressionException; |
| 13 | 13 | use TYPO3Fluid\Fluid\Core\Parser\TemplateParser; |
| 14 | 14 | use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; |
| 15 | -use TYPO3Fluid\Fluid\Core\ViewHelper\Exception\NotFoundException; |
|
| 16 | 15 | use TYPO3Fluid\Fluid\View\Exception; |
| 17 | 16 | use TYPO3Fluid\Fluid\View\TemplatePaths; |
| 18 | 17 | |
@@ -247,7 +247,7 @@ |
||
| 247 | 247 | try { |
| 248 | 248 | $parsedTemplate = $renderingContext->getTemplateParser()->getOrParseAndStoreTemplate( |
| 249 | 249 | $identifier, |
| 250 | - function (TemplateParser $parser, TemplatePaths $templatePaths) use ($templatePathAndFilename) { |
|
| 250 | + function(TemplateParser $parser, TemplatePaths $templatePaths) use ($templatePathAndFilename) { |
|
| 251 | 251 | return file_get_contents($templatePathAndFilename, FILE_TEXT); |
| 252 | 252 | } |
| 253 | 253 | ); |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | * @param string $arguments Arguments string, not yet parsed |
| 313 | 313 | * @param boolean $selfclosing true, if the tag is a self-closing tag. |
| 314 | 314 | * @param string $templateElement The template code containing the ViewHelper call |
| 315 | - * @return ViewHelperNode|NULL |
|
| 315 | + * @return NodeInterface|null |
|
| 316 | 316 | */ |
| 317 | 317 | protected function openingViewHelperTagHandler(ParsingState $state, $namespaceIdentifier, $methodIdentifier, $arguments, $selfclosing, $templateElement) |
| 318 | 318 | { |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | * @param string $namespaceIdentifier Namespace identifier - being looked up in $this->namespaces |
| 345 | 345 | * @param string $methodIdentifier Method identifier |
| 346 | 346 | * @param array $argumentsObjectTree Arguments object tree |
| 347 | - * @return ViewHelperNode|NULL An instance of ViewHelperNode if identity was valid - NULL if the namespace/identity was not registered |
|
| 347 | + * @return null|NodeInterface An instance of ViewHelperNode if identity was valid - NULL if the namespace/identity was not registered |
|
| 348 | 348 | * @throws Exception |
| 349 | 349 | */ |
| 350 | 350 | protected function initializeViewHelperAndAddItToStack(ParsingState $state, $namespaceIdentifier, $methodIdentifier, $argumentsObjectTree) |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | * adds it to the current node. |
| 631 | 631 | * |
| 632 | 632 | * @param ParsingState $state The current parsing state |
| 633 | - * @param array $arrayText The array as string. |
|
| 633 | + * @param NodeInterface[] $arrayText The array as string. |
|
| 634 | 634 | * @return void |
| 635 | 635 | */ |
| 636 | 636 | protected function arrayHandler(ParsingState $state, $arrayText) |
@@ -17,9 +17,7 @@ |
||
| 17 | 17 | use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\TextNode; |
| 18 | 18 | use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode; |
| 19 | 19 | use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; |
| 20 | -use TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider; |
|
| 21 | 20 | use TYPO3Fluid\Fluid\Core\Variables\VariableExtractor; |
| 22 | -use TYPO3Fluid\Fluid\Core\Variables\VariableProviderInterface; |
|
| 23 | 21 | use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperResolver; |
| 24 | 22 | |
| 25 | 23 | /** |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | * @param ParsingState $state the parsing state |
| 474 | 474 | * @return void |
| 475 | 475 | */ |
| 476 | - protected function callInterceptor(NodeInterface &$node, $interceptionPoint, ParsingState $state) |
|
| 476 | + protected function callInterceptor(NodeInterface & $node, $interceptionPoint, ParsingState $state) |
|
| 477 | 477 | { |
| 478 | 478 | if ($this->configuration === null) { |
| 479 | 479 | return; |
@@ -662,7 +662,7 @@ discard block |
||
| 662 | 662 | $arrayKey = $this->unquoteString($singleMatch['Key']); |
| 663 | 663 | if (!empty($singleMatch['VariableIdentifier'])) { |
| 664 | 664 | $arrayToBuild[$arrayKey] = new ObjectAccessorNode($singleMatch['VariableIdentifier']); |
| 665 | - } elseif (array_key_exists('Number', $singleMatch) && (!empty($singleMatch['Number']) || $singleMatch['Number'] === '0' )) { |
|
| 665 | + } elseif (array_key_exists('Number', $singleMatch) && (!empty($singleMatch['Number']) || $singleMatch['Number'] === '0')) { |
|
| 666 | 666 | $arrayToBuild[$arrayKey] = floatval($singleMatch['Number']); |
| 667 | 667 | } elseif ((array_key_exists('QuotedString', $singleMatch) && !empty($singleMatch['QuotedString']))) { |
| 668 | 668 | $argumentString = $this->unquoteString($singleMatch['QuotedString']); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | - * @param mixed $subject |
|
| 90 | + * @param VariableProviderInterface $subject |
|
| 91 | 91 | * @param string $propertyPath |
| 92 | 92 | * @return array |
| 93 | 93 | */ |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | /** |
| 114 | 114 | * @param mixed $subject |
| 115 | 115 | * @param string $propertyPath |
| 116 | - * @return array |
|
| 116 | + * @return string |
|
| 117 | 117 | */ |
| 118 | 118 | protected function resolveSubVariableReferences($subject, $propertyPath) |
| 119 | 119 | { |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use TYPO3Fluid\Fluid\Core\Compiler\ViewHelperCompiler; |
| 6 | 6 | use TYPO3Fluid\Fluid\Core\Exception; |
| 7 | 7 | use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode; |
| 8 | -use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; |
|
| 9 | 8 | |
| 10 | 9 | /** |
| 11 | 10 | * Class CompilableWithContentArgumentAndRenderStatic |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | $argumentName = $this->resolveContentArgumentName(); |
| 50 | 50 | $arguments = $this->arguments; |
| 51 | 51 | if (!empty($argumentName) && isset($arguments[$argumentName])) { |
| 52 | - $renderChildrenClosure = function () use ($arguments, $argumentName) { |
|
| 52 | + $renderChildrenClosure = function() use ($arguments, $argumentName) { |
|
| 53 | 53 | return $arguments[$argumentName]; |
| 54 | 54 | }; |
| 55 | 55 | } else { |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | use TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler; |
| 5 | 5 | use TYPO3Fluid\Fluid\Core\Compiler\ViewHelperCompiler; |
| 6 | 6 | use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode; |
| 7 | -use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; |
|
| 8 | 7 | |
| 9 | 8 | /** |
| 10 | 9 | * Class CompilableWithRenderStatic |
@@ -395,7 +395,7 @@ |
||
| 395 | 395 | * Sanitize a path, ensuring it is absolute and |
| 396 | 396 | * if a directory, suffixed by a trailing slash. |
| 397 | 397 | * |
| 398 | - * @param string|array $path |
|
| 398 | + * @param string $path |
|
| 399 | 399 | * @return string |
| 400 | 400 | */ |
| 401 | 401 | protected function sanitizePath($path) |
@@ -295,7 +295,7 @@ |
||
| 295 | 295 | protected function buildRenderChildrenClosure() |
| 296 | 296 | { |
| 297 | 297 | $self = clone $this; |
| 298 | - return function () use ($self) { |
|
| 298 | + return function() use ($self) { |
|
| 299 | 299 | return $self->renderChildren(); |
| 300 | 300 | }; |
| 301 | 301 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | $method = self::RENDER_STATIC, |
| 84 | 84 | $onClass = null |
| 85 | 85 | ) { |
| 86 | - $onClass = $onClass ? : get_class($viewHelper); |
|
| 86 | + $onClass = $onClass ?: get_class($viewHelper); |
|
| 87 | 87 | return [ |
| 88 | 88 | self::DEFAULT_INIT, |
| 89 | 89 | sprintf( |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | $method = self::RENDER_STATIC, |
| 127 | 127 | $onClass = null |
| 128 | 128 | ) { |
| 129 | - $onClass = $onClass ? : get_class($viewHelper); |
|
| 129 | + $onClass = $onClass ?: get_class($viewHelper); |
|
| 130 | 130 | return [ |
| 131 | 131 | self::DEFAULT_INIT, |
| 132 | 132 | sprintf( |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | $actionName = ucfirst($actionName); |
| 185 | 185 | $parsedTemplate = $templateParser->getOrParseAndStoreTemplate( |
| 186 | 186 | $templatePaths->getTemplateIdentifier($controllerName, $actionName), |
| 187 | - function ($parent, TemplatePaths $paths) use ($controllerName, $actionName) { |
|
| 187 | + function($parent, TemplatePaths $paths) use ($controllerName, $actionName) { |
|
| 188 | 188 | return $paths->getTemplateSource($controllerName, $actionName); |
| 189 | 189 | } |
| 190 | 190 | ); |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | $layoutName = $parsedTemplate->getLayoutName($this->baseRenderingContext); |
| 199 | 199 | $parsedLayout = $templateParser->getOrParseAndStoreTemplate( |
| 200 | 200 | $templatePaths->getLayoutIdentifier($layoutName), |
| 201 | - function ($parent, TemplatePaths $paths) use ($layoutName) { |
|
| 201 | + function($parent, TemplatePaths $paths) use ($layoutName) { |
|
| 202 | 202 | return $paths->getLayoutSource($layoutName); |
| 203 | 203 | } |
| 204 | 204 | ); |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | $partialIdentifier = $this->partialIdentifierCache[$partialName]; |
| 289 | 289 | $parsedPartial = $this->baseRenderingContext->getTemplateParser()->getOrParseAndStoreTemplate( |
| 290 | 290 | $partialIdentifier, |
| 291 | - function ($parent, TemplatePaths $paths) use ($partialName) { |
|
| 291 | + function($parent, TemplatePaths $paths) use ($partialName) { |
|
| 292 | 292 | return $paths->getPartialSource($partialName); |
| 293 | 293 | } |
| 294 | 294 | ); |