Make container factory static

Remove route test trait
odan · Sep 1, 2022 · 0342485 · 0342485
1 parent e087fcb
commit 0342485
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 37 deletions.
diff --git a/bin/console.php b/bin/console.php
@@ -14,7 +14,7 @@
 }
 
 /** @var ContainerInterface $container */
-$container = (new ContainerFactory())->createInstance();
+$container = ContainerFactory::createInstance();
 
 try {
     /** @var Application $application */

diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -6,7 +6,7 @@
 require_once __DIR__ . '/../vendor/autoload.php';
 
 // Build DI Container instance
-$container = (new ContainerFactory())->createInstance();
+$container = ContainerFactory::createInstance();
 
 // Create App instance
 return $container->get(App::class);
diff --git a/src/Factory/ContainerFactory.php b/src/Factory/ContainerFactory.php
@@ -6,17 +6,14 @@
 use DI\ContainerBuilder;
 use Psr\Container\ContainerInterface;
 
-/**
- * Container Factory.
- */
 final class ContainerFactory
 {
     /**
-     * Get container.
+     * Create a new container instance.
      *
      * @return ContainerInterface|Container The container
      */
-    public function createInstance(): ContainerInterface
+    public static function createInstance(): ContainerInterface
     {
         $containerBuilder = new ContainerBuilder();
 

diff --git a/tests/Traits/AppTestTrait.php b/tests/Traits/AppTestTrait.php
@@ -21,7 +21,6 @@ trait AppTestTrait
     use HttpJsonTestTrait;
     use LoggerTestTrait;
     use MockTestTrait;
-    use RouteTestTrait;
 
     protected App $app;
 
@@ -32,7 +31,7 @@ trait AppTestTrait
      */
     protected function setUp(): void
     {
-        $container = (new ContainerFactory())->createInstance();
+        $container = ContainerFactory::createInstance();
         $this->app = $container->get(App::class);
 
         $this->setUpContainer($container);

diff --git a/tests/Traits/RouteTestTrait.php b/tests/Traits/RouteTestTrait.php