Optimized error message when does not set the value of @var for @Inject. (#2429)

Author: limingxinleo

src/Annotation/Inject.php

@@ -74,6 +74,8 @@ public function collectProperty(string $className, ?string $target): void
                 throw $exception;
             }
             $this->value = '';
+        } catch (\Throwable $exception) {
+            throw new AnnotationException("The @Inject value is invalid for {$className}->{$target}. Because {$exception->getMessage()}");
         }
     }
 }

tests/InjectTest.php

@@ -13,18 +13,21 @@
 
 use Hyperf\Contract\ContainerInterface;
 use Hyperf\Di\Annotation\AnnotationReader;
+use Hyperf\Di\Annotation\Inject;
 use Hyperf\Di\Annotation\ScanConfig;
 use Hyperf\Di\Annotation\Scanner;
 use Hyperf\Di\Aop\Ast;
 use Hyperf\Di\BetterReflectionManager;
 use Hyperf\Di\ClassLoader;
+use Hyperf\Di\Exception\AnnotationException;
 use Hyperf\Di\Exception\NotFoundException;
 use Hyperf\Utils\ApplicationContext;
 use HyperfTest\Di\ExceptionStub\DemoInjectException;
 use HyperfTest\Di\Stub\AnnotationCollector;
 use HyperfTest\Di\Stub\AspectCollector;
 use HyperfTest\Di\Stub\Demo;
 use HyperfTest\Di\Stub\DemoInject;
+use HyperfTest\Di\Stub\EmptyVarValue;
 use Mockery;
 use PHPUnit\Framework\TestCase;
 
@@ -76,6 +79,26 @@ public function testInjectException()
         }
     }
 
+    public function testInjectNotInitReflector()
+    {
+        $this->expectException(AnnotationException::class);
+        $this->expectExceptionMessage('The @Inject value is invalid for HyperfTest\Di\Stub\EmptyVarValue->demo. Because The class reflector object does not init yet');
+
+        $inject = new Inject();
+        $inject->collectProperty(EmptyVarValue::class, 'demo');
+    }
+
+    public function testInjectEmptyVar()
+    {
+        $this->expectException(AnnotationException::class);
+        $this->expectExceptionMessage('The @Inject value is invalid for HyperfTest\Di\Stub\EmptyVarValue->demo. Because Argument 1 passed to Roave\BetterReflection\TypesFinder\FindPropertyType::Roave\BetterReflection\TypesFinder\{closure}() must be an instance of phpDocumentor\Reflection\DocBlock\Tags\Var_, instance of phpDocumentor\Reflection\DocBlock\Tags\InvalidTag given');
+
+        BetterReflectionManager::initClassReflector([__DIR__ . '/Stub']);
+
+        $inject = new Inject();
+        $inject->collectProperty(EmptyVarValue::class, 'demo');
+    }
+
     protected function getContainer()
     {
         $container = Mockery::mock(ContainerInterface::class);

tests/Stub/EmptyVarValue.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;
+
+use Hyperf\Di\Annotation\Inject;
+
+class EmptyVarValue
+{
+    /**
+     * @Inject
+     * @var
+     */
+    private $demo;
+}