[TASK] Avoid useless is_array check

phpstan is correct here, the is_array() check is obsolete since the variable is initialized as array and preg_match_all() won't change its type when hand over as reference.
TYPO3 · Nov 20, 2024 · 218c0f9 · 218c0f9
1 parent f7b0a3a
commit 218c0f9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 35 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -18,24 +18,12 @@ parameters:
 			count: 1
 			path: src/Core/Parser/TemplateParser.php
 
-		-
-			message: '#^Call to function is_array\(\) with list\<array\<string\>\> will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: src/Core/Parser/TemplateParser.php
-
 		-
 			message: '#^Method TYPO3Fluid\\Fluid\\Core\\Parser\\TemplateParser\:\:initializeViewHelperAndAddItToStack\(\) should return TYPO3Fluid\\Fluid\\Core\\Parser\\SyntaxTree\\ViewHelperNode\|null but returns TYPO3Fluid\\Fluid\\Core\\Parser\\SyntaxTree\\NodeInterface\.$#'
 			identifier: return.type
 			count: 1
 			path: src/Core/Parser/TemplateParser.php
 
-		-
-			message: '#^Strict comparison using \=\=\= between true and true will always evaluate to true\.$#'
-			identifier: identical.alwaysTrue
-			count: 1
-			path: src/Core/Parser/TemplateParser.php
-
 		-
 			message: '#^Instanceof between TYPO3Fluid\\Fluid\\Core\\Cache\\FluidCacheInterface and TYPO3Fluid\\Fluid\\Core\\Cache\\FluidCacheInterface will always evaluate to true\.$#'
 			identifier: instanceof.alwaysTrue

diff --git a/src/Core/Parser/TemplateParser.php b/src/Core/Parser/TemplateParser.php
@@ -626,30 +626,28 @@ protected function textAndShorthandSyntaxHandler(ParsingState $state, string $te
                     $detectionExpression = $expressionNodeTypeClassName::$detectionExpression;
                     $matchedVariables = [];
                     preg_match_all($detectionExpression, $section, $matchedVariables, PREG_SET_ORDER);
-                    if (is_array($matchedVariables) === true) {
-                        foreach ($matchedVariables as $matchedVariableSet) {
-                            $expressionStartPosition = strpos($section, $matchedVariableSet[0]);
-                            /** @var ExpressionNodeInterface $expressionNode */
-                            $expressionNode = new $expressionNodeTypeClassName($matchedVariableSet[0], $matchedVariableSet, $state);
-                            try {
-                                if ($expressionStartPosition > 0) {
-                                    $state->getNodeFromStack()->addChildNode(new TextNode(substr($section, 0, $expressionStartPosition)));
-                                }
-
-                                $this->callInterceptor($expressionNode, InterceptorInterface::INTERCEPT_EXPRESSION, $state);
-                                $state->getNodeFromStack()->addChildNode($expressionNode);
-
-                                $expressionEndPosition = $expressionStartPosition + strlen($matchedVariableSet[0]);
-                                if ($expressionEndPosition < strlen($section)) {
-                                    $this->textAndShorthandSyntaxHandler($state, substr($section, $expressionEndPosition), $context);
-                                    break;
-                                }
-                            } catch (ExpressionException $error) {
-                                $this->textHandler(
-                                    $state,
-                                    $this->renderingContext->getErrorHandler()->handleExpressionError($error),
-                                );
+                    foreach ($matchedVariables as $matchedVariableSet) {
+                        $expressionStartPosition = strpos($section, $matchedVariableSet[0]);
+                        /** @var ExpressionNodeInterface $expressionNode */
+                        $expressionNode = new $expressionNodeTypeClassName($matchedVariableSet[0], $matchedVariableSet, $state);
+                        try {
+                            if ($expressionStartPosition > 0) {
+                                $state->getNodeFromStack()->addChildNode(new TextNode(substr($section, 0, $expressionStartPosition)));
                             }
+
+                            $this->callInterceptor($expressionNode, InterceptorInterface::INTERCEPT_EXPRESSION, $state);
+                            $state->getNodeFromStack()->addChildNode($expressionNode);
+
+                            $expressionEndPosition = $expressionStartPosition + strlen($matchedVariableSet[0]);
+                            if ($expressionEndPosition < strlen($section)) {
+                                $this->textAndShorthandSyntaxHandler($state, substr($section, $expressionEndPosition), $context);
+                                break;
+                            }
+                        } catch (ExpressionException $error) {
+                            $this->textHandler(
+                                $state,
+                                $this->renderingContext->getErrorHandler()->handleExpressionError($error),
+                            );
                         }
                     }
                 }