Merge branch 'master' into 2.1

Author: limingxinleo

src/Aop/ProceedingJoinPoint.php

@@ -108,4 +108,11 @@ public function getReflectMethod(): \ReflectionMethod
             $this->methodName
         );
     }
+
+    public function getInstance(): ?object
+    {
+        $ref = new \ReflectionFunction($this->originalMethod);
+
+        return $ref->getClosureThis();
+    }
 }

tests/ProxyTraitTest.php

@@ -14,6 +14,7 @@
 use Hyperf\Di\Annotation\AnnotationCollector;
 use Hyperf\Di\Annotation\AspectCollector;
 use Hyperf\Utils\ApplicationContext;
+use HyperfTest\Di\Stub\Aspect\GetNameAspect;
 use HyperfTest\Di\Stub\Aspect\IncrAspect;
 use HyperfTest\Di\Stub\Aspect\IncrAspectAnnotation;
 use HyperfTest\Di\Stub\ProxyTraitObject;
@@ -47,6 +48,29 @@ public function testGetParamsMap()
         $this->assertEquals(['id', 'str', 'num'], $obj->get3(1, 'hy')['order']);
     }
 
+    public function testProceedingJoinPointGetInstance()
+    {
+        $aspect = [];
+        ApplicationContext::setContainer(value(function () use (&$aspect) {
+            $container = Mockery::mock(ContainerInterface::class);
+            $container->shouldReceive('get')->with(Mockery::any())->andReturnUsing(function ($class) use (&$aspect) {
+                $aspect[] = $class;
+                return new $class();
+            });
+            return $container;
+        }));
+
+        $obj = new ProxyTraitObject();
+        $this->assertSame('HyperfCloud', $obj->getName2());
+
+        AspectCollector::set('classes', [
+            GetNameAspect::class => [ProxyTraitObject::class],
+        ]);
+
+        $obj = new ProxyTraitObject();
+        $this->assertSame('Hyperf', $obj->getName());
+    }
+
     public function testHandleAround()
     {
         $aspect = [];

tests/Stub/Aspect/GetNameAspect.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  [email protected]
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace HyperfTest\Di\Stub\Aspect;
+
+use Hyperf\Di\Aop\AbstractAspect;
+use Hyperf\Di\Aop\ProceedingJoinPoint;
+
+class GetNameAspect extends AbstractAspect
+{
+    public function process(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        return $proceedingJoinPoint->getInstance()->name;
+    }
+}

tests/Stub/ProxyTraitObject.php

@@ -17,6 +17,16 @@ class ProxyTraitObject
 {
     use ProxyTrait;
 
+    /**
+     * @var string
+     */
+    public $name;
+
+    public function __construct(string $name = 'Hyperf')
+    {
+        $this->name = $name;
+    }
+
     public function get(?int $id, string $str = '')
     {
         return $this->__getParamsMap(static::class, 'get', func_get_args());
@@ -34,10 +44,22 @@ public function get3(?int $id = 1, string $str = '', float $num = 1.0)
 
     public function incr()
     {
-        $__function__ = __FUNCTION__;
-        $__method__ = __METHOD__;
-        return self::__proxyCall(ProxyTraitObject::class, __FUNCTION__, self::__getParamsMap(ProxyTraitObject::class, __FUNCTION__, func_get_args()), function () use ($__function__, $__method__) {
+        return self::__proxyCall(ProxyTraitObject::class, __FUNCTION__, self::__getParamsMap(ProxyTraitObject::class, __FUNCTION__, func_get_args()), function () {
             return 1;
         });
     }
+
+    public function getName()
+    {
+        return self::__proxyCall(ProxyTraitObject::class, __FUNCTION__, self::__getParamsMap(ProxyTraitObject::class, __FUNCTION__, func_get_args()), function () {
+            return 'HyperfCloud';
+        });
+    }
+
+    public function getName2()
+    {
+        return self::__proxyCall(ProxyTraitObject::class, __FUNCTION__, self::__getParamsMap(ProxyTraitObject::class, __FUNCTION__, func_get_args()), function () {
+            return 'HyperfCloud';
+        });
+    }
 }