Depend on interface instead of instantiation (#4978)

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

Author: assert6

src/Container.php

@@ -146,6 +146,9 @@ public function has($id): bool
         return true;
     }
 
+    /**
+     * @deprecated
+     */
     public function getDefinitionSource(): Definition\DefinitionSourceInterface
     {
         return $this->definitionSource;

src/Definition/DefinitionSourceFactory.php

@@ -16,29 +16,21 @@
 
 class DefinitionSourceFactory
 {
-    protected string $baseUri;
-
-    public function __construct(protected bool $enableCache = false)
+    public function __invoke(): DefinitionSource
     {
         if (! defined('BASE_PATH')) {
             throw new Exception('BASE_PATH is not defined.');
         }
 
-        $this->baseUri = BASE_PATH;
-    }
-
-    public function __invoke()
-    {
-        $configDir = $this->baseUri . '/config';
-
         $configFromProviders = [];
         if (class_exists(ProviderConfig::class)) {
             $configFromProviders = ProviderConfig::load();
         }
 
         $serverDependencies = $configFromProviders['dependencies'] ?? [];
-        if (file_exists($configDir . '/autoload/dependencies.php')) {
-            $definitions = include $configDir . '/autoload/dependencies.php';
+        $dependenciesPath = BASE_PATH . '/config/autoload/dependencies.php';
+        if (file_exists($dependenciesPath)) {
+            $definitions = include $dependenciesPath;
             $serverDependencies = array_replace($serverDependencies, $definitions ?? []);
         }
 

tests/DefinitionSourceTest.php

@@ -26,7 +26,7 @@ class DefinitionSourceTest extends TestCase
     public function testAddDefinition()
     {
         $container = new Container(new DefinitionSource([]));
-        $container->getDefinitionSource()->addDefinition('Foo', function () {
+        $container->define('Foo', function () {
             return 'bar';
         });
         $this->assertEquals('bar', $container->get('Foo'));
@@ -35,7 +35,7 @@ public function testAddDefinition()
     public function testDefinitionFactory()
     {
         $container = new Container(new DefinitionSource([]));
-        $container->getDefinitionSource()->addDefinition('Foo', FooFactory::class);
+        $container->define('Foo', FooFactory::class);
 
         $foo = $container->get('Foo');
         $this->assertInstanceOf(Foo::class, $foo);