[BUGFIX] Fix undefined local variable in CalcFunction::parse() (#617)

This is the 8.x backport of #593. Fixes #585
MyIntervals · Jun 23, 2024 · 7d413c8 · 7d413c8
1 parent b48925e
commit 7d413c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Fixed
 
+- Fix undefined local variable in `CalcFunction::parse()` (#593)
+
 ## 8.5.1
 
 ### Fixed

diff --git a/config/phpstan-baseline.neon b/config/phpstan-baseline.neon
@@ -10,8 +10,3 @@ parameters:
 			count: 2
 			path: ../src/RuleSet/DeclarationBlock.php
 
-		-
-			message: "#^Variable \\$oVal might not be defined\\.$#"
-			count: 1
-			path: ../src/Value/CalcFunction.php
-
diff --git a/src/Value/CalcFunction.php b/src/Value/CalcFunction.php
@@ -91,7 +91,7 @@ public static function parse(ParserState $oParserState, $bIgnoreCase = false)
                         sprintf(
                             'Next token was expected to be an operand of type %s. Instead "%s" was found.',
                             implode(', ', $aOperators),
-                            $oVal
+                            $oParserState->peek()
                         ),
                         '',
                         'custom',