Remove ContainerFactory

odan · Sep 28, 2023 · 3e1c9ce · 3e1c9ce
1 parent 5749b21
commit 3e1c9ce
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 31 deletions.
diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -1,12 +1,14 @@
 <?php
 
-use App\Factory\ContainerFactory;
+use DI\ContainerBuilder;
 use Slim\App;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-// Build DI Container instance
-$container = ContainerFactory::createInstance();
+// Build DI container instance
+$containerBuilder = new ContainerBuilder();
+$containerBuilder->addDefinitions(__DIR__ . '/container.php');
+$container = $containerBuilder->build();
 
 // Create App instance
 return $container->get(App::class);
diff --git a/src/Factory/ContainerFactory.php b/src/Factory/ContainerFactory.php
diff --git a/tests/Traits/AppTestTrait.php b/tests/Traits/AppTestTrait.php
@@ -2,7 +2,7 @@
 
 namespace App\Test\Traits;
 
-use App\Factory\ContainerFactory;
+use DI\ContainerBuilder;
 use Selective\TestTrait\Traits\ArrayTestTrait;
 use Selective\TestTrait\Traits\ContainerTestTrait;
 use Selective\TestTrait\Traits\HttpJsonTestTrait;
@@ -29,7 +29,10 @@ trait AppTestTrait
      */
     protected function setUp(): void
     {
-        $container = ContainerFactory::createInstance();
+        $containerBuilder = new ContainerBuilder();
+        $containerBuilder->addDefinitions(__DIR__ . '/../../config/container.php');
+        $container = $containerBuilder->build();
+
         $this->app = $container->get(App::class);
 
         $this->setUpContainer($container);