Merge pull request #221 from kenjis/update-ci-445

kenjis · web-flow · commit 99c0a2cee00c · 2024-02-16T08:22:16.000+09:00
Update to CI 4.4.5
diff --git a/app/Commands/DungeonsList.php b/app/Commands/DungeonsList.php
@@ -29,7 +29,7 @@ class DungeonsList extends BaseCommand
     protected $usage = 'dungeons:list';
 
     /**
-     * @var mixed[]
+     * @var array<string, string>
      */
     protected $arguments = [];
 
diff --git a/app/Config/App.php b/app/Config/App.php
@@ -27,8 +27,7 @@ class App extends BaseConfig
      *      'http://accounts.example.com/':
      *          ['media.example.com', 'accounts.example.com']
      *
-     * @var string[]
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     public array $allowedHostnames = [];
 
diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
@@ -41,8 +41,7 @@ class Autoload extends AutoloadConfig
      *       'App'         => APPPATH
      *   ];
      *
-     * @var array<string, array<int, string>|string>
-     * @phpstan-var array<string, string|list<string>>
+     * @var array<string, list<string>|string>
      */
     public $psr4 = [
         APP_NAMESPACE => APPPATH, // For custom app namespace
@@ -81,8 +80,7 @@ class Autoload extends AutoloadConfig
      *       '/path/to/my/file.php',
      *   ];
      *
-     * @var string[]
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     public $files = [];
 
@@ -95,8 +93,7 @@ class Autoload extends AutoloadConfig
      *       'form',
      *   ];
      *
-     * @var string[]
-     * @phpstan-var list<string>
+     * @var list<string>
      */
     public $helpers = [];
 }
diff --git a/app/Config/Boot/development.php b/app/Config/Boot/development.php
@@ -10,7 +10,7 @@
  |
  | If you set 'display_errors' to '1', CI4's detailed error report will show.
  */
-error_reporting(-1);
+error_reporting(E_ALL);
 ini_set('display_errors', '1');
 
 /*
diff --git a/app/Config/Boot/testing.php b/app/Config/Boot/testing.php
@@ -14,7 +14,7 @@
  | make sure they don't make it to production. And save us hours of
  | painful debugging.
  */
