Encapsulated the code for reading aspect meta properties. (#3944)

* Format code

* Update CHANGELOG-2.2.md

* Added test cases.

Co-authored-by: 李铭昕 <[email protected]>

Author: VinchanGit

src/Annotation/Aspect.php

@@ -12,8 +12,6 @@
 namespace Hyperf\Di\Annotation;
 
 use Attribute;
-use Hyperf\Di\ReflectionManager;
-use ReflectionProperty;
 
 /**
  * @Annotation
@@ -45,20 +43,7 @@ public function collectClass(string $className): void
 
     protected function collect(string $className)
     {
-        // Create the aspect instance without invoking their constructor.
-        $reflectionClass = ReflectionManager::reflectClass($className);
-        $properties = $reflectionClass->getProperties(ReflectionProperty::IS_PUBLIC);
-        $instanceClasses = $instanceAnnotations = [];
-        $instancePriority = null;
-        foreach ($properties as $property) {
-            if ($property->getName() === 'classes') {
-                $instanceClasses = ReflectionManager::getPropertyDefaultValue($property);
-            } elseif ($property->getName() === 'annotations') {
-                $instanceAnnotations = ReflectionManager::getPropertyDefaultValue($property);
-            } elseif ($property->getName() === 'priority') {
-                $instancePriority = ReflectionManager::getPropertyDefaultValue($property);
-            }
-        }
+        [$instanceClasses, $instanceAnnotations, $instancePriority] = AspectLoader::load($className);
 
         // Classes
         $classes = $this->classes;

src/Annotation/AspectLoader.php

@@ -0,0 +1,40 @@
+<?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 Hyperf\Di\Annotation;
+
+use Hyperf\Di\ReflectionManager;
+use ReflectionProperty;
+
+class AspectLoader
+{
+    /**
+     * Load classes annotations and priority from aspect without invoking their constructor.
+     */
+    public static function load(string $className): array
+    {
+        $reflectionClass = ReflectionManager::reflectClass($className);
+        $properties = $reflectionClass->getProperties(ReflectionProperty::IS_PUBLIC);
+        $instanceClasses = $instanceAnnotations = [];
+        $instancePriority = null;
+        foreach ($properties as $property) {
+            if ($property->getName() === 'classes') {
+                $instanceClasses = ReflectionManager::getPropertyDefaultValue($property);
+            } elseif ($property->getName() === 'annotations') {
+                $instanceAnnotations = ReflectionManager::getPropertyDefaultValue($property);
+            } elseif ($property->getName() === 'priority') {
+                $instancePriority = ReflectionManager::getPropertyDefaultValue($property);
+            }
+        }
+
+        return [$instanceClasses, $instanceAnnotations, $instancePriority];
+    }
+}

src/Annotation/Scanner.php

@@ -20,7 +20,6 @@
 use Hyperf\Di\ReflectionManager;
 use Hyperf\Utils\Filesystem\Filesystem;
 use ReflectionClass;
-use ReflectionProperty;
 
 class Scanner
 {
@@ -302,20 +301,7 @@ protected function loadAspects(int $lastCacheModified): void
                 continue;
             }
 
-            // Create the aspect instance without invoking their constructor.
-            $reflectionClass = ReflectionManager::reflectClass($aspect);
-            $properties = $reflectionClass->getProperties(ReflectionProperty::IS_PUBLIC);
-            $instanceClasses = $instanceAnnotations = [];
-            $instancePriority = null;
-            foreach ($properties as $property) {
-                if ($property->getName() === 'classes') {
-                    $instanceClasses = ReflectionManager::getPropertyDefaultValue($property);
-                } elseif ($property->getName() === 'annotations') {
-                    $instanceAnnotations = ReflectionManager::getPropertyDefaultValue($property);
-                } elseif ($property->getName() === 'priority') {
-                    $instancePriority = ReflectionManager::getPropertyDefaultValue($property);
-                }
-            }
+            [$instanceClasses, $instanceAnnotations, $instancePriority] = AspectLoader::load($aspect);
 
             $classes = $instanceClasses ?: [];
             // Annotations

src/Definition/DefinitionSource.php

@@ -75,7 +75,7 @@ private function getParametersDefinition(ReflectionFunctionAbstract $constructor
             }
 
             $parameterType = $parameter->getType();
-            if ($parameterType && $parameterType instanceof \ReflectionNamedType && ! $parameterType->isBuiltin()) {
+            if ($parameterType instanceof \ReflectionNamedType && ! $parameterType->isBuiltin()) {
                 $parameters[$index] = new Reference($parameterType->getName());
             }
         }

src/MetadataCollector.php

@@ -71,8 +71,7 @@ public static function serialize(): string
      */
     public static function deserialize(string $metadata): bool
     {
-        $data = unserialize($metadata);
-        static::$container = $data;
+        static::$container = unserialize($metadata);
         return true;
     }
 

tests/Annotation/AspectLoaderTest.php

@@ -0,0 +1,40 @@
+<?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\Annotation;
+
+use Hyperf\Di\Annotation\AspectLoader;
+use Hyperf\Di\Annotation\Inject;
+use HyperfTest\Di\Stub\Aspect\Debug1Aspect;
+use HyperfTest\Di\Stub\Aspect\DebugLoaderAspect;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+class AspectLoaderTest extends TestCase
+{
+    public function testLoad()
+    {
+        [$classes, $annotations, $priority] = AspectLoader::load(Debug1Aspect::class);
+
+        $this->assertSame(['Debug1AspectFoo'], $classes);
+        $this->assertSame([], $annotations);
+        $this->assertSame(null, $priority);
+
+        [$classes, $annotations, $priority] = AspectLoader::load(DebugLoaderAspect::class);
+
+        $this->assertSame(['Debug1AspectFoo'], $classes);
+        $this->assertSame([Inject::class], $annotations);
+        $this->assertSame(100, $priority);
+    }
+}

tests/Stub/Aspect/DebugLoaderAspect.php

@@ -0,0 +1,34 @@
+<?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\Annotation\Inject;
+use Hyperf\Di\Aop\AbstractAspect;
+use Hyperf\Di\Aop\ProceedingJoinPoint;
+
+class DebugLoaderAspect extends AbstractAspect
+{
+    public $classes = [
+        'Debug1AspectFoo',
+    ];
+
+    public $annotations = [
+        Inject::class,
+    ];
+
+    public $priority = 100;
+
+    public function process(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        return $proceedingJoinPoint->process();
+    }
+}