Optimized AnnotationJob to support call protected / private methods. (#7604)

Author: huangdijia

src/AnnotationJob.php

@@ -18,17 +18,10 @@
 
 class AnnotationJob extends Job
 {
-    public string $class;
-
-    public string $method;
-
     public array $params = [];
 
-    public function __construct(string $class, string $method, array $params, int $maxAttempts = 0)
+    public function __construct(public string $class, public string $method, array $params, public int $maxAttempts = 0)
     {
-        $this->class = $class;
-        $this->method = $method;
-        $this->maxAttempts = $maxAttempts;
         foreach ($params as $key => $value) {
             if ($value instanceof CompressInterface) {
                 $value = $value->compress();
@@ -40,10 +33,9 @@ public function __construct(string $class, string $method, array $params, int $m
     public function handle()
     {
         $container = ApplicationContext::getContainer();
-
-        $class = $container->get($this->class);
-
+        $instance = $container->get($this->class);
         $params = [];
+
         foreach ($this->params as $key => $value) {
             if ($value instanceof UnCompressInterface) {
                 $value = $value->uncompress();
@@ -53,6 +45,8 @@ public function handle()
 
         $container->get(Environment::class)->setAsyncQueue(true);
 
-        $class->{$this->method}(...$params);
+        $method = $this->method;
+
+        (fn () => $this->{$method}(...$params))->call($instance);
     }
 }

tests/AsyncQueueAspectTest.php

@@ -20,17 +20,21 @@
 use Hyperf\AsyncQueue\Environment;
 use Hyperf\Context\ApplicationContext;
 use Hyperf\Context\Context;
+use Hyperf\Coroutine\Waiter;
 use Hyperf\Di\Annotation\AnnotationCollector;
 use Hyperf\Di\Annotation\Aspect;
 use Hyperf\Di\Aop\Ast;
 use Hyperf\Di\ReflectionManager;
 use HyperfTest\AsyncQueue\Stub\FooProxy;
+use HyperfTest\AsyncQueue\Stub\FooService;
 use Mockery;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
+use function Hyperf\Coroutine\wait;
+
 /**
  * @internal
  * @coversNothing
@@ -84,6 +88,28 @@ public function testAsyncMessageVariadic()
         $this->assertSame([$id, $uuid, $data], Context::get(FooProxy::class));
     }
 
+    public function testAnnotationJob()
+    {
+        $container = Mockery::mock(ContainerInterface::class);
+        ApplicationContext::setContainer($container);
+        $container->shouldReceive('get')->with(Waiter::class)->andReturn(new Waiter());
+
+        wait(function () use ($container) {
+            $container->shouldReceive('get')->with(FooService::class)->andReturn(new FooService());
+            $container->shouldReceive('get')->with(Environment::class)->andReturn(new Environment());
+
+            $job = new AnnotationJob(FooService::class, 'test', []);
+            $job->handle();
+
+            $this->assertSame(1, Context::get(FooService::class . '::test'));
+
+            $job = new AnnotationJob(FooService::class, 'foo', []);
+            $job->handle();
+
+            $this->assertSame(1, Context::get(FooService::class . '::foo'));
+        });
+    }
+
     protected function getContainer()
     {
         $container = Mockery::mock(ContainerInterface::class);

tests/Stub/FooService.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace HyperfTest\AsyncQueue\Stub;
+
+use Hyperf\Context\Context;
+
+class FooService
+{
+    public function test()
+    {
+        Context::set(self::class . '::test', 1);
+    }
+
+    protected function foo()
+    {
+        Context::set(self::class . '::foo', 1);
+    }
+}