Merge pull request microsoft#363 from TysonAndre/fix-deprecation

Fix PHP 8.2 deprecation notices in tolerant-php-parser

Author: roblourens

src/Parser.php

@@ -2128,6 +2128,7 @@ private function parseBinaryExpressionOrHigher($precedence, $parentNode) {
             }
 
             if ($shouldOperatorTakePrecedenceOverUnary) {
+                /** @var UnaryOpExpression $unaryExpression */
                 $unaryExpression = $leftOperand;
                 $leftOperand = $unaryExpression->operand;
             }
@@ -2149,6 +2150,7 @@ private function parseBinaryExpressionOrHigher($precedence, $parentNode) {
 
             // Rebuild the unary expression if we deconstructed it earlier.
             if ($shouldOperatorTakePrecedenceOverUnary) {
+                /** @var UnaryOpExpression $unaryExpression */
                 $leftOperand->parent = $unaryExpression;
                 $unaryExpression->operand = $leftOperand;
                 $leftOperand = $unaryExpression;
@@ -2275,6 +2277,14 @@ private function getBinaryOperatorPrecedenceAndAssociativity($token) {
         // InstanceOf has other remaining issues, but this heuristic is an improvement for many common cases such as `$x && $y = $z`
     ];
 
+    /**
+     * @param Token|Node $leftOperand
+     * @param Token $operatorToken
+     * @param Token|null $byRefToken
+     * @param Token|Node $rightOperand
+     * @param Node $parentNode
+     * @return BinaryExpression|AssignmentExpression
+     */
     private function makeBinaryExpression($leftOperand, $operatorToken, $byRefToken, $rightOperand, $parentNode) {
         $assignmentExpression = $operatorToken->kind === TokenKind::EqualsToken;
         if ($assignmentExpression || \array_key_exists($operatorToken->kind, self::KNOWN_ASSIGNMENT_TOKEN_SET)) {
@@ -2289,8 +2299,12 @@ private function makeBinaryExpression($leftOperand, $operatorToken, $byRefToken,
         }
         $binaryExpression = $assignmentExpression ? new AssignmentExpression() : new BinaryExpression();
         $binaryExpression->parent = $parentNode;
-        $leftOperand->parent = $binaryExpression;
-        $rightOperand->parent = $binaryExpression;
+        if ($leftOperand instanceof Node) {
+            $leftOperand->parent = $binaryExpression;
+        }
+        if ($rightOperand instanceof Node) {
+            $rightOperand->parent = $binaryExpression;
+        }
         $binaryExpression->leftOperand = $leftOperand;
         $binaryExpression->operator = $operatorToken;
         if ($binaryExpression instanceof AssignmentExpression && isset($byRefToken)) {

tests/LexicalGrammarTest.php

@@ -14,6 +14,8 @@
 require_once __DIR__ . '/CallbackTestListener.php';
 
 class LexicalGrammarTest extends TestCase {
+    private $expectedTokensFile;
+    private $tokens;
     const FILE_PATTERN = __DIR__ . "/cases/lexical/*";
     public function run(TestResult $result = null) : TestResult {
         if (!isset($GLOBALS["GIT_CHECKOUT_LEXER"])) {

tests/ParserGrammarTest.php

@@ -15,6 +15,10 @@
 require_once __DIR__ . '/CallbackTestListener.php';
 
 class ParserGrammarTest extends TestCase {
+    private $expectedTokensFile;
+    private $expectedDiagnosticsFile;
+    private $tokens;
+    private $diagnostics;
     public function run(TestResult $result = null) : TestResult {
         if (!isset($GLOBALS["GIT_CHECKOUT_PARSER"])) {
             $GLOBALS["GIT_CHECKOUT_PARSER"] = true;