Merge branch 'develop' into 4.7

Author: paulbalandan

app/Config/Autoload.php

@@ -17,8 +17,6 @@
  *
  * NOTE: This class is required prior to Autoloader instantiation,
  *       and does not extend BaseConfig.
- *
- * @immutable
  */
 class Autoload extends AutoloadConfig
 {

app/Config/DocTypes.php

@@ -2,9 +2,6 @@
 
 namespace Config;
 
-/**
- * @immutable
- */
 class DocTypes
 {
     /**

app/Config/Mimes.php

@@ -3,8 +3,6 @@
 namespace Config;
 
 /**
- * Mimes
- *
  * This file contains an array of mime types.  It is used by the
  * Upload class to help identify allowed file types.
  *
@@ -15,8 +13,6 @@
  *
  * When working with mime types, please make sure you have the ´fileinfo´
  * extension enabled to reliably detect the media types.
- *
- * @immutable
  */
 class Mimes
 {

app/Config/Modules.php

@@ -9,8 +9,6 @@
  *
  * NOTE: This class is required prior to Autoloader instantiation,
  *       and does not extend BaseConfig.
- *
- * @immutable
  */
 class Modules extends BaseModules
 {

app/Config/Optimize.php

@@ -7,8 +7,6 @@
  *
  * NOTE: This class does not extend BaseConfig for performance reasons.
  *       So you cannot replace the property values with Environment Variables.
- *
- * @immutable
  */
 class Optimize
 {

app/Config/Paths.php

@@ -15,8 +15,6 @@
  *
  * NOTE: This class is required prior to Autoloader instantiation,
  *       and does not extend BaseConfig.
- *
- * @immutable
  */
 class Paths
 {

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) {

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);
 

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()
     {

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()
     {