Release v4.4.3

actions-user · actions-user · commit a0339851ed3f · 2023-10-26T22:45:01.000Z
diff --git a/app/Config/Boot/development.php b/app/Config/Boot/development.php
@@ -7,6 +7,8 @@
  | In development, we want to show as many errors as possible to help
  | make sure they don't make it to production. And save us hours of
  | painful debugging.
+ |
+ | If you set 'display_errors' to '1', CI4's detailed error report will show.
  */
 error_reporting(-1);
 ini_set('display_errors', '1');
diff --git a/app/Config/Boot/production.php b/app/Config/Boot/production.php
@@ -6,6 +6,8 @@
  |--------------------------------------------------------------------------
  | Don't show ANY in production environments. Instead, let the system catch
  | it and display a generic error message.
+ |
+ | If you set 'display_errors' to '1', CI4's detailed error report will show.
  */
 ini_set('display_errors', '0');
 error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
diff --git a/app/Config/Boot/testing.php b/app/Config/Boot/testing.php
@@ -1,5 +1,11 @@
 <?php
 
+/*
+ * The environment testing is reserved for PHPUnit testing. It has special
+ * conditions built into the framework at various places to assist with that.
+ * You can’t use it for your development.
+ */
+
 /*
  |--------------------------------------------------------------------------
  | ERROR DISPLAY
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
@@ -15,8 +15,9 @@ class Filters extends BaseConfig
      * Configures aliases for Filter classes to
      * make reading things nicer and simpler.
      *
-     * @var array<string, string>
-     * @phpstan-var array<string, class-string>
+     * @var array<string, array<int, string>|string> [filter_name => classname]
+     *                                               or [filter_name => [classname1, classname2, ...]]
+     * @phpstan-var array<string, class-string|list<class-string>>
      */
     public array $aliases = [
         'csrf'          => CSRF::class,
diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php
@@ -77,7 +77,7 @@
                 <?= nl2br(esc($message)) ?>
             <?php else : ?>
                 <?= lang('Errors.sorryCannotFind') ?>
-            <?php endif ?>
+            <?php endif; ?>
         </p>
     </div>
 </body>
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
@@ -44,6 +44,7 @@
         <?php endif; ?>
     </div>
 
+    <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) : ?>
     <div class="container">
 
         <ul class="tabs" id="tabs">
@@ -66,7 +67,7 @@
                     <li>
                         <p>
                             <!-- Trace info -->
-                            <?php if (isset($row['file']) && is_file($row['file'])) :?>
+                            <?php if (isset($row['file']) && is_file($row['file'])) : ?>
                                 <?php
                                 if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once'], true)) {
                                     echo esc($row['function'] . ' ' . clean_path($row['file']));
@@ -375,14 +376,16 @@
         </div>  <!-- /tab-content -->
 
     </div> <!-- /container -->
+    <?php endif; ?>
 
     <div class="footer">
         <div class="container">
 
             <p>
                 Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
                 PHP: <?= esc(PHP_VERSION) ?>  &mdash;
-                CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?>
+                CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
+                Environment: <?= ENVIRONMENT ?>
             </p>
 
         </div>
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -54,7 +54,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.4.2';
+    public const CI_VERSION = '4.4.3';
 
     /**
      * App startup time.
diff --git a/system/Commands/Generators/ModelGenerator.php b/system/Commands/Generators/ModelGenerator.php
@@ -101,9 +101,8 @@ protected function prepare(string $class): string
             $baseClass = $match[1];
         }
 
-        $table   = is_string($table) ? $table : plural(strtolower($baseClass));
-        $dbGroup = is_string($dbGroup) ? $dbGroup : 'default';
-        $return  = is_string($return) ? $return : 'array';
+        $table  = is_string($table) ? $table : plural(strtolower($baseClass));
+        $return = is_string($return) ? $return : 'array';
 
         if (! in_array($return, ['array', 'object', 'entity'], true)) {
             // @codeCoverageIgnoreStart
@@ -129,6 +128,6 @@ protected function prepare(string $class): string
             $return = "'{$return}'";
         }
 
-        return $this->parseTemplate($class, ['{table}', '{dbGroup}', '{return}'], [$table, $dbGroup, $return]);
+        return $this->parseTemplate($class, ['{dbGroup}', '{table}', '{return}'], [$dbGroup, $table, $return], compact('dbGroup'));
     }
 }
diff --git a/system/Commands/Generators/Views/model.tpl.php b/system/Commands/Generators/Views/model.tpl.php
@@ -6,7 +6,9 @@
 
 class {class} extends Model
 {
+<?php if (is_string($dbGroup)): ?>
     protected $DBGroup          = '{dbGroup}';
+<?php endif; ?>
     protected $table            = '{table}';
     protected $primaryKey       = 'id';
     protected $useAutoIncrement = true;
diff --git a/system/Common.php b/system/Common.php
@@ -579,7 +579,7 @@ function function_usable(string $functionName): bool
 if (! function_exists('helper')) {
     /**
      * Loads a helper file into memory. Supports namespaced helpers,
-     * both in and out of the 'helpers' directory of a namespaced directory.
+     * both in and out of the 'Helpers' directory of a namespaced directory.
      *
      * Will load ALL helpers of the matching name, in the following order:
      *   1. app/Helpers
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
@@ -55,7 +55,7 @@ class BaseConfig
     /**
      * The modules configuration.
      *
-     * @var Modules
+     * @var Modules|null
      */
     protected static $moduleConfig;
 
