test/hyperf
1
0
Fork 0
mirror of https://gitee.com/hyperf/hyperf.git synced 2024-12-02 11:48:08 +08:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Fixed @Inject does not works.

Browse Source
This commit is contained in:
李铭昕 2020-04-15 16:51:57 +08:00
parent a8aea180f3
commit 1b7d03808b
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/autoload/src/Scanner.php
View File

@ -93,6 +93,7 @@ class Scanner
unset($finder, $astLocator, $annotationReader);
} catch (\Throwable $throwable) {
echo $throwable->getMessage() . PHP_EOL;
// var_dump((string)$throwable);
}
return $classes;
}

18
src/di/src/Annotation/Inject.php
View File

@ -15,8 +15,12 @@ namespace Hyperf\Di\Annotation;
use Hyperf\Autoload\AnnotationReader;
use Hyperf\Di\BetterReflectionManager;
use Hyperf\Di\ReflectionManager;
use Hyperf\Utils\Str;
use PhpDocReader\AnnotationException;
use PhpDocReader\PhpDocReader;
use phpDocumentor\Reflection\Type;
use phpDocumentor\Reflection\Types\Object_;
use Roave\BetterReflection\TypesFinder\FindPropertyType;
/**
* @Annotation
@ -40,21 +44,25 @@ class Inject extends AbstractAnnotation
public $lazy = false;
/**
* @var PhpDocReader
* @var FindPropertyType
*/
private $docReader;
private $typeInvoker;
public function __construct($value = null)
{
parent::__construct($value);
$this->docReader = make(PhpDocReader::class);
$this->typeInvoker = make(FindPropertyType::class);
}
public function collectProperty(string $className, ?string $target): void
{
try {
$reflectionProperty = BetterReflectionManager::reflectClass($className)->getProperty($target);
$this->value = $this->docReader->getPropertyClass($reflectionProperty);
$reflectionClass = BetterReflectionManager::reflectClass($className);
$reflectionProperty = $reflectionClass->getProperty($target);
$reflectionTypes = $this->typeInvoker->__invoke($reflectionProperty, $reflectionClass->getDeclaringNamespaceAst());
if ($reflectionTypes[0] instanceof Object_) {
$this->value = ltrim((string)$reflectionTypes[0], '\\');
}
AnnotationCollector::collectProperty($className, $target, static::class, $this);
if ($this->lazy) {
$this->value = 'HyperfLazy\\' . $this->value;