CycleDynamicFactory now uses Injector from container

yiisoft · Nov 13, 2020 · d5dda92 · d5dda92
1 parent 767dc8d
commit d5dda92
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/config/common.php b/config/common.php
@@ -11,6 +11,7 @@
 use Spiral\Core\FactoryInterface as SpiralFactoryInterface;
 use Spiral\Database\DatabaseManager;
 use Spiral\Database\DatabaseProviderInterface;
+use Yiisoft\Injector\Injector;
 use Yiisoft\Yii\Cycle\Exception\SchemaWasNotProvidedException;
 use Yiisoft\Yii\Cycle\Factory\CycleDynamicFactory;
 use Yiisoft\Yii\Cycle\Factory\DbalFactory;
@@ -32,7 +33,9 @@
     // Cycle ORM
     ORMInterface::class => new OrmFactory($params['yiisoft/yii-cycle']['orm-promise-factory']),
     // Spiral Core Factory
-    SpiralFactoryInterface::class => static fn (ContainerInterface $container) => new CycleDynamicFactory($container),
+    SpiralFactoryInterface::class => static function (ContainerInterface $container) {
+        return new CycleDynamicFactory($container->get(Injector::class));
+    },
     // Factory for Cycle ORM
     CycleFactoryInterface::class => static function (ContainerInterface $container) {
         return new Factory(

diff --git a/src/Factory/CycleDynamicFactory.php b/src/Factory/CycleDynamicFactory.php
@@ -4,16 +4,15 @@
 
 namespace Yiisoft\Yii\Cycle\Factory;
 
-use Psr\Container\ContainerInterface;
 use Spiral\Core\FactoryInterface;
 use Yiisoft\Injector\Injector;
 
 final class CycleDynamicFactory implements FactoryInterface
 {
     private Injector $injector;
-    public function __construct(ContainerInterface $container)
+    public function __construct(Injector $injector)
     {
-        $this->injector = new Injector($container);
+        $this->injector = $injector;
     }
 
     public function make(string $alias, array $parameters = [])

diff --git a/tests/Factory/DbalFactory/BaseDbalFactoryTest.php b/tests/Factory/DbalFactory/BaseDbalFactoryTest.php
@@ -9,6 +9,7 @@
 use Psr\Log\NullLogger;
 use Spiral\Core\FactoryInterface;
 use Yiisoft\Aliases\Aliases;
+use Yiisoft\Injector\Injector;
 use Yiisoft\Test\Support\Container\Exception\NotFoundException;
 use Yiisoft\Test\Support\Container\SimpleContainer;
 use Yiisoft\Yii\Cycle\Factory\CycleDynamicFactory;
@@ -30,7 +31,7 @@ protected function setUp(): void
             ],
             function (string $id) {
                 if ($id === FactoryInterface::class) {
-                    return new CycleDynamicFactory($this->container);
+                    return new CycleDynamicFactory(new Injector($this->container));
                 }
                 throw new NotFoundException($id);
             }