wip

Author: brendt

packages/container/src/GenericContainer.php

@@ -30,7 +30,7 @@ public function __construct(
         private ArrayIterator $singletons = new ArrayIterator(),
 
         /** @var ArrayIterator<array-key, class-string> $initializers */
-        private ArrayIterator $initializers = new ArrayIterator(),
+        public ArrayIterator $initializers = new ArrayIterator(),
 
         /** @var ArrayIterator<array-key, class-string> $dynamicInitializers */
         private ArrayIterator $dynamicInitializers = new ArrayIterator(),

packages/database/src/Connection/CachedConnectionInitializer.php

@@ -8,6 +8,7 @@
 use PDOStatement;
 use Tempest\Database\Config\DatabaseConfig;
 use Tempest\Database\Exceptions\ConnectionClosed;
+use Throwable;
 
 final class PDOConnection implements Connection
 {
@@ -68,6 +69,24 @@ public function prepare(string $sql): PDOStatement
         return $statement;
     }
 
+    public function ping(): bool
+    {
+        try {
+            $statement = $this->prepare('SELECT 1');
+            $statement->execute();
+
+            return true;
+        } catch (Throwable) {
+            return false;
+        }
+    }
+
+    public function reconnect(): void
+    {
+        $this->close();
+        $this->connect();
+    }
+
     public function close(): void
     {
         $this->pdo = null;

packages/database/src/Connection/PDOConnection.php

@@ -9,6 +9,7 @@
 use Tempest\Clock\MockClock;
 use Tempest\Console\Testing\ConsoleTester;
 use Tempest\Container\Container;
+use Tempest\Container\GenericContainer;
 use Tempest\Core\AppConfig;
 use Tempest\Core\FrameworkKernel;
 use Tempest\Core\Kernel;
@@ -35,7 +36,7 @@ abstract class IntegrationTest extends TestCase
 
     protected Kernel $kernel;
 
-    protected Container $container;
+    protected Container|GenericContainer $container;
 
     protected ConsoleTester $console;
 

src/Tempest/Framework/Testing/IntegrationTest.php

@@ -11,12 +11,11 @@
 use Tempest\Console\Output\StdoutOutputBuffer;
 use Tempest\Console\OutputBuffer;
 use Tempest\Console\Testing\ConsoleTester;
-use Tempest\Core\AppConfig;
 use Tempest\Core\Application;
 use Tempest\Core\ShellExecutor;
 use Tempest\Core\ShellExecutors\NullShellExecutor;
-use Tempest\Database\Connection\CachedConnectionInitializer;
-use Tempest\Database\Connection\Connection;
+use Tempest\Database\Connection\ConnectionInitializer;
+use Tempest\Database\DatabaseInitializer;
 use Tempest\Database\Migrations\MigrationManager;
 use Tempest\Discovery\DiscoveryLocation;
 use Tempest\Framework\Testing\IntegrationTest;
@@ -57,7 +56,10 @@ protected function setUp(): void
         $this->console = new ConsoleTester($this->container);
 
         // Database
-        $this->container->addInitializer(CachedConnectionInitializer::class);
+        $this->container
+            ->removeInitializer(DatabaseInitializer::class)
+            ->addInitializer(TestingDatabaseInitializer::class);
+
         $databaseConfigPath = __DIR__ . '/../Fixtures/Config/database.config.php';
 
         if (! file_exists($databaseConfigPath)) {
@@ -71,7 +73,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        $this->container->get(Connection::class)->close();
+//        $this->container->get(Connection::class)->close();
     }
 
     protected function actAsConsoleApplication(string $command = ''): Application

tests/Integration/FrameworkIntegrationTestCase.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Integration;
+
+use Tempest\Container\Container;
+use Tempest\Container\DynamicInitializer;
+use Tempest\Container\Singleton;
+use Tempest\Database\Config\DatabaseConfig;
+use Tempest\Database\Config\DatabaseDialect;
+use Tempest\Database\Connection\Connection;
+use Tempest\Database\Connection\PDOConnection;
+use Tempest\Database\Database;
+use Tempest\Database\GenericDatabase;
+use Tempest\Database\Transactions\GenericTransactionManager;
+use Tempest\Reflection\ClassReflector;
+
+final class TestingDatabaseInitializer implements DynamicInitializer
+{
+    private static ?PDOConnection $connection = null;
+
+    public function canInitialize(ClassReflector $class, ?string $tag): bool
+    {
+        return $class->getType()->matches(Database::class);
+    }
+
+    #[Singleton]
+    public function initialize(ClassReflector $class, ?string $tag, Container $container): Database
+    {
+        if (self::$connection === null) {
+            $config = $container->get(DatabaseConfig::class, $tag);
+            $connection = new PDOConnection($config);
+            $connection->connect();
+
+            self::$connection = $connection;
+        }
+
+        if (self::$connection->ping() === false)
+        {
+            self::$connection->reconnect();
+        }
+
+        return new GenericDatabase(
+            self::$connection,
+            new GenericTransactionManager(self::$connection),
+            $container->get(DatabaseDialect::class),
+        );
+    }
+}