Add container in the AbstractKernel::create() signature

spiral · May 16, 2022 · a032037 · a032037
1 parent dc1346e
commit a032037
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/src/Boot/src/AbstractKernel.php b/src/Boot/src/AbstractKernel.php
@@ -89,8 +89,8 @@ public static function create(
         array $directories,
         bool $handleErrors = true,
         ExceptionHandlerInterface|string|null $exceptionHandler = null,
+        Container $container = new Container(),
     ): static {
-        $container = new Container();
         $exceptionHandler ??= ExceptionHandler::class;
 
         if (\is_string($exceptionHandler)) {
@@ -100,7 +100,7 @@ public static function create(
             $exceptionHandler->register();
         }
 
-        return new static(new Container(), $exceptionHandler, $directories);
+        return new static($container, $exceptionHandler, $directories);
     }
 
     /**

diff --git a/tests/Framework/KernelTest.php b/tests/Framework/KernelTest.php
@@ -1,20 +1,14 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Tests\Framework;
 
-use Spiral\Boot\Environment;
 use Spiral\Boot\Exception\BootException;
 use Spiral\Config\ConfiguratorInterface;
 use Spiral\App\TestApp;
+use Spiral\Core\Container;
+use stdClass;
 
 class KernelTest extends BaseTest
 {
@@ -45,4 +39,17 @@ public function testNoRootDirectory(): void
 
         TestApp::create([], false)->run();
     }
+
+    public function testCustomContainer(): void
+    {
+        $container = new Container();
+        $container->bind('foofoo', new stdClass());
+
+        $app = TestApp::create([
+            'root'    => __DIR__ . '/../..',
+        ], container: $container);
+
+        $this->assertSame($container, $app->getContainer());
+        $this->assertInstanceOf(stdClass::class, $app->get('foofoo'));
+    }
 }