Adapt to DI changes (#6)

yiisoft · Nov 26, 2021 · d18ffa8 · d18ffa8
1 parent 8beea20
commit d18ffa8
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/ConsoleApplicationRunner.php b/src/ConsoleApplicationRunner.php
@@ -10,6 +10,7 @@
 use Throwable;
 use Yiisoft\Config\Config;
 use Yiisoft\Di\Container;
+use Yiisoft\Di\ContainerConfig;
 use Yiisoft\Definitions\Exception\CircularReferenceException;
 use Yiisoft\Definitions\Exception\InvalidConfigException;
 use Yiisoft\Definitions\Exception\NotFoundException;
@@ -109,13 +110,16 @@ public function run(): void
     {
         $config = $this->config ?? ConfigFactory::create($this->rootPath, $this->environment);
 
-        $container = $this->container ?? new Container(
-            $config->get('console'),
-            $config->get('providers-console'),
-            [],
-            $this->debug,
-            $config->get('delegates-console')
-        );
+        $container = $this->container;
+        if ($container === null) {
+            $containerConfig = ContainerConfig::create()
+                ->withDefinitions($config->get('console'))
+                ->withProviders($config->get('providers-console'))
+                ->withValidate($this->debug)
+                ->withDelegates($config->get('delegates-console'));
+
+            $container = new Container($containerConfig);
+        }
 
         if ($container instanceof Container) {
             $container = $container->get(ContainerInterface::class);