diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 1d3aba1552f8..c7a6c692ed54 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -2826,16 +2826,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/BaseConnection.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:_foreignKeyData\\(\\) return type has no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/BaseConnection.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:_indexData\\(\\) return type has no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/BaseConnection.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:callFunction\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#',
 	'count' => 1,
@@ -2871,11 +2861,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/BaseConnection.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:foreignKeyDataToObjects\\(\\) return type has no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/BaseConnection.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#',
 	'count' => 1,
@@ -2886,11 +2871,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/BaseConnection.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:getIndexData\\(\\) return type has no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/BaseConnection.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:listTables\\(\\) return type has no value type specified in iterable type array\\.$#',
 	'count' => 1,
@@ -9261,16 +9241,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Test/Mock/MockConnection.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:_foreignKeyData\\(\\) return type has no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/Mock/MockConnection.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:_indexData\\(\\) return type has no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Test/Mock/MockConnection.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:shouldReturn\\(\\) has no return type specified\\.$#',
 	'count' => 1,
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index ae5c4b3805f1..93bde5ddca6d 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1527,7 +1527,7 @@ public function getFieldData(string $table)
     /**
      * Returns an object with key data
      *
-     * @return array
+     * @return array<string, stdClass>
      */
     public function getIndexData(string $table)
     {
@@ -1547,7 +1547,9 @@ public function getForeignKeyData(string $table)
     /**
      * Converts array of arrays generated by _foreignKeyData() to array of objects
      *
-     * @return array[
+     * @return array<string, stdClass>
+     *
+     * array[
      *    {constraint_name} =>
      *        stdClass[
      *            'constraint_name'     => string,
@@ -1704,6 +1706,8 @@ abstract protected function _fieldData(string $table): array;
      * Platform-specific index data.
      *
      * @see    getIndexData()
+     *
+     * @return array<string, stdClass>
      */
     abstract protected function _indexData(string $table): array;
 
@@ -1711,6 +1715,8 @@ abstract protected function _indexData(string $table): array;
      * Platform-specific foreign keys data.
      *
      * @see    getForeignKeyData()
+     *
+     * @return array<string, stdClass>
      */
     abstract protected function _foreignKeyData(string $table): array;
 
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 03aab408398a..b499e2ca81d6 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -443,7 +443,7 @@ protected function _fieldData(string $table): array
     /**
      * Returns an array of objects with index data
      *
-     * @return list<stdClass>
+     * @return array<string, stdClass>
      *
      * @throws DatabaseException
      * @throws LogicException
@@ -489,7 +489,7 @@ protected function _indexData(string $table): array
     /**
      * Returns an array of objects with Foreign key data
      *
-     * @return list<stdClass>
+     * @return array<string, stdClass>
      *
      * @throws DatabaseException
      */
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index fc7920e2a8ff..2feb2d36df4b 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -325,7 +325,7 @@ protected function _fieldData(string $table): array
     /**
      * Returns an array of objects with index data
      *
-     * @return list<stdClass>
+     * @return array<string, stdClass>
      *
      * @throws DatabaseException
      */
@@ -374,7 +374,7 @@ protected function _indexData(string $table): array
     /**
      * Returns an array of objects with Foreign key data
      *
-     * @return list<stdClass>
+     * @return array<string, stdClass>
      *
      * @throws DatabaseException
      */
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index baef703b7bb3..7da3d26c9dd8 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -332,7 +332,7 @@ protected function _fieldData(string $table): array
     /**
      * Returns an array of objects with index data
      *
-     * @return list<stdClass>
+     * @return array<string, stdClass>
      *
      * @throws DatabaseException
      */
@@ -371,7 +371,7 @@ protected function _indexData(string $table): array
     /**
      * Returns an array of objects with Foreign key data
      *
-     * @return list<stdClass>
+     * @return array<string, stdClass>
      *
      * @throws DatabaseException
      */
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index bc3e036078c9..77a1ab34bcf3 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -231,7 +231,7 @@ protected function _listColumns(string $table = ''): string
     /**
      * Returns an array of objects with index data
      *
-     * @return list<stdClass>
+     * @return array<string, stdClass>
      *
      * @throws DatabaseException
      */
@@ -269,7 +269,7 @@ protected function _indexData(string $table): array
      * Returns an array of objects with Foreign key data
      * referenced_object_id  parent_object_id
      *
-     * @return list<stdClass>
+     * @return array<string, stdClass>
      *
      * @throws DatabaseException
      */
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index be4ebc25f0ca..a7ac179dadca 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -286,7 +286,7 @@ protected function _fieldData(string $table): array
     /**
      * Returns an array of objects with index data
      *
-     * @return list<stdClass>
+     * @return array<string, stdClass>
      *
      * @throws DatabaseException
      */
@@ -343,7 +343,7 @@ protected function _indexData(string $table): array
     /**
      * Returns an array of objects with Foreign key data
      *
-     * @return list<stdClass>
+     * @return array<string, stdClass>
      */
     protected function _foreignKeyData(string $table): array
     {
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 47e6d1a7097e..bd2056d581d9 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -280,7 +280,7 @@ public function addForeignKey(array $foreignKeys)
     /**
      * Creates the new table based on our current fields.
      *
-     * @return mixed
+     * @return bool
      */
     protected function createTable()
     {
@@ -449,16 +449,12 @@ private function isNumericType(string $type): bool
      * Converts keys retrieved from the database to
      * the format needed to create later.
      *
-     * @param mixed $keys
+     * @param array<string, stdClass> $keys
      *
-     * @return mixed
+     * @return array<string, array{fields: string, type: string}>
      */
     protected function formatKeys($keys)
     {
-        if (! is_array($keys)) {
-            return $keys;
-        }
-
         $return = [];
 
         foreach ($keys as $name => $key) {