fix call Non-static method statically (#2788)

* fix call Non-static method (__handlePropertyHandler) statically

* Fixed test cases.

* Update CHANGELOG-2.0.md

Co-authored-by: 李铭昕 <[email protected]>

Author: bytehello

src/Aop/PropertyHandlerVisitor.php

@@ -65,12 +65,12 @@ public function leaveNode(Node $node)
             if ($this->visitorMetadata->hasExtends) {
                 $constructor->stmts[] = $this->buildCallParentConstructorStatement();
             }
-            $constructor->stmts[] = $this->buildStaticCallStatement();
+            $constructor->stmts[] = $this->buildMethodCallStatement();
             $node->stmts = array_merge([$this->buildProxyTraitUseStatement()], [$constructor], $node->stmts);
             $this->visitorMetadata->hasConstructor = true;
         } else {
             if ($node instanceof Node\Stmt\ClassMethod && $node->name->toString() === '__construct') {
-                $node->stmts = array_merge([$this->buildStaticCallStatement()], $node->stmts);
+                $node->stmts = array_merge([$this->buildMethodCallStatement()], $node->stmts);
             }
             if ($node instanceof Node\Stmt\Class_ && ! $node->isAnonymous()) {
                 $node->stmts = array_merge([$this->buildProxyTraitUseStatement()], $node->stmts);
@@ -115,9 +115,9 @@ protected function buildCallParentConstructorStatement(): Node\Stmt
         ]);
     }
 
-    protected function buildStaticCallStatement(): Node\Stmt\Expression
+    protected function buildMethodCallStatement(): Node\Stmt\Expression
     {
-        return new Node\Stmt\Expression(new Node\Expr\StaticCall(new Name('self'), '__handlePropertyHandler', [
+        return new Node\Stmt\Expression(new Node\Expr\MethodCall(new Node\Expr\Variable('this'), '__handlePropertyHandler', [
             new Node\Arg(new Node\Scalar\MagicConst\Class_()),
         ]));
     }

tests/AstTest.php

@@ -63,7 +63,7 @@ class Foo
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
     function __construct()
     {
-        self::__handlePropertyHandler(__CLASS__);
+        $this->__handlePropertyHandler(__CLASS__);
     }
 }', $code);
     }
@@ -83,7 +83,7 @@ class Bar2 extends Bar
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
     public function __construct(int $id)
     {
-        self::__handlePropertyHandler(__CLASS__);
+        $this->__handlePropertyHandler(__CLASS__);
         parent::__construct($id);
     }
     public static function build()
@@ -112,7 +112,7 @@ public function getBar() : Bar
         {
             public function __construct()
             {
-                self::__handlePropertyHandler(__CLASS__);
+                $this->__handlePropertyHandler(__CLASS__);
                 $this->id = 9501;
             }
         };
@@ -141,7 +141,7 @@ class Bar4
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
     function __construct()
     {
-        self::__handlePropertyHandler(__CLASS__);
+        $this->__handlePropertyHandler(__CLASS__);
     }
     public function toMethodString() : string
     {
@@ -185,7 +185,7 @@ function __construct(int $id)
         if (method_exists(parent::class, \'__construct\')) {
             parent::__construct(...func_get_args());
         }
-        self::__handlePropertyHandler(__CLASS__);
+        $this->__handlePropertyHandler(__CLASS__);
     }
     public function getId() : int
     {