comply with php 8.2

.github/workflows/main.yml

@@ -13,6 +13,7 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"

lib/PHPCfg/Op/Expr/Assertion.php

@@ -17,6 +17,8 @@
 
 class Assertion extends Expr
 {
+    public Operand $expr;
+
     public Operand $read;
 
     public Assert $assertion;

lib/PHPCfg/Parser.php

@@ -1403,7 +1403,7 @@ protected function readAssertion(Assertion $assert)
     protected function throwUndefinedLabelError()
     {
         foreach ($this->ctx->unresolvedGotos as $name => $_) {
-            throw new \RuntimeException("'goto' to undefined label '${name}'");
+            throw new \RuntimeException("'goto' to undefined label '{$name}'");
         }
     }
 

lib/PHPCfg/Printer.php

@@ -85,7 +85,7 @@ protected function renderOperand(Operand $var)
         if ($var instanceof Temporary) {
             $id = $this->getVarId($var);
             if ($var->original) {
-                return "Var{$type}#${id}".'<'.$this->renderOperand($var->original).'>';
+                return "Var{$type}#{$id}".'<'.$this->renderOperand($var->original).'>';
             }
 
             return "Var{$type}#".$this->getVarId($var);
@@ -96,7 +96,7 @@ protected function renderOperand(Operand $var)
         if (is_array($var)) {
             $result = 'array'.$type;
             foreach ($var as $k => $v) {
-                $result .= "\n    ${k}: ".$this->indent($this->renderOperand($v));
+                $result .= "\n    {$k}: ".$this->indent($this->renderOperand($v));
             }
 
             return $result;
@@ -137,11 +137,11 @@ protected function renderOp(Op $op)
                     if (! $var) {
                         continue;
                     }
-                    $result .= "\n    {$varName}[${key}]: ";
+                    $result .= "\n    {$varName}[{$key}]: ";
                     $result .= $this->indent($this->renderOperand($var));
                 }
             } elseif ($vars) {
-                $result .= "\n    ${varName}: ";
+                $result .= "\n    {$varName}: ";
                 $result .= $this->indent($this->renderOperand($vars));
             }
         }

lib/PHPCfg/Printer/GraphViz.php

@@ -105,7 +105,7 @@ protected function printFuncWithHeader(Func $func, Graph $graph, $prefix)
     {
         $name = $func->getScopedName();
         $header = $this->createNode(
-            $prefix.'header', "Function ${name}():"
+            $prefix.'header', "Function {$name}():"
         );
         $graph->setNode($header);
 

lib/PHPCfg/Printer/Text.php

@@ -23,7 +23,7 @@ public function printScript(Script $script)
         $output .= $this->printFunc($script->main);
         foreach ($script->functions as $func) {
             $name = var_export($func->getScopedName(), true);
-            $output .= "\nFunction ${name}:";
+            $output .= "\nFunction {$name}:";
             $output .= ' ' . $this->renderType($func->returnType);
             $output .= $this->printFunc($func);
         }
@@ -61,7 +61,7 @@ public function printVars(Func $func)
         $output = '';
         foreach ($rendered['varIds'] as $var) {
             $id = $rendered['varIds'][$var];
-            $output .= "\nVar#${id}";
+            $output .= "\nVar#{$id}";
             $output .= $this->indent("\n".'WriteOps:');
             foreach ($var->ops as $writeOp) {
                 if ($rendered['ops']->contains($writeOp)) {

test/PHPCfg/NameResolverTest.php

@@ -32,12 +32,12 @@ public function testIgnoresInvalidParamTypeInDocComment($type)
     {
         $doccomment = <<< EOF
 /**
- * @param ${type} \$a
+ * @param {$type} \$a
  */
 EOF;
         $code = <<< EOF
 <?php
-${doccomment}
+{$doccomment}
 function foo(\$a) {}
 EOF;
         $ast = $this->astParser->parse($code);
@@ -76,7 +76,7 @@ class Bar {}
 namespace {
 	use Foo\\Bar;
 
-	${original}
+	{$original}
 	function baz(Bar \$bar) {}
 }
 EOF;
@@ -107,7 +107,7 @@ class Bar {}
 namespace {
 	use Foo\\Bar as Quux;
 
-	${original}
+	{$original}
 	function baz(Quux \$bar) {}
 }
 EOF;