-error_reporting(-1);
+error_reporting(E_ALL);
 ini_set('display_errors', '1');
 
 /*
diff --git a/app/Config/Cache.php b/app/Config/Cache.php
@@ -158,8 +158,7 @@ class Cache extends BaseConfig
      * This is an array of cache engine alias' and class names. Only engines
      * that are listed here are allowed to be used.
      *
-     * @var array<string, string>
-     * @phpstan-var array<string, class-string<CacheInterface>>
+     * @var array<string, class-string<CacheInterface>>
      */
     public array $validHandlers = [
         'dummy'     => DummyHandler::class,
diff --git a/app/Config/Email.php b/app/Config/Email.php
@@ -26,7 +26,7 @@ class Email extends BaseConfig
     public string $mailPath = '/usr/sbin/sendmail';
 
     /**
-     * SMTP Server Address
+     * SMTP Server Hostname
      */
     public string $SMTPHost = '';
 
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
@@ -15,9 +15,8 @@ class Filters extends BaseConfig
      * Configures aliases for Filter classes to
      * make reading things nicer and simpler.
      *
-     * @var array<string, array<int, string>|string> [filter_name => classname]
-     *                                               or [filter_name => [classname1, classname2, ...]]
-     * @phpstan-var array<string, class-string|list<class-string>>
+     * @var array<string, class-string|list<class-string>> [filter_name => classname]
+     *                                                     or [filter_name => [classname1, classname2, ...]]
      */
     public array $aliases = [
         'csrf'          => CSRF::class,
@@ -31,8 +30,7 @@ class Filters extends BaseConfig
      * List of filter aliases that are always
      * applied before and after every request.
      *
-     * @var array<string, array<string, array<string, string>>>|array<string, array<string>>
-     * @phpstan-var array<string, list<string>>|array<string, array<string, array<string, string>>>
+     * @var array<string, array<string, array<string, string>>>|array<string, list<string>>
      */
     public array $globals = [
         'before' => [
diff --git a/app/Config/Kint.php b/app/Config/Kint.php
@@ -27,8 +27,7 @@ class Kint extends BaseConfig
     */
 
     /**
-     * @var array<int, ConstructablePluginInterface|string>
-     * @phpstan-var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>
+     * @var list<class-string<ConstructablePluginInterface>|ConstructablePluginInterface>|null
      */
     public $plugins;
 
@@ -46,14 +45,12 @@ class Kint extends BaseConfig
     public int $richSort     = AbstractRenderer::SORT_FULL;
 
     /**
-     * @var array<string, string>
-     * @phpstan-var array<string, class-string<ValuePluginInterface>>
+     * @var array<string, class-string<ValuePluginInterface>>|null
      */
     public $richObjectPlugins;
 
     /**
-     * @var array<string, string>
-     * @phpstan-var array<string, class-string<TabPluginInterface>>
+     * @var array<string, class-string<TabPluginInterface>>|null
      */
     public $richTabPlugins;
 
diff --git a/app/Config/Modules.php b/app/Config/Modules.php
@@ -58,7 +58,7 @@ class Modules extends BaseModules
      *       ],
      *   ]
      *
-     * @var array
+     * @var array{only?: list<string>, exclude?: list<string>}
      */
     public $composerPackages = [];
 
@@ -72,7 +72,7 @@ class Modules extends BaseModules
      *
      * If it is not listed, only the base application elements will be used.
      *
-     * @var string[]
+     * @var list<string>
      */
     public $aliases = [
         'events',
diff --git a/app/Config/Publisher.php b/app/Config/Publisher.php
@@ -19,7 +19,7 @@ class Publisher extends BasePublisher
      * result in a PublisherException. Files that do no fit the
      * pattern will cause copy/merge to fail.
      *
-     * @var array<string,string>
+     * @var array<string, string>
      */
     public $restrictions = [
         ROOTPATH => '*',
diff --git a/app/Config/Session.php b/app/Config/Session.php
@@ -19,7 +19,7 @@ class Session extends BaseConfig
      * - `CodeIgniter\Session\Handlers\MemcachedHandler`
      * - `CodeIgniter\Session\Handlers\RedisHandler`
      *
-     * @phpstan-var class-string<BaseHandler>
+     * @var class-string<BaseHandler>
      */
     public string $driver = FileHandler::class;
 
diff --git a/app/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
@@ -3,17 +3,26 @@
 use CodeIgniter\CLI\CLI;
 
 // The main Exception
-CLI::newLine();
 CLI::write('[' . get_class($exception) . ']', 'light_gray', 'red');
-CLI::newLine();
 CLI::write($message);
-CLI::newLine();
 CLI::write('at ' . CLI::color(clean_path($exception->getFile()) . ':' . $exception->getLine(), 'green'));
 CLI::newLine();
 
+$last = $exception;
+
+while ($prevException = $last->getPrevious()) {
+    $last = $prevException;
+
+    CLI::write('  Caused by:');
+    CLI::write('  [' . get_class($prevException) . ']', 'red');
+    CLI::write('  ' . $prevException->getMessage());
+    CLI::write('  at ' . CLI::color(clean_path($prevException->getFile()) . ':' . $prevException->getLine(), 'green'));
+    CLI::newLine();
+}
+
 // The backtrace
 if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) {
-    $backtraces = $exception->getTrace();
+    $backtraces = $last->getTrace();
 
     if ($backtraces) {
         CLI::write('Backtrace:', 'green');
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
@@ -44,6 +44,29 @@
         <?php endif; ?>
     </div>
 
+    <div class="container">
+        <?php
+        $last = $exception;
+
+        while ($prevException = $last->getPrevious()) {
+            $last = $prevException;
+            ?>
+
+    <pre>
+    Caused by:
+    <?= esc(get_class($prevException)), esc($prevException->getCode() ? ' #' . $prevException->getCode() : '') ?>
+
+    <?= nl2br(esc($prevException->getMessage())) ?>
+    <a href="https://www.duckduckgo.com/?q=<?= urlencode(get_class($prevException) . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $prevException->getMessage())) ?>"
+       rel="noreferrer" target="_blank">search &rarr;</a>
+    <?= esc(clean_path($prevException->getFile()) . ':' . $prevException->getLine()) ?>
+    </pre>
+
+        <?php
+        }
+        ?>
+    </div>
+
     <?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) : ?>
     <div class="container">
 
diff --git a/composer.json b/composer.json
@@ -28,7 +28,8 @@
   "require-dev": {
     "psr/container": "1.1.2",
     "codeigniter4/devkit": "^1.0",
-    "tatter/patches": "^2.1"
+    "tatter/patches": "^2.1",
+    "kint-php/kint": "^5.1"
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
diff --git a/composer.lock b/composer.lock
diff --git a/env b/env
diff --git a/rector.php b/rector.php
diff --git a/spark b/spark

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ class App extends BaseConfig`
`27`	`27`	`* 'http://accounts.example.com/':`
`28`	`28`	`* ['media.example.com', 'accounts.example.com']`
`29`	`29`	`*`
`30`		`- * @var string[]`
`31`		`- * @phpstan-var list<string>`
	`30`	`+ * @var list<string>`
`32`	`31`	`*/`
`33`	`32`	`public array $allowedHostnames = [];`
`34`	`33`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`\|`
`11`	`11`	`\| If you set 'display_errors' to '1', CI4's detailed error report will show.`
`12`	`12`	`*/`
`13`		`-error_reporting(-1);`
	`13`	`+error_reporting(E_ALL);`
`14`	`14`	`ini_set('display_errors', '1');`
`15`	`15`
`16`	`16`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class Modules extends BaseModules`
`58`	`58`	`* ],`
`59`	`59`	`* ]`
`60`	`60`	`*`
`61`		`- * @var array`
	`61`	`+ * @var array{only?: list<string>, exclude?: list<string>}`
`62`	`62`	`*/`
`63`	`63`	`public $composerPackages = [];`
`64`	`64`
`@@ -72,7 +72,7 @@ class Modules extends BaseModules`
`72`	`72`	`*`
`73`	`73`	`* If it is not listed, only the base application elements will be used.`
`74`	`74`	`*`
`75`		`- * @var string[]`
	`75`	`+ * @var list<string>`
`76`	`76`	`*/`
`77`	`77`	`public $aliases = [`
`78`	`78`	`'events',`