Optimized code for Hyperf\Di\Resolver\ResolverDispatcher. (#4977)

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

Author: assert6

src/Resolver/ResolverDispatcher.php

@@ -45,10 +45,10 @@ public function resolve(DefinitionInterface $definition, array $parameters = [])
 
         $guard = DepthGuard::getInstance();
 
-        return $guard->call($definition->getName(), function () use ($definition, $parameters) {
-            $resolver = $this->getDefinitionResolver($definition);
-            return $resolver->resolve($definition, $parameters);
-        });
+        return $guard->call(
+            $definition->getName(),
+            fn () => $this->getDefinitionResolver($definition)->resolve($definition, $parameters)
+        );
     }
 
     /**
@@ -65,10 +65,10 @@ public function isResolvable(DefinitionInterface $definition, array $parameters
 
         $guard = DepthGuard::getInstance();
 
-        return $guard->call($definition->getName(), function () use ($definition, $parameters) {
-            $resolver = $this->getDefinitionResolver($definition);
-            return $resolver->isResolvable($definition, $parameters);
-        });
+        return $guard->call(
+            $definition->getName(),
+            fn () => $this->getDefinitionResolver($definition)->isResolvable($definition, $parameters)
+        );
     }
 
     /**
@@ -78,19 +78,10 @@ public function isResolvable(DefinitionInterface $definition, array $parameters
      */
     private function getDefinitionResolver(DefinitionInterface $definition): ResolverInterface
     {
-        switch (true) {
-            case $definition instanceof ObjectDefinition:
-                if (! $this->objectResolver) {
-                    $this->objectResolver = new ObjectResolver($this->container, $this);
-                }
-                return $this->objectResolver;
-            case $definition instanceof FactoryDefinition:
-                if (! $this->factoryResolver) {
-                    $this->factoryResolver = new FactoryResolver($this->container, $this);
-                }
-                return $this->factoryResolver;
-            default:
-                throw new RuntimeException('No definition resolver was configured for definition of type ' . get_class($definition));
-        }
+        return match (true) {
+            $definition instanceof ObjectDefinition => $this->objectResolver ??= new ObjectResolver($this->container, $this),
+            $definition instanceof FactoryDefinition => $this->factoryResolver ??= new FactoryResolver($this->container, $this),
+            default => throw new RuntimeException('No definition resolver was configured for definition of type ' . get_class($definition)),
+        };
     }
 }

tests/ResolverDispatcherTest.php

@@ -0,0 +1,45 @@
+<?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;
+
+use Hyperf\Di\Definition\FactoryDefinition;
+use Hyperf\Di\Resolver\FactoryResolver;
+use Hyperf\Di\Resolver\ResolverDispatcher;
+use Hyperf\Utils\Reflection\ClassInvoker;
+use Mockery;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+class ResolverDispatcherTest extends TestCase
+{
+    protected function tearDown(): void
+    {
+        Mockery::close();
+    }
+
+    public function testGetDefinitionResolver()
+    {
+        $container = Mockery::mock(ContainerInterface::class);
+        $dispatcher = new ClassInvoker(new ResolverDispatcher($container));
+        $resolver = $dispatcher->getDefinitionResolver(Mockery::mock(FactoryDefinition::class));
+        $this->assertInstanceOf(FactoryResolver::class, $resolver);
+        $this->assertSame($resolver, $dispatcher->factoryResolver);
+
+        $resolver2 = $dispatcher->getDefinitionResolver(Mockery::mock(FactoryDefinition::class));
+        $this->assertInstanceOf(FactoryResolver::class, $resolver2);
+        $this->assertSame($resolver2, $dispatcher->factoryResolver);
+    }
+}