Added PriorityDefinition to sort dependencies. (#5646)

Author: limingxinleo

src/Definition/DefinitionSource.php

@@ -102,15 +102,21 @@ private function normalizeSource(array $source): array
      */
     private function normalizeDefinition(string $identifier, $definition): ?DefinitionInterface
     {
+        if ($definition instanceof PriorityDefinition) {
+            $definition = $definition->getDefinition();
+        }
+
         if (is_string($definition) && class_exists($definition)) {
             if (method_exists($definition, '__invoke')) {
                 return new FactoryDefinition($identifier, $definition, []);
             }
             return $this->autowire($identifier, new ObjectDefinition($identifier, $definition));
         }
+
         if (is_callable($definition)) {
             return new FactoryDefinition($identifier, $definition, []);
         }
+
         return null;
     }
 

src/Definition/PriorityDefinition.php

@@ -0,0 +1,50 @@
+<?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\Definition;
+
+class PriorityDefinition
+{
+    /**
+     * @var array<string, int>
+     */
+    protected array $dependencies = [];
+
+    public function __construct(string $class, int $priority = 0)
+    {
+        $this->dependencies[$class] = $priority;
+    }
+
+    public function getDependencies(): array
+    {
+        return $this->dependencies;
+    }
+
+    public function merge(PriorityDefinition $factory): static
+    {
+        foreach ($factory->getDependencies() as $class => $priority) {
+            if (isset($this->dependencies[$class]) && $priority <= $this->dependencies[$class]) {
+                continue;
+            }
+
+            $this->dependencies[$class] = $priority;
+        }
+
+        return $this;
+    }
+
+    public function getDefinition(): string
+    {
+        $dependencies = array_flip($this->dependencies);
+        ksort($dependencies);
+        return array_pop($dependencies);
+    }
+}

tests/Definition/PriorityDefinitionTest.php

@@ -0,0 +1,74 @@
+<?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\Definition;
+
+use Hyperf\Di\Definition\PriorityDefinition;
+use HyperfTest\Config\Stub\ProviderConfig;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+class PriorityDefinitionTest extends TestCase
+{
+    public function testProviderConfigLoad()
+    {
+        $result = ProviderConfig::merge(
+            [
+                'dependencies' => [
+                    'foo' => 'foo1',
+                ],
+            ],
+            [
+                'dependencies' => [
+                    'foo' => 'foo2',
+                ],
+            ]
+        );
+
+        $this->assertSame('foo2', $result['dependencies']['foo']);
+
+        $result = ProviderConfig::merge(
+            [
+                'dependencies' => [
+                    'foo' => new PriorityDefinition('foo', 1),
+                ],
+            ],
+            [
+                'dependencies' => [
+                    'foo' => 'foo2',
+                ],
+            ]
+        );
+
+        $this->assertSame('foo', $result['dependencies']['foo']->getDefinition());
+
+        $result = ProviderConfig::merge(
+            [
+                'dependencies' => [
+                    'foo' => new PriorityDefinition('foo', 2),
+                    'bar' => 'bar1',
+                ],
+            ],
+            [
+                'dependencies' => [
+                    'foo' => new PriorityDefinition('foo3', 1),
+                    'bar' => 'bar2',
+                ],
+            ]
+        );
+
+        $this->assertSame('foo', $result['dependencies']['foo']->getDefinition());
+        $this->assertSame('bar2', $result['dependencies']['bar']);
+    }
+}