support of anonymous classes (#72)

Generate a name for anonymous classes and treat them the same way as normal classes.
ircmaxell · Apr 12, 2021 · acc7cbc · acc7cbc
1 parent 270be13
commit acc7cbc
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 1 deletion.
diff --git a/lib/PHPCfg/AstVisitor/NameResolver.php b/lib/PHPCfg/AstVisitor/NameResolver.php
@@ -42,10 +42,19 @@ class NameResolver extends NameResolverParent
         'resource',
         'callable',
     ];
+
+    protected $anonymousClasses = 0;
 
     public function enterNode(Node $node)
     {
         parent::enterNode($node);
+
+        if ($node instanceof Node\Stmt\Class_ && is_null($node->name)) {
+            $anonymousName = "{anonymousClass}#".++$this->anonymousClasses;
+            $node->name = new \PhpParser\Node\Identifier($anonymousName);
+            $node->namespacedName = new \PhpParser\Node\Name($anonymousName);
+        }
+
         $comment = $node->getDocComment();
         if ($comment) {
             $regex = '(@(param|return|var|type)\\h+(\\S+))';

diff --git a/lib/PHPCfg/Parser.php b/lib/PHPCfg/Parser.php
@@ -1159,8 +1159,15 @@ protected function parseExpr_MethodCall(Expr\MethodCall $expr)
 
     protected function parseExpr_New(Expr\New_ $expr)
     {
+        if ($expr->class instanceof Node\Stmt\Class_) {
+          $this->parseStmt_Class($expr->class);
+          $classExpr = $expr->class->name;
+        } else {
+          $classExpr = $expr->class;
+        }
+
         return new Op\Expr\New_(
-            $this->readVariable($this->parseExprNode($expr->class)),
+            $this->readVariable($this->parseExprNode($classExpr)),
             $this->parseExprList($expr->args, self::MODE_READ),
             $this->mapAttributes($expr)
         );

diff --git a/test/code/anonymous_class.test b/test/code/anonymous_class.test
@@ -0,0 +1,28 @@
+<?php
+$var = new class {
+  function doSomething() {
+    echo "Hello World";
+  }
+};
+-----
+Block#1
+    Stmt_Class
+        name: LITERAL('{anonymousClass}#1')
+        stmts: Block#2
+    Expr_New
+        class: LITERAL('{anonymousClass}#1')
+        result: Var#1
+    Expr_Assign
+        var: Var#2<$var>
+        expr: Var#1
+        result: Var#3
+    Terminal_Return
+
+Block#2
+    Stmt_ClassMethod<doSomething>
+
+Function {anonymousClass}#1::doSomething(): mixed
+Block#1
+    Terminal_Echo
+        expr: LITERAL('Hello World')
+    Terminal_Return