diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 35f97f748fce..8b16dd0c0f2d 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -948,7 +948,9 @@ protected function display404errors(PageNotFoundException $e)
         $this->response->setStatusCode($e->getCode());
 
         // Is there a 404 Override available?
-        if ($override = $this->router->get404Override()) {
+        $override = $this->router->get404Override();
+
+        if ($override !== null) {
             $returned = null;
 
             if ($override instanceof Closure) {
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
index 993483c5775a..1794e7ffe9eb 100644
--- a/system/ComposerScripts.php
+++ b/system/ComposerScripts.php
@@ -67,7 +67,7 @@ final class ComposerScripts
      * This static method is called by Composer after every update event,
      * i.e., `composer install`, `composer update`, `composer remove`.
      */
-    public static function postUpdate()
+    public static function postUpdate(): void
     {
         self::recursiveDelete(self::$path);
 
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 6aee36f14261..cba7f5cbb8b4 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -3380,6 +3380,8 @@ public function resetQuery()
      * Resets the query builder values.  Called by the get() function
      *
      * @param array $qbResetItems An array of fields to reset
+     *
+     * @return void
      */
     protected function resetRun(array $qbResetItems)
     {
@@ -3390,6 +3392,8 @@ protected function resetRun(array $qbResetItems)
 
     /**
      * Resets the query builder values.  Called by the get() function
+     *
+     * @return void
      */
     protected function resetSelect()
     {
@@ -3421,6 +3425,8 @@ protected function resetSelect()
      * Resets the query builder "write" values.
      *
      * Called by the insert() update() insertBatch() updateBatch() and delete() functions
+     *
+     * @return void
      */
     protected function resetWrite()
     {
diff --git a/system/Database/Config.php b/system/Database/Config.php
index 00d1b192cae3..6f25ad3c0059 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -18,8 +18,6 @@
 use Config\Database as DbConfig;
 
 /**
- * Class Config
- *
  * @see \CodeIgniter\Database\ConfigTest
  */
 class Config extends BaseConfig
@@ -141,6 +139,8 @@ public static function seeder(?string $group = null)
 
     /**
      * Ensures the database Connection Manager/Factory is loaded and ready to use.
+     *
+     * @return void
      */
     protected static function ensureFactory()
     {
diff --git a/system/Database/Exceptions/DataException.php b/system/Database/Exceptions/DataException.php
index a7ccd8c6f5c3..7cd9f526e6c2 100644
--- a/system/Database/Exceptions/DataException.php
+++ b/system/Database/Exceptions/DataException.php
@@ -65,21 +65,33 @@ public static function forInvalidArgument(string $argument)
         return new static(lang('Database.invalidArgument', [$argument]));
     }
 
+    /**
+     * @return DataException
+     */
     public static function forInvalidAllowedFields(string $model)
     {
         return new static(lang('Database.invalidAllowedFields', [$model]));
     }
 
+    /**
+     * @return DataException
+     */
     public static function forTableNotFound(string $table)
     {
         return new static(lang('Database.tableNotFound', [$table]));
     }
 
+    /**
+     * @return DataException
+     */
     public static function forEmptyInputGiven(string $argument)
     {
         return new static(lang('Database.forEmptyInputGiven', [$argument]));
     }
 
+    /**
+     * @return DataException
+     */
     public static function forFindColumnHaveMultipleColumns()
     {
         return new static(lang('Database.forFindColumnHaveMultipleColumns'));
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 53c819fb24c5..8405d9f7143f 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -984,6 +984,8 @@ protected function _processColumn(array $processedField): string
 
     /**
      * Performs a data type mapping between different databases.
+     *
+     * @return void
      */
     protected function _attributeType(array &$attributes)
     {
@@ -999,6 +1001,8 @@ protected function _attributeType(array &$attributes)
      *        if $attributes['TYPE'] is found in the array
      *    - array(TYPE => UTYPE) will change $field['type'],
      *        from TYPE to UTYPE in case of a match
+     *
+     * @return void
      */
     protected function _attributeUnsigned(array &$attributes, array &$field)
     {
@@ -1030,6 +1034,9 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
         $field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
     }
 
+    /**
+     * @return void
+     */
     protected function _attributeDefault(array &$attributes, array &$field)
     {
         if ($this->default === false) {
@@ -1051,6 +1058,9 @@ protected function _attributeDefault(array &$attributes, array &$field)
         }
     }
 
+    /**
+     * @return void
+     */
     protected function _attributeUnique(array &$attributes, array &$field)
     {
         if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true) {
@@ -1058,6 +1068,9 @@ protected function _attributeUnique(array &$attributes, array &$field)
         }
     }
 
+    /**
+     * @return void
+     */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
     {
         if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
@@ -1254,6 +1267,8 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar
 
     /**
      * Resets table creation vars
+     *
+     * @return void
      */
     public function reset()
     {
diff --git a/system/Database/Migration.php b/system/Database/Migration.php
index ca9e5e0cf266..f3a1dc457629 100644
--- a/system/Database/Migration.php
+++ b/system/Database/Migration.php
@@ -64,11 +64,15 @@ public function getDBGroup(): ?string
 
     /**
      * Perform a migration step.
+     *
+     * @return void
      */
     abstract public function up();
 
     /**
      * Revert a migration step.
+     *
+     * @return void
      */
     abstract public function down();
 }
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 32842916769d..fdff86589132 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -317,6 +317,8 @@ public function regress(int $targetBatch = 0, ?string $group = null)
      *
      * @param string $path Full path to a valid migration file
      * @param string $path Namespace of the target migration
+     *
+     * @return bool
      */
     public function force(string $path, string $namespace, ?string $group = null)
     {
@@ -575,6 +577,8 @@ public function clearCliMessages()
 
     /**
      * Truncates the history table.
+     *
+     * @return void
      */
     public function clearHistory()
     {
@@ -587,6 +591,8 @@ public function clearHistory()
      * Add a history to the table.
      *
      * @param object $migration
+     *
+     * @return void
      */
     protected function addHistory($migration, int $batch)
     {
@@ -614,6 +620,8 @@ protected function addHistory($migration, int $batch)
      * Removes a single history
      *
      * @param object $history
+     *
+     * @return void
      */
     protected function removeHistory($history)
     {
@@ -752,6 +760,8 @@ public function getBatchEnd(int $batch): string
     /**
      * Ensures that we have created our migrations table
      * in the database.
+     *
+     * @return void
      */
     public function ensureTable()
     {
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index 06ef62a9f842..584c452b233d 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -517,6 +517,8 @@ public function insertID()
 
     /**
      * Build a DSN from the provided parameters
+     *
+     * @return void
      */
     protected function buildDSN()
     {
diff --git a/system/Database/Query.php b/system/Database/Query.php
index f0b75513c6b5..c74ba6a687ab 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -287,6 +287,8 @@ public function getOriginalQuery(): string
      * Escapes and inserts any binds into the finalQueryString property.
      *
      * @see https://regex101.com/r/EUEhay/5
+     *
+     * @return void
      */
     protected function compileBinds()
     {
diff --git a/system/Database/QueryInterface.php b/system/Database/QueryInterface.php
index 19cbdd0edc4a..86eb01f4e169 100644
--- a/system/Database/QueryInterface.php
+++ b/system/Database/QueryInterface.php
@@ -26,7 +26,7 @@ interface QueryInterface
      *
      * @param mixed $binds
      *
-     * @return mixed
+     * @return $this
      */
     public function setQuery(string $sql, $binds = null, bool $setEscape = true);
 
@@ -34,7 +34,7 @@ public function setQuery(string $sql, $binds = null, bool $setEscape = true);
      * Returns the final, processed query string after binding, etal
      * has been performed.
      *
-     * @return mixed
+     * @return string
      */
     public function getQuery();
 
@@ -43,7 +43,7 @@ public function getQuery();
      * for it's start and end values. If no end value is present, will
      * use the current time to determine total duration.
      *
-     * @return mixed
+     * @return $this
      */
     public function setDuration(float $start, ?float $end = null);
 
@@ -57,6 +57,8 @@ public function getDuration(int $decimals = 6): string;
 
     /**
      * Stores the error description that happened for this query.
+     *
+     * @return $this
      */
     public function setError(int $code, string $error);
 
@@ -83,7 +85,7 @@ public function isWriteType(): bool;
     /**
      * Swaps out one table prefix for a new one.
      *
-     * @return mixed
+     * @return $this
      */
     public function swapPrefix(string $orig, string $swap);
 }
diff --git a/system/Database/ResultInterface.php b/system/Database/ResultInterface.php
index ba26629cd518..e6383cab6585 100644
--- a/system/Database/ResultInterface.php
+++ b/system/Database/ResultInterface.php
@@ -170,6 +170,8 @@ public function getFieldData(): array;
 
     /**
      * Frees the current result.
+     *
+     * @return void
      */
     public function freeResult();
 
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 095d96a2d333..674d26b7d6f2 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -17,8 +17,6 @@
 use stdClass;
 
 /**
- * Class Table
- *
  * Provides missing features for altering tables that are common
  * in other supported databases, but are missing from SQLite.
  * These are needed in order to support migrations during testing
@@ -345,6 +343,8 @@ protected function createTable()
      * Copies data from our old table to the new one,
      * taking care map data correctly based on any columns
      * that have been renamed.
+     *
+     * @return void
      */
     protected function copyData()
     {
@@ -472,6 +472,8 @@ protected function formatKeys($keys)
     /**
      * Attempts to drop all indexes and constraints
      * from the database for this table.
+     *
+     * @return void
      */
     protected function dropIndexes()
     {
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index 3530592fe671..aacc8e9905ce 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -115,6 +115,8 @@ public static function faker(): ?Generator
     /**
      * Loads the specified seeder and runs it.
      *
+     * @return void
+     *
      * @throws InvalidArgumentException
      */
     public function call(string $class)
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 9ce9a5c7a553..eb75e33adc3e 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -269,6 +269,8 @@ public function methodName(): string
     /**
      * Returns the 404 Override settings from the Collection.
      * If the override is a string, will split to controller/index array.
+     *
+     * @return array{string, string}|(Closure(string): (ResponseInterface|string|void))|null
      */
     public function get404Override()
     {
diff --git a/system/Session/Exceptions/SessionException.php b/system/Session/Exceptions/SessionException.php
index 2a72a8f3ca4d..2548d5f5dc18 100644
--- a/system/Session/Exceptions/SessionException.php
+++ b/system/Session/Exceptions/SessionException.php
@@ -17,26 +17,41 @@
 
 class SessionException extends FrameworkException
 {
+    /**
+     * @return static
+     */
     public static function forMissingDatabaseTable()
     {
         return new static(lang('Session.missingDatabaseTable'));
     }
 
+    /**
+     * @return static
+     */
     public static function forInvalidSavePath(?string $path = null)
     {
         return new static(lang('Session.invalidSavePath', [$path]));
     }
 
+    /**
+     * @return static
+     */
     public static function forWriteProtectedSavePath(?string $path = null)
     {
         return new static(lang('Session.writeProtectedSavePath', [$path]));
     }
 
+    /**
+     * @return static
+     */
     public static function forEmptySavepath()
     {
         return new static(lang('Session.emptySavePath'));
     }
 
+    /**
+     * @return static
+     */
     public static function forInvalidSavePathFormat(string $path)
     {
         return new static(lang('Session.invalidSavePathFormat', [$path]));
@@ -45,6 +60,8 @@ public static function forInvalidSavePathFormat(string $path)
     /**
      * @deprecated
      *
+     * @return static
+     *
      * @codeCoverageIgnore
      */
     public static function forInvalidSameSiteSetting(string $samesite)
diff --git a/system/Session/Handlers/Database/PostgreHandler.php b/system/Session/Handlers/Database/PostgreHandler.php
index e999f356decd..be0621efb945 100644
--- a/system/Session/Handlers/Database/PostgreHandler.php
+++ b/system/Session/Handlers/Database/PostgreHandler.php
@@ -26,6 +26,8 @@ class PostgreHandler extends DatabaseHandler
 {
     /**
      * Sets SELECT clause
+     *
+     * @return void
      */
     protected function setSelect(BaseBuilder $builder)
     {
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index aeafc48c39b9..9fb5fcd89f95 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -154,6 +154,8 @@ public function read($id)
 
     /**
      * Sets SELECT clause
+     *
+     * @return void
      */
     protected function setSelect(BaseBuilder $builder)
     {
diff --git a/system/Session/Handlers/FileHandler.php b/system/Session/Handlers/FileHandler.php
index dbca9cfa4288..6938bcd2bbf6 100644
--- a/system/Session/Handlers/FileHandler.php
+++ b/system/Session/Handlers/FileHandler.php
@@ -313,7 +313,10 @@ public function gc($max_lifetime)
      * Configure Session ID regular expression
      *
      * To make life easier, we force the PHP defaults. Because PHP9 forces them.
-     * See https://wiki.php.net/rfc/deprecations_php_8_4#sessionsid_length_and_sessionsid_bits_per_character
+     *
+     * @see https://wiki.php.net/rfc/deprecations_php_8_4#sessionsid_length_and_sessionsid_bits_per_character
+     *
+     * @return void
      */
     protected function configureSessionIDRegex()
     {
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index 0c39e69e14b0..4780a1bbdefd 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -299,6 +299,8 @@ private function callTraitMethods(string $stage): void
 
     /**
      * Resets shared instanced for all Factories components
+     *
+     * @return void
      */
     protected function resetFactories()
     {
@@ -307,6 +309,8 @@ protected function resetFactories()
 
     /**
      * Resets shared instanced for all Services
+     *
+     * @return void
      */
     protected function resetServices(bool $initAutoloader = true)
     {
@@ -315,6 +319,8 @@ protected function resetServices(bool $initAutoloader = true)
 
     /**
      * Injects the mock Cache driver to prevent filesystem collisions
+     *
+     * @return void
      */
     protected function mockCache()
     {
@@ -323,6 +329,8 @@ protected function mockCache()
 
     /**
      * Injects the mock email driver so no emails really send
+     *
+     * @return void
      */
     protected function mockEmail()
     {
@@ -331,6 +339,8 @@ protected function mockEmail()
 
     /**
      * Injects the mock session driver into Services
+     *
+     * @return void
      */
     protected function mockSession()
     {
@@ -443,6 +453,8 @@ public function assertHeaderNotEmitted(string $header, bool $ignoreCase = false)
      *
      * @param float|int $actual
      *
+     * @return void
+     *
      * @throws Exception
      */
     public function assertCloseEnough(int $expected, $actual, string $message = '', int $tolerance = 1)
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index 6c7533e19194..e092dee69ba7 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -154,6 +154,8 @@ public function __construct($model, ?array $formatters = null, ?string $locale =
 
     /**
      * Reset internal counts
+     *
+     * @return void
      */
     public static function resetCounts()
     {
diff --git a/system/Test/Mock/MockCURLRequest.php b/system/Test/Mock/MockCURLRequest.php
index 97f80e7c1da2..0f0b203a9a14 100644
--- a/system/Test/Mock/MockCURLRequest.php
+++ b/system/Test/Mock/MockCURLRequest.php
@@ -14,10 +14,9 @@
 namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\HTTP\CURLRequest;
+use CodeIgniter\HTTP\URI;
 
 /**
- * Class MockCURLRequest
- *
  * Simply allows us to not actually call cURL during the
  * test runs. Instead, we can set the desired output
  * and get back the set options.
@@ -27,6 +26,11 @@ class MockCURLRequest extends CURLRequest
     public $curl_options;
     protected $output = '';
 
+    /**
+     * @param string $output
+     *
+     * @return $this
+     */
     public function setOutput($output)
     {
         $this->output = $output;
@@ -44,13 +48,21 @@ protected function sendRequest(array $curlOptions = []): string
         return $this->output;
     }
 
-    // for testing purposes only
+    /**
+     * for testing purposes only
+     *
+     * @return URI
+     */
     public function getBaseURI()
     {
         return $this->baseURI;
     }
 
-    // for testing purposes only
+    /**
+     * for testing purposes only
+     *
+     * @return float
+     */
     public function getDelay()
     {
         return $this->delay;
diff --git a/system/Test/Mock/MockEvents.php b/system/Test/Mock/MockEvents.php
index 9a2f0f35f342..bb0b4d9fb8bd 100644
--- a/system/Test/Mock/MockEvents.php
+++ b/system/Test/Mock/MockEvents.php
@@ -15,26 +15,35 @@
 
 use CodeIgniter\Events\Events;
 
-/**
- * Events
- */
 class MockEvents extends Events
 {
+    /**
+     * @return array
+     */
     public function getListeners()
     {
         return self::$listeners;
     }
 
+    /**
+     * @return array<int, string>
+     */
     public function getEventsFile()
     {
         return self::$files;
     }
 
+    /**
+     * @return bool
+     */
     public function getSimulate()
     {
         return self::$simulate;
     }
 
+    /**
+     * @return void
+     */
     public function unInitialize()
     {
         static::$initialized = false;
diff --git a/system/Test/Mock/MockLanguage.php b/system/Test/Mock/MockLanguage.php
index 80143d555f19..4ae1196ca053 100644
--- a/system/Test/Mock/MockLanguage.php
+++ b/system/Test/Mock/MockLanguage.php
@@ -50,6 +50,8 @@ protected function requireFile(string $path): array
 
     /**
      * Arbitrarily turnoff internationalization support for testing
+     *
+     * @return void
      */
     public function disableIntlSupport()
     {
diff --git a/system/Test/Mock/MockResourceController.php b/system/Test/Mock/MockResourceController.php
index daf2cf4b9275..67bc89d88e9a 100644
--- a/system/Test/Mock/MockResourceController.php
+++ b/system/Test/Mock/MockResourceController.php
@@ -17,16 +17,25 @@
 
 class MockResourceController extends ResourceController
 {
+    /**
+     * @return object|null
+     */
     public function getModel()
     {
         return $this->model;
     }
 
+    /**
+     * @return class-string|null
+     */
     public function getModelName()
     {
         return $this->modelName;
     }
 
+    /**
+     * @return 'json'|'xml'|null
+     */
     public function getFormat()
     {
         return $this->format;
diff --git a/system/Test/Mock/MockResourcePresenter.php b/system/Test/Mock/MockResourcePresenter.php
index 9f6cd7ba16d3..ecb0aa10c51a 100644
--- a/system/Test/Mock/MockResourcePresenter.php
+++ b/system/Test/Mock/MockResourcePresenter.php
@@ -20,16 +20,25 @@ class MockResourcePresenter extends ResourcePresenter
 {
     use ResponseTrait;
 
+    /**
+     * @return object|null
+     */
     public function getModel()
     {
         return $this->model;
     }
 
+    /**
+     * @return class-string|null
+     */
     public function getModelName()
     {
         return $this->modelName;
     }
 
+    /**
+     * @return 'json'|'xml'|null
+     */
     public function getFormat()
     {
         return $this->format;
diff --git a/system/Test/Mock/MockResponse.php b/system/Test/Mock/MockResponse.php
index ec3da86fd55d..1ea9c1627541 100644
--- a/system/Test/Mock/MockResponse.php
+++ b/system/Test/Mock/MockResponse.php
@@ -15,9 +15,6 @@
 
 use CodeIgniter\HTTP\Response;
 
-/**
- * Class MockResponse
- */
 class MockResponse extends Response
 {
     /**
@@ -27,13 +24,21 @@ class MockResponse extends Response
      */
     protected $pretend = true;
 
-    // for testing
+    /**
+     * For testing.
+     *
+     * @return bool
+     */
     public function getPretend()
     {
         return $this->pretend;
     }
 
-    // artificial error for testing
+    /**
+     * Artificial error for testing
+     *
+     * @return void
+     */
     public function misbehave()
     {
         $this->statusCode = 0;
diff --git a/system/Test/Mock/MockTable.php b/system/Test/Mock/MockTable.php
index a7edc359e4f8..4ce1a29e8391 100644
--- a/system/Test/Mock/MockTable.php
+++ b/system/Test/Mock/MockTable.php
@@ -18,7 +18,14 @@
 
 class MockTable extends Table
 {
-    // Override inaccessible protected method
+    /**
+     * Override inaccessible protected method
+     *
+     * @param string      $method
+     * @param list<mixed> $params
+     *
+     * @return mixed
+     */
     public function __call($method, $params)
     {
         if (is_callable([$this, '_' . $method])) {
diff --git a/system/Test/PhpStreamWrapper.php b/system/Test/PhpStreamWrapper.php
index b49073c1f77b..927821e8b4dd 100644
--- a/system/Test/PhpStreamWrapper.php
+++ b/system/Test/PhpStreamWrapper.php
@@ -30,17 +30,26 @@ final class PhpStreamWrapper
     private static string $content = '';
     private int $position          = 0;
 
+    /**
+     * @return void
+     */
     public static function setContent(string $content)
     {
         self::$content = $content;
     }
 
+    /**
+     * @return void
+     */
     public static function register()
     {
         stream_wrapper_unregister('php');
         stream_wrapper_register('php', self::class);
     }
 
+    /**
+     * @return void
+     */
     public static function restore()
     {
         stream_wrapper_restore('php');
diff --git a/utils/phpstan-baseline/loader.neon b/utils/phpstan-baseline/loader.neon
index 6f2ae839e39e..942ae86b644e 100644
--- a/utils/phpstan-baseline/loader.neon
+++ b/utils/phpstan-baseline/loader.neon
@@ -1,4 +1,4 @@
-# total 3458 errors
+# total 3383 errors
 includes:
     - argument.type.neon
     - assign.propertyType.neon
diff --git a/utils/phpstan-baseline/missingType.iterableValue.neon b/utils/phpstan-baseline/missingType.iterableValue.neon
index 838268a14cc5..bae7ccb51fe0 100644
--- a/utils/phpstan-baseline/missingType.iterableValue.neon
+++ b/utils/phpstan-baseline/missingType.iterableValue.neon
@@ -1,4 +1,4 @@
-# total 1618 errors
+# total 1619 errors
 
 parameters:
     ignoreErrors:
@@ -5487,6 +5487,11 @@ parameters:
             count: 1
             path: ../../system/Test/Mock/MockCache.php
 
+        -
+            message: '#^Method CodeIgniter\\Test\\Mock\\MockEvents\:\:getListeners\(\) return type has no value type specified in iterable type array\.$#'
+            count: 1
+            path: ../../system/Test/Mock/MockEvents.php
+
         -
             message: '#^Method CodeIgniter\\Test\\Mock\\MockFileLogger\:\:__construct\(\) has parameter \$config with no value type specified in iterable type array\.$#'
             count: 1
diff --git a/utils/phpstan-baseline/missingType.parameter.neon b/utils/phpstan-baseline/missingType.parameter.neon
index 687736a425dc..ca934a41eb53 100644
--- a/utils/phpstan-baseline/missingType.parameter.neon
+++ b/utils/phpstan-baseline/missingType.parameter.neon
@@ -1,4 +1,4 @@
-# total 51 errors
+# total 48 errors
 
 parameters:
     ignoreErrors:
@@ -12,21 +12,6 @@ parameters:
             count: 1
             path: ../../system/Database/PreparedQueryInterface.php
 
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockCURLRequest\:\:setOutput\(\) has parameter \$output with no type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockCURLRequest.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockTable\:\:__call\(\) has parameter \$method with no type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockTable.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockTable\:\:__call\(\) has parameter \$params with no type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockTable.php
-
         -
             message: '#^Method class@anonymous/tests/system/API/ResponseTraitTest\.php\:116\:\:__construct\(\) has parameter \$formatter with no type specified\.$#'
             count: 1
diff --git a/utils/phpstan-baseline/missingType.return.neon b/utils/phpstan-baseline/missingType.return.neon
index b40d9e062576..68700bf82235 100644
--- a/utils/phpstan-baseline/missingType.return.neon
+++ b/utils/phpstan-baseline/missingType.return.neon
@@ -1,367 +1,7 @@
-# total 118 errors
+# total 46 errors
 
 parameters:
     ignoreErrors:
-        -
-            message: '#^Method CodeIgniter\\ComposerScripts\:\:postUpdate\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/ComposerScripts.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\BaseBuilder\:\:resetRun\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/BaseBuilder.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\BaseBuilder\:\:resetSelect\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/BaseBuilder.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\BaseBuilder\:\:resetWrite\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/BaseBuilder.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Config\:\:ensureFactory\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Config.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Exceptions\\DataException\:\:forEmptyInputGiven\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Exceptions/DataException.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Exceptions\\DataException\:\:forFindColumnHaveMultipleColumns\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Exceptions/DataException.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Exceptions\\DataException\:\:forInvalidAllowedFields\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Exceptions/DataException.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Exceptions\\DataException\:\:forTableNotFound\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Exceptions/DataException.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Forge\:\:_attributeAutoIncrement\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Forge\:\:_attributeDefault\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Forge\:\:_attributeType\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Forge\:\:_attributeUnique\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Forge\:\:_attributeUnsigned\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Forge\:\:reset\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Migration\:\:down\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Migration.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Migration\:\:up\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Migration.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\MigrationRunner\:\:addHistory\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/MigrationRunner.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\MigrationRunner\:\:clearHistory\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/MigrationRunner.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\MigrationRunner\:\:ensureTable\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/MigrationRunner.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\MigrationRunner\:\:force\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/MigrationRunner.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\MigrationRunner\:\:removeHistory\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/MigrationRunner.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Postgre\\Connection\:\:buildDSN\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Postgre/Connection.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Postgre\\Forge\:\:_attributeAutoIncrement\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Postgre/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Postgre\\Forge\:\:_attributeType\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Postgre/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Query\:\:compileBinds\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Query.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\QueryInterface\:\:setError\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/QueryInterface.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\ResultInterface\:\:freeResult\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/ResultInterface.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\SQLSRV\\Forge\:\:_attributeAutoIncrement\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/SQLSRV/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\SQLSRV\\Forge\:\:_attributeType\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/SQLSRV/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\SQLite3\\Forge\:\:_attributeAutoIncrement\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/SQLite3/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\SQLite3\\Forge\:\:_attributeType\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/SQLite3/Forge.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\SQLite3\\Table\:\:copyData\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/SQLite3/Table.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\SQLite3\\Table\:\:dropIndexes\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/SQLite3/Table.php
-
-        -
-            message: '#^Method CodeIgniter\\Database\\Seeder\:\:call\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Database/Seeder.php
-
-        -
-            message: '#^Method CodeIgniter\\Router\\Router\:\:get404Override\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Router/Router.php
-
-        -
-            message: '#^Method CodeIgniter\\Session\\Exceptions\\SessionException\:\:forEmptySavepath\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Session/Exceptions/SessionException.php
-
-        -
-            message: '#^Method CodeIgniter\\Session\\Exceptions\\SessionException\:\:forInvalidSameSiteSetting\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Session/Exceptions/SessionException.php
-
-        -
-            message: '#^Method CodeIgniter\\Session\\Exceptions\\SessionException\:\:forInvalidSavePath\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Session/Exceptions/SessionException.php
-
-        -
-            message: '#^Method CodeIgniter\\Session\\Exceptions\\SessionException\:\:forInvalidSavePathFormat\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Session/Exceptions/SessionException.php
-
-        -
-            message: '#^Method CodeIgniter\\Session\\Exceptions\\SessionException\:\:forMissingDatabaseTable\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Session/Exceptions/SessionException.php
-
-        -
-            message: '#^Method CodeIgniter\\Session\\Exceptions\\SessionException\:\:forWriteProtectedSavePath\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Session/Exceptions/SessionException.php
-
-        -
-            message: '#^Method CodeIgniter\\Session\\Handlers\\Database\\PostgreHandler\:\:setSelect\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Session/Handlers/Database/PostgreHandler.php
-
-        -
-            message: '#^Method CodeIgniter\\Session\\Handlers\\DatabaseHandler\:\:setSelect\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Session/Handlers/DatabaseHandler.php
-
-        -
-            message: '#^Method CodeIgniter\\Session\\Handlers\\FileHandler\:\:configureSessionIDRegex\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Session/Handlers/FileHandler.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\CIUnitTestCase\:\:assertCloseEnough\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/CIUnitTestCase.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\CIUnitTestCase\:\:mockCache\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/CIUnitTestCase.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\CIUnitTestCase\:\:mockEmail\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/CIUnitTestCase.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\CIUnitTestCase\:\:mockSession\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/CIUnitTestCase.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\CIUnitTestCase\:\:resetFactories\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/CIUnitTestCase.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\CIUnitTestCase\:\:resetServices\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/CIUnitTestCase.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Fabricator\:\:resetCounts\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Fabricator.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockCURLRequest\:\:getBaseURI\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockCURLRequest.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockCURLRequest\:\:getDelay\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockCURLRequest.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockCURLRequest\:\:setOutput\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockCURLRequest.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockEvents\:\:getEventsFile\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockEvents.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockEvents\:\:getListeners\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockEvents.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockEvents\:\:getSimulate\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockEvents.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockEvents\:\:unInitialize\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockEvents.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockLanguage\:\:disableIntlSupport\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockLanguage.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockResourceController\:\:getFormat\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockResourceController.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockResourceController\:\:getModel\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockResourceController.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockResourceController\:\:getModelName\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockResourceController.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockResourcePresenter\:\:getFormat\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockResourcePresenter.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockResourcePresenter\:\:getModel\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockResourcePresenter.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockResourcePresenter\:\:getModelName\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockResourcePresenter.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockResponse\:\:getPretend\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockResponse.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockResponse\:\:misbehave\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockResponse.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\Mock\\MockTable\:\:__call\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/Mock/MockTable.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\PhpStreamWrapper\:\:register\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/PhpStreamWrapper.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\PhpStreamWrapper\:\:restore\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/PhpStreamWrapper.php
-
-        -
-            message: '#^Method CodeIgniter\\Test\\PhpStreamWrapper\:\:setContent\(\) has no return type specified\.$#'
-            count: 1
-            path: ../../system/Test/PhpStreamWrapper.php
-
         -
             message: '#^Method CodeIgniter\\API\\ResponseTraitTest\:\:invoke\(\) has no return type specified\.$#'
             count: 1