@@ -74,6 +74,27 @@ public static function __set_state(array $array)
         return $obj;
     }
 
+    /**
+     * @internal For testing purposes only.
+     * @testTag
+     */
+    public static function setModules(Modules $modules): void
+    {
+        static::$moduleConfig = $modules;
+    }
+
+    /**
+     * @internal For testing purposes only.
+     * @testTag
+     */
+    public static function reset(): void
+    {
+        static::$registrars   = [];
+        static::$override     = true;
+        static::$didDiscovery = false;
+        static::$moduleConfig = null;
+    }
+
     /**
      * Will attempt to get environment variables with names
      * that match the properties of the child class.
@@ -82,7 +103,7 @@ public static function __set_state(array $array)
      */
     public function __construct()
     {
-        static::$moduleConfig = config(Modules::class);
+        static::$moduleConfig ??= new Modules();
 
         if (! static::$override) {
             return;
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
@@ -330,9 +330,7 @@ public static function injectMock(string $name, $mock)
     protected static function discoverServices(string $name, array $arguments)
     {
         if (! static::$discovered) {
-            $config = config(Modules::class);
-
-            if ($config->shouldDiscover('services')) {
+            if ((new Modules())->shouldDiscover('services')) {
                 $locator = static::locator();
                 $files   = $locator->search('Config/Services');
 
@@ -372,9 +370,7 @@ protected static function discoverServices(string $name, array $arguments)
     protected static function buildServicesCache(): void
     {
         if (! static::$discovered) {
-            $config = config(Modules::class);
-
-            if ($config->shouldDiscover('services')) {
+            if ((new Modules())->shouldDiscover('services')) {
                 $locator = static::locator();
                 $files   = $locator->search('Config/Services');
 
diff --git a/system/Debug/ExceptionHandler.php b/system/Debug/ExceptionHandler.php
@@ -129,7 +129,13 @@ protected function determineView(Throwable $exception, string $templatePath): st
         // Production environments should have a custom exception file.
         $view = 'production.php';
 
-        if (str_ireplace(['off', 'none', 'no', 'false', 'null'], '', ini_get('display_errors')) !== '') {
+        if (
+            in_array(
+                strtolower(ini_get('display_errors')),
+                ['1', 'true', 'on', 'yes'],
+                true
+            )
+        ) {
             $view = 'error_exception.php';
         }
 
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
@@ -253,7 +253,13 @@ protected function determineView(Throwable $exception, string $templatePath): st
         $view         = 'production.php';
         $templatePath = rtrim($templatePath, '\\/ ') . DIRECTORY_SEPARATOR;
 
-        if (str_ireplace(['off', 'none', 'no', 'false', 'null'], '', ini_get('display_errors')) !== '') {
+        if (
+            in_array(
+                strtolower(ini_get('display_errors')),
+                ['1', 'true', 'on', 'yes'],
+                true
+            )
+        ) {
             $view = 'error_exception.php';
         }
 
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
@@ -132,26 +132,68 @@ protected function getFilterCaller($filter, string $position): Closure
                     throw new RuntimeException("No filter found with alias '{$filter}'");
                 }
 
-                $filter = $this->filtersConfig->aliases[$filter];
+                $filterClasses = $this->filtersConfig->aliases[$filter];
             }
 
-            // Get an instance
-            $filter = new $filter();
+            $filterClasses = (array) $filterClasses;
         }
 
-        if (! $filter instanceof FilterInterface) {
-            throw FilterException::forIncorrectInterface(get_class($filter));
+        foreach ($filterClasses as $class) {
+            // Get an instance
+            $filter = new $class();
+
+            if (! $filter instanceof FilterInterface) {
+                throw FilterException::forIncorrectInterface(get_class($filter));
+            }
         }
 
         $request = clone $this->request;
 
         if ($position === 'before') {
-            return static fn (?array $params = null) => $filter->before($request, $params);
+            return static function (?array $params = null) use ($filterClasses, $request) {
+                foreach ($filterClasses as $class) {
+                    $filter = new $class();
+
+                    $result = $filter->before($request, $params);
+
+                    // @TODO The following logic is in Filters class.
+                    //       Should use Filters class.
+                    if ($result instanceof RequestInterface) {
+                        $request = $result;
+
+                        continue;
+                    }
+                    if ($result instanceof ResponseInterface) {
+                        return $result;
+                    }
+                    if (empty($result)) {
+                        continue;
+                    }
+                }
+
+                return $result;
+            };
         }
 
         $response = clone $this->response;
 
-        return static fn (?array $params = null) => $filter->after($request, $response, $params);
+        return static function (?array $params = null) use ($filterClasses, $request, $response) {
+            foreach ($filterClasses as $class) {
+                $filter = new $class();
+
+                $result = $filter->after($request, $response, $params);
+
+                // @TODO The following logic is in Filters class.
+                //       Should use Filters class.
+                if ($result instanceof ResponseInterface) {
+                    $response = $result;
+
+                    continue;
+                }
+            }
+
+            return $result;
+        };
     }
 
     /**
diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
@@ -63,6 +63,10 @@ public function equals($str, string $val): bool
      */
     public function exact_length($str, string $val): bool
     {
+        if (is_int($str) || is_float($str)) {
+            $str = (string) $str;
+        }
+
         if (! is_string($str)) {
             return false;
         }
diff --git a/system/View/Table.php b/system/View/Table.php
@@ -265,7 +265,7 @@ protected function _prepArgs(array $args)
         // If there is no $args[0], skip this and treat as an associative array
         // This can happen if there is only a single key, for example this is passed to table->generate
         // array(array('foo'=>'bar'))
-        if (isset($args[0]) && count($args) === 1 && is_array($args[0]) && ! isset($args[0]['data'])) {
+        if (isset($args[0]) && count($args) === 1 && is_array($args[0])) {
             $args = $args[0];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,8 @@ protected function prepare(string $class): string`
`101`	`101`	`$baseClass = $match[1];`
`102`	`102`	`}`
`103`	`103`
`104`		`- $table = is_string($table) ? $table : plural(strtolower($baseClass));`
`105`		`- $dbGroup = is_string($dbGroup) ? $dbGroup : 'default';`
`106`		`- $return = is_string($return) ? $return : 'array';`
	`104`	`+ $table = is_string($table) ? $table : plural(strtolower($baseClass));`
	`105`	`+ $return = is_string($return) ? $return : 'array';`
`107`	`106`
`108`	`107`	`if (! in_array($return, ['array', 'object', 'entity'], true)) {`
`109`	`108`	`// @codeCoverageIgnoreStart`
`@@ -129,6 +128,6 @@ protected function prepare(string $class): string`
`129`	`128`	`$return = "'{$return}'";`
`130`	`129`	`}`
`131`	`130`
`132`		`- return $this->parseTemplate($class, ['{table}', '{dbGroup}', '{return}'], [$table, $dbGroup, $return]);`
	`131`	`+ return $this->parseTemplate($class, ['{dbGroup}', '{table}', '{return}'], [$dbGroup, $table, $return], compact('dbGroup'));`
`133`	`132`	`}`
`134`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,9 @@`
`6`	`6`
`7`	`7`	`class {class} extends Model`
`8`	`8`	`{`
	`9`	`+<?php if (is_string($dbGroup)): ?>`
`9`	`10`	`protected $DBGroup = '{dbGroup}';`
	`11`	`+<?php endif; ?>`
`10`	`12`	`protected $table = '{table}';`
`11`	`13`	`protected $primaryKey = 'id';`
`12`	`14`	`protected $useAutoIncrement = true;`
Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,7 @@ function function_usable(string $functionName): bool`
`579`	`579`	`if (! function_exists('helper')) {`
`580`	`580`	`/**`
`581`	`581`	`* Loads a helper file into memory. Supports namespaced helpers,`
`582`		`- * both in and out of the 'helpers' directory of a namespaced directory.`
	`582`	`+ * both in and out of the 'Helpers' directory of a namespaced directory.`
`583`	`583`	`*`
`584`	`584`	`* Will load ALL helpers of the matching name, in the following order:`
`585`	`585`	`* 1. app/Helpers`