wip

Author: michalsn

system/CodeIgniter.php

@@ -208,11 +208,6 @@ public function resetForWorkerMode(): void
         // Reset timing
         $this->startTime = null;
         $this->totalTime = 0;
-
-        // Clean any leftover output buffers (safety measure for errors)
-        while (ob_get_level() > 0) {
-            ob_end_clean();
-        }
     }
 
     /**

system/Database/Config.php

@@ -176,8 +176,8 @@ public static function validateForWorkerMode(): void
     /**
      * Cleanup database connections for worker mode.
      *
-     * If any uncommitted transactions are found, the connection
-     * is closed and reconnected to ensure a clean state for the next request.
+     * Rolls back any uncommitted transactions and resets transaction status
+     * to ensure a clean state for the next request.
      *
      * Uncommitted transactions at this point indicate a bug in the
      * application code (transactions should be completed before request ends).
@@ -188,10 +188,14 @@ public static function cleanupForWorkerMode(): void
     {
         foreach (static::$instances as $group => $connection) {
             if ($connection->transDepth > 0) {
-                log_message('error', "Uncommitted transaction detected in database group '{$group}'. Transactions must be completed before request ends. Reconnecting to ensure clean state.");
-                $connection->close();
-                $connection->initialize();
+                log_message('error', "Uncommitted transaction detected in database group '{$group}'. Transactions must be completed before request ends.");
+
+                while ($connection->transDepth > 0) {
+                    $connection->transRollback();
+                }
             }
+
+            $connection->resetTransStatus();
         }
     }
 }

tests/system/CommonSingleServiceTest.php

@@ -91,9 +91,12 @@ public static function provideServiceNames(): iterable
             'reset',
             'resetSingle',
             'resetServicesCache',
+            'resetForWorkerMode',
             'injectMock',
+            'has',
             'encrypter', // Encrypter needs a starter key
             'session', // Headers already sent
+            'validateForWorkerMode',
         ];
 
         if ($services === []) {

tests/system/Database/ConfigTest.php

@@ -239,31 +239,4 @@ public static function provideConvertDSN(): iterable
             ],
         ];
     }
-
-    #[Group('DatabaseLive')]
-    public function testResetForWorkerMode(): void
-    {
-        $conn = Config::connect();
-        $this->assertInstanceOf(BaseConnection::class, $conn);
-
-        $conn->transStart();
-        $this->assertGreaterThan(0, $conn->transDepth);
-
-        Config::cleanupForWorkerMode();
-
-        $this->assertSame(0, $conn->transDepth);
-        $this->assertNotFalse($this->getPrivateProperty($conn, 'connID'));
-    }
-
-    #[Group('DatabaseLive')]
-    public function testValidateForWorkerMode(): void
-    {
-        $conn = Config::connect();
-        $this->assertInstanceOf(BaseConnection::class, $conn);
-        $this->assertNotFalse($this->getPrivateProperty($conn, 'connID'));
-
-        Config::validateForWorkerMode();
-
-        $this->assertNotFalse($this->getPrivateProperty($conn, 'connID'));
-    }
 }

tests/system/Database/Live/WorkerModeTest.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Config;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use PHPUnit\Framework\Attributes\Group;
+
+/**
+ * @internal
+ */
+#[Group('DatabaseLive')]
+final class WorkerModeTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->setPrivateProperty(Config::class, 'instances', []);
+    }
+
+    public function testCleanupForWorkerMode(): void
+    {
+        $conn = Config::connect();
+        $this->assertInstanceOf(BaseConnection::class, $conn);
+
+        $conn->transStart();
+        $this->assertGreaterThan(0, $conn->transDepth);
+
+        Config::cleanupForWorkerMode();
+
+        $this->assertSame(0, $conn->transDepth);
+        $this->assertNotFalse($this->getPrivateProperty($conn, 'connID'));
+    }
+
+    public function testValidateForWorkerMode(): void
+    {
+        $conn = Config::connect();
+        $this->assertInstanceOf(BaseConnection::class, $conn);
+        $this->assertNotFalse($this->getPrivateProperty($conn, 'connID'));
+
+        Config::validateForWorkerMode();
+
+        $this->assertNotFalse($this->getPrivateProperty($conn, 'connID'));
+    }
+}

user_guide_src/source/installation/worker_mode.rst

@@ -184,8 +184,8 @@ Option                  Type    Description
 ======================= ======= ==========================================================================
 **$persistentServices** array   Services that persist across requests and are not reset. Services not
                                 in this list are destroyed after each request to prevent state leakage.
-                                Default: ``['autoloader', 'locator', 'exceptions', 'logger', 'timer',
-                                'commands', 'codeigniter', 'superglobals', 'routes', 'cache']``
+                                Default: ``['autoloader', 'locator', 'exceptions', 'commands',
+                                'codeigniter', 'superglobals', 'routes', 'cache']``
 **$garbageCollection**  bool    Whether to force garbage collection after each request.
                                 ``true`` (default, recommended): Prevents memory leaks.
                                 ``false``: Relies on PHP's automatic garbage collection.
@@ -197,18 +197,18 @@ Persistent Services
 The ``$persistentServices`` array controls which services survive between requests.
 The default configuration includes:
 
-===================== ==========================================================================
-Service               Purpose
-===================== ==========================================================================
-``autoloader``        PSR-4 autoloading configuration. Safe to persist as class maps don't change.
-``locator``           File locator for finding framework files. Caches file paths for performance.
-``exceptions``        Exception handler. Stateless, safe to reuse.
-``commands``          CLI commands registry. Only used during worker startup.
-``codeigniter``       Main application instance. Orchestrates the request/response cycle.
-``superglobals``      Superglobals wrapper. Properly isolated per request internally.
-``routes``            Router configuration. Route definitions don't change between requests.
-``cache``             Cache service. Maintains connections to cache backends (Redis, Memcached).
-===================== ==========================================================================
+================ ==========================================================================
+Service          Purpose
+================ ==========================================================================
+``autoloader``   PSR-4 autoloading configuration. Safe to persist as class maps don't change.
+``locator``      File locator for finding framework files. Caches file paths for performance.
+``exceptions``   Exception handler. Stateless, safe to reuse.
+``commands``     CLI commands registry. Only used during worker startup.
+``codeigniter``  Main application instance. Orchestrates the request/response cycle.
+``superglobals`` Superglobals wrapper. Properly isolated per request internally.
+``routes``       Router configuration. Route definitions don't change between requests.
+``cache``        Cache service. Maintains connections to cache backends (Redis, Memcached).
+================ ==========================================================================
 
 .. warning:: Adding services to ``$persistentServices`` without understanding their
     state management can cause data leakage between requests. Only persist services
@@ -304,4 +304,4 @@ Database connections are automatically managed:
 - Connections persist across requests for performance
 - Connections are validated at the start of each request
 - Failed connections are automatically re-established
-- Uncommitted transactions trigger a warning and reconnection to ensure clean state
+- Uncommitted transactions are automatically rolled back with a warning logged