Release v4.6.5

Author: actions-user

system/CodeIgniter.php

@@ -55,7 +55,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.6.4';
+    public const CI_VERSION = '4.6.5';
 
     /**
      * App startup time.

system/Database/MySQLi/Connection.php

@@ -207,21 +207,6 @@ public function connect(bool $persistent = false)
                 $socket,
                 $clientFlags,
             )) {
-                // Prior to version 5.7.3, MySQL silently downgrades to an unencrypted connection if SSL setup fails
-                if (($clientFlags & MYSQLI_CLIENT_SSL) !== 0 && version_compare($this->mysqli->client_info, 'mysqlnd 5.7.3', '<=')
-                    && empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'")->fetch_object()->Value)
-                ) {
-                    $this->mysqli->close();
-                    $message = 'MySQLi was configured for an SSL connection, but got an unencrypted connection instead!';
-                    log_message('error', $message);
-
-                    if ($this->DBDebug) {
-                        throw new DatabaseException($message);
-                    }
-
-                    return false;
-                }
-
                 if (! $this->mysqli->set_charset($this->charset)) {
                     log_message('error', "Database: Unable to set the configured connection charset ('{$this->charset}').");
 
@@ -625,8 +610,6 @@ public function insertID(): int
      */
     protected function _transBegin(): bool
     {
-        $this->connID->autocommit(false);
-
         return $this->connID->begin_transaction();
     }
 
@@ -635,26 +618,14 @@ protected function _transBegin(): bool
      */
     protected function _transCommit(): bool
     {
-        if ($this->connID->commit()) {
-            $this->connID->autocommit(true);
-
-            return true;
-        }
-
-        return false;
+        return $this->connID->commit();
     }
 
     /**
      * Rollback Transaction
      */
     protected function _transRollback(): bool
     {
-        if ($this->connID->rollback()) {
-            $this->connID->autocommit(true);
-
-            return true;
-        }
-
-        return false;
+        return $this->connID->rollback();
     }
 }

system/Database/Seeder.php

@@ -27,7 +27,7 @@ class Seeder
     /**
      * The name of the database group to use.
      *
-     * @var non-empty-string
+     * @var non-empty-string|null
      */
     protected $DBGroup;
 
@@ -92,10 +92,16 @@ public function __construct(Database $config, ?BaseConnection $db = null)
 
         $this->config = &$config;
 
-        $db ??= Database::connect($this->DBGroup);
-
-        $this->db    = $db;
-        $this->forge = Database::forge($this->DBGroup);
+        if (isset($this->DBGroup)) {
+            $this->db    = Database::connect($this->DBGroup);
+            $this->forge = Database::forge($this->DBGroup);
+        } elseif ($db instanceof BaseConnection) {
+            $this->db    = $db;
+            $this->forge = Database::forge($db);
+        } else {
+            $this->db    = Database::connect($config->defaultGroup);
+            $this->forge = Database::forge($config->defaultGroup);
+        }
     }
 
     /**
@@ -145,7 +151,7 @@ public function call(string $class)
         }
 
         /** @var Seeder $seeder */
-        $seeder = new $class($this->config);
+        $seeder = new $class($this->config, $this->db);
         $seeder->setSilent($this->silent)->run();
 
         unset($seeder);

system/Debug/Toolbar.php

@@ -397,7 +397,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
             helper('filesystem');
 
             // Updated to microtime() so we can get history
-            $time = sprintf('%.6f', Time::now()->format('U.u'));
+            $time = sprintf('%.6F', Time::now()->format('U.u'));
 
             if (! is_dir(WRITEPATH . 'debugbar')) {
                 mkdir(WRITEPATH . 'debugbar', 0777);

system/Debug/Toolbar/Collectors/History.php

@@ -90,7 +90,7 @@ public function setFiles(string $current, int $limit = 20)
             $contents = @json_decode($contents);
             if (json_last_error() === JSON_ERROR_NONE) {
                 preg_match('/debugbar_(.*)\.json$/s', $filename, $time);
-                $time = sprintf('%.6f', $time[1] ?? 0);
+                $time = sprintf('%.6F', $time[1] ?? 0);
 
                 // Debugbar files shown in History Collector
                 $files[] = [

system/HTTP/ContentSecurityPolicy.php

@@ -303,7 +303,7 @@ public function enabled(): bool
     public function getStyleNonce(): string
     {
         if ($this->styleNonce === null) {
-            $this->styleNonce = bin2hex(random_bytes(12));
+            $this->styleNonce = base64_encode(random_bytes(12));
             $this->styleSrc[] = 'nonce-' . $this->styleNonce;
         }
 
@@ -316,7 +316,7 @@ public function getStyleNonce(): string
     public function getScriptNonce(): string
     {
         if ($this->scriptNonce === null) {
-            $this->scriptNonce = bin2hex(random_bytes(12));
+            $this->scriptNonce = base64_encode(random_bytes(12));
             $this->scriptSrc[] = 'nonce-' . $this->scriptNonce;
         }
 

system/Test/CIUnitTestCase.php

@@ -124,7 +124,7 @@ abstract class CIUnitTestCase extends TestCase
      *
      * @var string
      */
-    protected $basePath = SUPPORTPATH . 'Database';
+    protected $basePath = TESTPATH . '_support/Database';
 
     /**
      * The namespace(s) to help us find the migration classes.