处理方法返回值

imiphp · Nov 6, 2023 · 0cbc144 · 0cbc144
1 parent 1417c1b
commit 0cbc144
Show file tree

Hide file tree

Showing 93 changed files with 139 additions and 397 deletions.
diff --git a/src/Aop/Aop/FilterArgAop.php b/src/Aop/Aop/FilterArgAop.php
@@ -18,12 +18,10 @@ class FilterArgAop
 {
     /**
      * 过滤方法参数.
-     *
-     * @return mixed
      */
     #[PointCut(type: \Imi\Aop\PointCutType::ANNOTATION, allow: [\Imi\Aop\Annotation\FilterArg::class])]
     #[Before]
-    public function parse(JoinPoint $joinPoint)
+    public function parse(JoinPoint $joinPoint): void
     {
         $class = BeanFactory::getObjectClass($joinPoint->getTarget());
         $method = $joinPoint->getMethod();

diff --git a/src/Aop/Aop/InjectArgAop.php b/src/Aop/Aop/InjectArgAop.php
@@ -18,12 +18,10 @@ class InjectArgAop
 {
     /**
      * 方法参数注入.
-     *
-     * @return mixed
      */
     #[PointCut(type: \Imi\Aop\PointCutType::ANNOTATION, allow: [\Imi\Aop\Annotation\InjectArg::class])]
     #[Around]
-    public function parse(AroundJoinPoint $joinPoint)
+    public function parse(AroundJoinPoint $joinPoint): mixed
     {
         $class = BeanFactory::getObjectClass($joinPoint->getTarget());
         $method = $joinPoint->getMethod();

diff --git a/src/Async/Aop/AsyncAop.php b/src/Async/Aop/AsyncAop.php
@@ -18,12 +18,10 @@ class AsyncAop
 {
     /**
      * 异步执行.
-     *
-     * @return mixed
      */
     #[PointCut(type: \Imi\Aop\PointCutType::ANNOTATION, allow: [\Imi\Async\Annotation\Async::class])]
     #[Around]
-    public function parseAsync(AroundJoinPoint $joinPoint)
+    public function parseAsync(AroundJoinPoint $joinPoint): mixed
     {
         $result = \Imi\Async\Async::exec(static fn () => $joinPoint->proceed());
         $className = BeanFactory::getObjectClass($joinPoint->getTarget());
@@ -32,16 +30,16 @@ public function parseAsync(AroundJoinPoint $joinPoint)
         {
             return $result;
         }
+
+        return null;
     }
 
     /**
      * 延后执行.
-     *
-     * @return mixed
      */
     #[PointCut(type: \Imi\Aop\PointCutType::ANNOTATION, allow: [\Imi\Async\Annotation\Defer::class])]
     #[Around]
-    public function parseDefer(AroundJoinPoint $joinPoint)
+    public function parseDefer(AroundJoinPoint $joinPoint): mixed
     {
         $result = \Imi\Async\Async::defer(static fn () => $joinPoint->proceed());
         $className = BeanFactory::getObjectClass($joinPoint->getTarget());
@@ -50,16 +48,16 @@ public function parseDefer(AroundJoinPoint $joinPoint)
         {
             return $result;
         }
+
+        return null;
     }
 
     /**
      * 延后执行.
-     *
-     * @return mixed
      */
     #[PointCut(type: \Imi\Aop\PointCutType::ANNOTATION, allow: [\Imi\Async\Annotation\DeferAsync::class])]
     #[Around]
-    public function parseDeferAsync(AroundJoinPoint $joinPoint)
+    public function parseDeferAsync(AroundJoinPoint $joinPoint): mixed
     {
         $result = \Imi\Async\Async::deferAsync(static fn () => $joinPoint->proceed());
         $className = BeanFactory::getObjectClass($joinPoint->getTarget());
@@ -68,5 +66,7 @@ public function parseDeferAsync(AroundJoinPoint $joinPoint)
         {
             return $result;
         }
+
+        return null;
     }
 }
diff --git a/src/Cache/Aop/CacheEvictAop.php b/src/Cache/Aop/CacheEvictAop.php
@@ -22,12 +22,10 @@ class CacheEvictAop
 
     /**
      * 处理 CacheEvict 注解.
-     *
-     * @return mixed
      */
     #[PointCut(type: \Imi\Aop\PointCutType::ANNOTATION, allow: [\Imi\Cache\Annotation\CacheEvict::class])]
     #[Around]
-    public function parseCacheEvict(AroundJoinPoint $joinPoint)
+    public function parseCacheEvict(AroundJoinPoint $joinPoint): mixed
     {
         $class = BeanFactory::getObjectClass($joinPoint->getTarget());
         $method = $joinPoint->getMethod();

diff --git a/src/Cache/Aop/CachePutAop.php b/src/Cache/Aop/CachePutAop.php
@@ -22,12 +22,10 @@ class CachePutAop
 
     /**
      * 处理 CachePut 注解.
-     *
-     * @return mixed
      */
     #[PointCut(type: \Imi\Aop\PointCutType::ANNOTATION, allow: [\Imi\Cache\Annotation\CachePut::class])]
     #[Around]
-    public function parseCachePut(AroundJoinPoint $joinPoint)
+    public function parseCachePut(AroundJoinPoint $joinPoint): mixed
     {
         $methodReturn = $joinPoint->proceed();
         $method = $joinPoint->getMethod();

diff --git a/src/Cache/Aop/CacheableAop.php b/src/Cache/Aop/CacheableAop.php
@@ -24,12 +24,10 @@ class CacheableAop
 
     /**
      * 处理 Cacheable 注解.
-     *
-     * @return mixed
      */
     #[PointCut(type: \Imi\Aop\PointCutType::ANNOTATION, allow: [\Imi\Cache\Annotation\Cacheable::class])]
     #[Around]
-    public function parseCacheable(AroundJoinPoint $joinPoint)
+    public function parseCacheable(AroundJoinPoint $joinPoint): mixed
     {
         $target = $joinPoint->getTarget();
         $class = BeanFactory::getObjectClass($target);

diff --git a/src/Components/amqp/src/Queue/QueueConsumer.php b/src/Components/amqp/src/Queue/QueueConsumer.php
@@ -130,6 +130,7 @@ protected function bindConsumer(): void
     protected function consume(IMessage $message): mixed
     {
         $this->queue->push($message);
+
         return null;
     }
 }
diff --git a/src/Components/fpm/tests/Web/Controller/IndexController.php b/src/Components/fpm/tests/Web/Controller/IndexController.php
@@ -22,12 +22,9 @@
 #[Controller(prefix: '/')]
 class IndexController extends HttpController
 {
-    /**
-     * @return mixed
-     */
     #[Action]
     #[Route(url: '/')]
-    public function index()
+    public function index(): mixed
     {
         $response = RequestContext::get('response');
         $response->getBody()->write('imi');
@@ -178,11 +175,8 @@ public function redirect(): mixed
         return RequestContext::get('response')->redirect('/', StatusCode::MOVED_PERMANENTLY);
     }
 
-    /**
-     * @return mixed
-     */
     #[Action]
-    public function download(?string $contentType = null, ?string $outputFileName = null)
+    public function download(?string $contentType = null, ?string $outputFileName = null): mixed
     {
         return RequestContext::get('response')->sendFile(__FILE__, $contentType, $outputFileName);
     }
@@ -258,12 +252,9 @@ public function singletonResponse2(): void
         ResponseProxy::__setProxyInstance($this->response->withBody(new MemoryStream('imi niubi-2')));
     }
 
-    /**
-     * @return array
-     */
     #[Action]
     #[Route(url: '/type/{id}/{name}/{page}')]
-    public function type(int $id, string $name, int $page)
+    public function type(int $id, string $name, int $page): array
     {
         return compact('id', 'name', 'page');
     }

diff --git a/src/Components/grpc/example/ApiServer/Controller/IndexController.php b/src/Components/grpc/example/ApiServer/Controller/IndexController.php
@@ -20,23 +20,18 @@ class IndexController extends HttpController
     #[GrpcService(serviceName: 'grpc.AuthService', interface: 'Grpc\\AuthServiceInterface')]
     protected $authService;
 
-    /**
-     * @return mixed
-     */
     #[Action]
     #[Route(url: '/')]
-    public function index()
+    public function index(): mixed
     {
         return $this->response;
     }
 
     /**
      * 测试登录.
-     *
-     * @return mixed
      */
     #[Action]
-    public function testLogin(string $phone, string $password)
+    public function testLogin(string $phone, string $password): array
     {
         $request = new LoginRequest();
         $request->setPhone($phone);

diff --git a/src/Components/grpc/example/GrpcServer/Controller/ProxyController.php b/src/Components/grpc/example/GrpcServer/Controller/ProxyController.php
@@ -17,12 +17,9 @@ class ProxyController extends HttpController
     #[Inject(name: 'GrpcHttpProxy')]
     protected GrpcHttpProxy $grpcHttpProxy;
 
-    /**
-     * @return mixed
-     */
     #[Action]
     #[Route(url: 'grpc/{service}/{method}')]
-    public function proxy(string $service, string $method)
+    public function proxy(string $service, string $method): mixed
     {
         return $this->grpcHttpProxy->proxy('grpc', $this->request, $this->response, $service, $method);
     }

diff --git a/src/Components/grpc/src/Client/Contract/IGrpcService.php b/src/Components/grpc/src/Client/Contract/IGrpcService.php
@@ -12,10 +12,8 @@ interface IGrpcService extends IService
      * 发送请求
      * 成功返回 streamId
      * $metadata 格式：['key' => ['value']].
-     *
-     * @return int|bool
      */
-    public function send(string $method, \Google\Protobuf\Internal\Message $message, array $metadata = []);
+    public function send(string $method, \Google\Protobuf\Internal\Message $message, array $metadata = []): int|bool;
 
     /**
      * 接收响应结果.

diff --git a/src/Components/grpc/src/Client/GrpcClient.php b/src/Components/grpc/src/Client/GrpcClient.php
@@ -152,10 +152,8 @@ public function getOptions(): array
      * 发送请求
      *
      * $metadata 格式：['key' => ['value']]
-     *
-     * @return int|bool
      */
-    public function send(string $package, string $service, string $name, \Google\Protobuf\Internal\Message $message, array $metadata = [])
+    public function send(string $package, string $service, string $name, \Google\Protobuf\Internal\Message $message, array $metadata = []): int|bool
     {
         if (!$this->isConnected())
         {

diff --git a/src/Components/grpc/src/Client/GrpcService.php b/src/Components/grpc/src/Client/GrpcService.php
@@ -57,10 +57,8 @@ public function getName(): string
      * 发送请求
      * 成功返回 streamId
      * $metadata 格式：['key' => ['value']].
-     *
-     * @return int|bool
      */
-    public function send(string $method, \Google\Protobuf\Internal\Message $message, array $metadata = [])
+    public function send(string $method, \Google\Protobuf\Internal\Message $message, array $metadata = []): int|bool
     {
         return $this->client->send($this->package, $this->serviceName, $method, $message, $metadata);
     }

diff --git a/src/Components/jwt/src/Aop/JWTValidationAop.php b/src/Components/jwt/src/Aop/JWTValidationAop.php
@@ -24,12 +24,10 @@ class JWTValidationAop
 {
     /**
      * 环绕注入.
-     *
-     * @return mixed
      */
     #[PointCut(type: \Imi\Aop\PointCutType::ANNOTATION, allow: [\Imi\JWT\Annotation\JWTValidation::class])]
     #[Around]
-    public function around(AroundJoinPoint $joinPoint)
+    public function around(AroundJoinPoint $joinPoint): mixed
     {
         $target = $joinPoint->getTarget();
         $class = BeanFactory::getObjectClass($target);

diff --git a/src/Components/jwt/src/Model/JWTConfig.php b/src/Components/jwt/src/Model/JWTConfig.php
@@ -59,8 +59,10 @@ class JWTConfig
      * 设为 true 则为当前时间
      * 设为 false 不设置
      * 其它值则直接写入.
+     *
+     * @var bool|mixed
      */
-    private bool $issuedAt = true;
+    private mixed $issuedAt = true;
 
     /**
      * Token id.
@@ -174,7 +176,7 @@ public function getSubject(): ?string
      *
      * @return bool|mixed
      */
-    public function getIssuedAt()
+    public function getIssuedAt(): mixed
     {
         return $this->issuedAt;
     }

diff --git a/src/Components/jwt/tests/Test/A.php b/src/Components/jwt/tests/Test/A.php
@@ -10,20 +10,14 @@
 #[Bean(name: 'A')]
 class A
 {
-    /**
-     * @return array
-     */
     #[JWTValidation(tokenParam: 'token', dataParam: 'data')]
-    public function test(?\Lcobucci\JWT\Token $token = null, ?\stdClass $data = null)
+    public function test(?\Lcobucci\JWT\Token $token = null, ?\stdClass $data = null): array
     {
         return [$token, $data];
     }
 
-    /**
-     * @return array
-     */
     #[JWTValidation(name: 'b', tokenParam: 'token', dataParam: 'data')]
-    public function testFail(?\Lcobucci\JWT\Token $token = null, ?\stdClass $data = null)
+    public function testFail(?\Lcobucci\JWT\Token $token = null, ?\stdClass $data = null): array
     {
         return [$token, $data];
     }

diff --git a/src/Components/kafka/example/ApiServer/Controller/IndexController.php b/src/Components/kafka/example/ApiServer/Controller/IndexController.php
@@ -17,23 +17,17 @@
 #[Controller(prefix: '/')]
 class IndexController extends HttpController
 {
-    /**
-     * @return mixed
-     */
     #[Action]
     #[Route(url: '/')]
-    public function index()
+    public function index(): mixed
     {
         $this->response->getBody()->write('imi');
 
         return $this->response;
     }
 
-    /**
-     * @return mixed
-     */
     #[Action]
-    public function publish(int $memberId = 19260817)
+    public function publish(int $memberId = 19260817): array
     {
         $producer = KafkaPool::getInstance();
         $producer->send('queue-imi-1', json_encode([
@@ -51,11 +45,8 @@ public function publish(int $memberId = 19260817)
         ];
     }
 
-    /**
-     * @return mixed
-     */
     #[Action]
-    public function consume(int $memberId)
+    public function consume(int $memberId): array
     {
         $r1 = Redis::get($key1 = 'imi-kafka:consume:1:' . $memberId);
         $r2 = Redis::get($key2 = 'imi-kafka:consume:QueueTest:' . $memberId);

diff --git a/src/Components/mqtt/example/MQTTServer/Controller/MQTTController.php b/src/Components/mqtt/example/MQTTServer/Controller/MQTTController.php
@@ -63,7 +63,7 @@ public function ping(PingRequestPacket $request, ReceiveData $receiveData): ?Pin
      *
      * @return \BinSoul\Net\Mqtt\Packet\PublishAckPacket|\BinSoul\Net\Mqtt\Packet\PublishReceivedPacket|\BinSoul\Net\Mqtt\Packet\PublishReleasePacket|\BinSoul\Net\Mqtt\Packet\PublishCompletePacket|null
      */
-    public function publish(PublishRequestPacket $request, ReceiveData $receiveData)
+    public function publish(PublishRequestPacket $request, ReceiveData $receiveData): mixed
     {
         switch ($request->getTopic())
         {