fix implicit nullable type depreciation

.github/workflows/main.yml

@@ -14,6 +14,8 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"

lib/PHPCfg/AbstractVisitor.php

@@ -34,15 +34,15 @@ public function leaveFunc(Func $func)
     {
     }
 
-    public function enterBlock(Block $block, Block $prior = null)
+    public function enterBlock(Block $block, ?Block $prior = null)
     {
     }
 
-    public function leaveBlock(Block $block, Block $prior = null)
+    public function leaveBlock(Block $block, ?Block $prior = null)
     {
     }
 
-    public function skipBlock(Block $block, Block $prior = null)
+    public function skipBlock(Block $block, ?Block $prior = null)
     {
     }
 

lib/PHPCfg/Block.php

@@ -24,7 +24,7 @@ class Block
 
     public $dead = false;
 
-    public function __construct(self $parent = null)
+    public function __construct(?self $parent = null)
     {
         if ($parent) {
             $this->parents[] = $parent;

lib/PHPCfg/Op.php

@@ -37,7 +37,7 @@ public function getFile(): string
         return $this->getAttribute('filename', 'unknown');
     }
 
-    public function &getAttribute(string $key, $default = null)
+    public function &getAttribute(string $key, mixed $default = null)
     {
         if (! $this->hasAttribute($key)) {
             return $default;

lib/PHPCfg/Op/Expr/ClassConstFetch.php

@@ -20,7 +20,7 @@ class ClassConstFetch extends Expr
 
     public Operand $name;
 
-    public function __construct(Operand $class, Operand $name = null, array $attributes = [])
+    public function __construct(Operand $class, ?Operand $name = null, array $attributes = [])
     {
         parent::__construct($attributes);
         $this->class = $this->addReadRef($class);

lib/PHPCfg/Op/Expr/Yield_.php

@@ -22,7 +22,7 @@ class Yield_ extends Expr
 
     protected array $writeVariables = ['result'];
 
-    public function __construct(Operand $value = null, Operand $key = null, array $attributes = [])
+    public function __construct(?Operand $value = null, ?Operand $key = null, array $attributes = [])
     {
         parent::__construct($attributes);
         if (is_null($value)) {

lib/PHPCfg/Op/Stmt/Property.php

@@ -35,7 +35,7 @@ class Property extends Stmt
 
     public Op\Type $declaredType ;
 
-    public function __construct(Operand $name, int $visiblity, bool $static, bool $readonly, array $attrGroups, Op\Type $declaredType = null, Operand $defaultVar = null, Block $defaultBlock = null, array $attributes = [])
+    public function __construct(Operand $name, int $visiblity, bool $static, bool $readonly, array $attrGroups, ?Op\Type $declaredType = null, ?Operand $defaultVar = null, ?Block $defaultBlock = null, array $attributes = [])
     {
         parent::__construct($attributes);
         $this->name = $this->addReadRef($name);

lib/PHPCfg/Op/Terminal/Exit_.php

@@ -18,7 +18,7 @@ class Exit_ extends Terminal
 {
     public ?Operand $expr = null;
 
-    public function __construct(Operand $expr = null, array $attributes = [])
+    public function __construct(?Operand $expr = null, array $attributes = [])
     {
         parent::__construct($attributes);
         if (!is_null($expr)) {

lib/PHPCfg/Op/Terminal/Return_.php

@@ -18,7 +18,7 @@ class Return_ extends Terminal
 {
     public ?Operand $expr = null;
 
-    public function __construct(Operand $expr = null, array $attributes = [])
+    public function __construct(?Operand $expr = null, array $attributes = [])
     {
         parent::__construct($attributes);
         if (!is_null($expr)) {

lib/PHPCfg/Op/Terminal/StaticVar.php

@@ -23,7 +23,7 @@ class StaticVar extends Terminal
 
     public ?Operand $defaultVar;
 
-    public function __construct(Operand $var, Block $defaultBlock = null, Operand $defaultVar = null, array $attributes = [])
+    public function __construct(Operand $var, ?Block $defaultBlock = null, ?Operand $defaultVar = null, array $attributes = [])
     {
         parent::__construct($attributes);
         $this->var = $this->addWriteRef($var);

lib/PHPCfg/Operand/BoundVariable.php

@@ -25,9 +25,9 @@ class BoundVariable extends Variable
 
     public $scope;
 
-    public $extra;
+    public ?Operand $extra;
 
-    public function __construct($name, bool $byRef, int $scope = self::SCOPE_GLOBAL, $extra = null)
+    public function __construct($name, bool $byRef, int $scope = self::SCOPE_GLOBAL, ?Operand $extra = null)
     {
         parent::__construct($name);
         $this->byRef = $byRef;

lib/PHPCfg/Operand/Temporary.php

@@ -22,7 +22,7 @@ class Temporary extends Operand
      *
      * @param Operand|null $original The previous variable this was constructed from
      */
-    public function __construct(Operand $original = null)
+    public function __construct(?Operand $original = null)
     {
         $this->original = $original;
     }

lib/PHPCfg/Parser.php

@@ -47,17 +47,16 @@ class Parser
     /** @var FuncContext */
     protected $ctx;
 
-    /** @var Literal|null */
-    protected $currentClass = null;
+    protected ?Literal $currentClass = null;
 
-    protected $currentNamespace = null;
+    protected ?Node\Name $currentNamespace = null;
 
     /** @var Script */
     protected $script;
 
     protected $anonId = 0;
 
-    public function __construct(AstParser $astParser, AstTraverser $astTraverser = null)
+    public function __construct(AstParser $astParser, ?AstTraverser $astTraverser = null)
     {
         $this->astParser = $astParser;
         if (! $astTraverser) {

lib/PHPCfg/Traverser.php

@@ -52,7 +52,7 @@ public function traverseFunc(Func $func)
         $this->seen = null;
     }
 
-    private function traverseBlock(Block $block, Block $prior = null)
+    private function traverseBlock(Block $block, ?Block $prior = null)
     {
         if ($this->seen->contains($block)) {
             $this->event('skipBlock', [$block, $prior]);

lib/PHPCfg/Visitor.php

@@ -25,13 +25,13 @@ public function enterFunc(Func $func);
 
     public function leaveFunc(Func $func);
 
-    public function enterBlock(Block $block, Block $prior = null);
+    public function enterBlock(Block $block, ?Block $prior = null);
 
     public function enterOp(Op $op, Block $block);
 
     public function leaveOp(Op $op, Block $block);
 
-    public function leaveBlock(Block $block, Block $prior = null);
+    public function leaveBlock(Block $block, ?Block $prior = null);
 
-    public function skipBlock(Block $block, Block $prior = null);
+    public function skipBlock(Block $block, ?Block $prior = null);
 }

lib/PHPCfg/Visitor/DebugVisitor.php

@@ -32,7 +32,7 @@ public function leaveScript(Script $script)
         echo "Leave Script\n";
     }
 
-    public function enterBlock(Block $block, Block $prior = null)
+    public function enterBlock(Block $block, ?Block $prior = null)
     {
         echo 'Enter Block #'.$this->getBlockId($block)."\n";
     }
@@ -47,12 +47,12 @@ public function leaveOp(Op $op, Block $block)
         echo 'Leave Op '.$op->getType()."\n";
     }
 
-    public function leaveBlock(Block $block, Block $prior = null)
+    public function leaveBlock(Block $block, ?Block $prior = null)
     {
         echo 'Leave Block #'.$this->getBlockId($block)."\n";
     }
 
-    public function skipBlock(Block $block, Block $prior = null)
+    public function skipBlock(Block $block, ?Block $prior = null)
     {
         echo 'Skip Block #'.$this->getBlockId($block)."\n";
     }

lib/PHPCfg/Visitor/VariableFinder.php

@@ -29,7 +29,7 @@ public function getVariables()
         return $this->variables;
     }
 
-    public function enterBlock(Block $block, Block $prior = null)
+    public function enterBlock(Block $block, ?Block $prior = null)
     {
         foreach ($block->phi as $phi) {
             $this->enterOp($phi, $block);