From dcc6467b55672dd39d67edd1627976567b323003 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Nov 2023 11:29:59 +0900
Subject: [PATCH 1/5] chore: workaround for UndefinedClass

UndefinedClass: Class, interface or enum named SimpleConfig does not exist (see https://psalm.dev/019)
---
 psalm_autoload.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/psalm_autoload.php b/psalm_autoload.php
index d0f0c9af46..d42636a11f 100644
--- a/psalm_autoload.php
+++ b/psalm_autoload.php
@@ -25,6 +25,7 @@ foreach ($helperDirs as $dir) {
 
 $dirs = [
     'tests/_support/Controllers',
+    'tests/system/Config/fixtures',
 ];
 
 foreach ($dirs as $dir) {

From c6aa4426a8b6bcf651d4f6c544ccb2794fab7dfe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Nov 2023 07:05:37 +0900
Subject: [PATCH 2/5] docs: fix incorrect code

---
 user_guide_src/source/database/results/013.php | 2 +-
 user_guide_src/source/database/results/014.php | 2 +-
 user_guide_src/source/database/results/015.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/database/results/013.php b/user_guide_src/source/database/results/013.php
index d0b1e445f0..bb476f84eb 100644
--- a/user_guide_src/source/database/results/013.php
+++ b/user_guide_src/source/database/results/013.php
@@ -6,7 +6,7 @@ class User
     public $email;
     public $username;
 
-    protected $last_login;
+    protected $lastLogin;
 
     public function lastLogin($format)
     {
diff --git a/user_guide_src/source/database/results/014.php b/user_guide_src/source/database/results/014.php
index f0845bf55a..fe88c6f052 100644
--- a/user_guide_src/source/database/results/014.php
+++ b/user_guide_src/source/database/results/014.php
@@ -7,5 +7,5 @@ $rows = $query->getCustomResultObject('User');
 foreach ($rows as $row) {
     echo $row->id;
     echo $row->email;
-    echo $row->last_login('Y-m-d');
+    echo $row->lastLogin('Y-m-d');
 }
diff --git a/user_guide_src/source/database/results/015.php b/user_guide_src/source/database/results/015.php
index 247d5d8b53..31bc816a84 100644
--- a/user_guide_src/source/database/results/015.php
+++ b/user_guide_src/source/database/results/015.php
@@ -6,5 +6,5 @@ $row = $query->getCustomRowObject(0, 'User');
 
 if (isset($row)) {
     echo $row->email;               // access attributes
-    echo $row->last_login('Y-m-d'); // access class methods
+    echo $row->lastLogin('Y-m-d'); // access class methods
 }

From 745381c8393a3e41bcd3e97da2a75d533dfa8d2e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Nov 2023 07:06:33 +0900
Subject: [PATCH 3/5] docs: add namespace to User class

---
 user_guide_src/source/database/results/003.php | 4 ++--
 user_guide_src/source/database/results/007.php | 2 +-
 user_guide_src/source/database/results/013.php | 2 ++
 user_guide_src/source/database/results/014.php | 2 +-
 user_guide_src/source/database/results/015.php | 2 +-
 user_guide_src/source/database/results/016.php | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/database/results/003.php b/user_guide_src/source/database/results/003.php
index da55c19717..d3fc78cc8d 100644
--- a/user_guide_src/source/database/results/003.php
+++ b/user_guide_src/source/database/results/003.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('SELECT * FROM users;');
 
-foreach ($query->getResult('User') as $user) {
-    echo $user->name; // access attributes
+foreach ($query->getResult(\App\Entities\User::class) as $user) {
+    echo $user->name;          // access attributes
     echo $user->reverseName(); // or methods defined on the 'User' class
 }
diff --git a/user_guide_src/source/database/results/007.php b/user_guide_src/source/database/results/007.php
index 6a6c309efb..460857242a 100644
--- a/user_guide_src/source/database/results/007.php
+++ b/user_guide_src/source/database/results/007.php
@@ -1,7 +1,7 @@
 <?php
 
 $query = $db->query('SELECT * FROM users LIMIT 1;');
-$row   = $query->getRow(0, 'User');
+$row   = $query->getRow(0, \App\Entities\User::class);
 
 echo $row->name; // access attributes
 echo $row->reverse_name(); // or methods defined on the 'User' class
diff --git a/user_guide_src/source/database/results/013.php b/user_guide_src/source/database/results/013.php
index bb476f84eb..baef2cd97d 100644
--- a/user_guide_src/source/database/results/013.php
+++ b/user_guide_src/source/database/results/013.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Entities;
+
 class User
 {
     public $id;
diff --git a/user_guide_src/source/database/results/014.php b/user_guide_src/source/database/results/014.php
index fe88c6f052..1ee5af841a 100644
--- a/user_guide_src/source/database/results/014.php
+++ b/user_guide_src/source/database/results/014.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('YOUR QUERY');
 
-$rows = $query->getCustomResultObject('User');
+$rows = $query->getCustomResultObject(\App\Entities\User::class);
 
 foreach ($rows as $row) {
     echo $row->id;
diff --git a/user_guide_src/source/database/results/015.php b/user_guide_src/source/database/results/015.php
index 31bc816a84..7fff4e037b 100644
--- a/user_guide_src/source/database/results/015.php
+++ b/user_guide_src/source/database/results/015.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('YOUR QUERY');
 
-$row = $query->getCustomRowObject(0, 'User');
+$row = $query->getCustomRowObject(0, \App\Entities\User::class);
 
 if (isset($row)) {
     echo $row->email;               // access attributes
diff --git a/user_guide_src/source/database/results/016.php b/user_guide_src/source/database/results/016.php
index ed5ac68c4b..f6d0e2325c 100644
--- a/user_guide_src/source/database/results/016.php
+++ b/user_guide_src/source/database/results/016.php
@@ -1,3 +1,3 @@
 <?php
 
-$row = $query->getCustomRowObject(0, 'User');
+$row = $query->getCustomRowObject(0, \App\Entities\User::class);

From 63fc2c04c9cfea49d13aa7b3de8fd95f5c4e204c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Nov 2023 07:06:54 +0900
Subject: [PATCH 4/5] docs: align comments

---
 user_guide_src/source/database/results/007.php | 2 +-
 user_guide_src/source/database/results/015.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/database/results/007.php b/user_guide_src/source/database/results/007.php
index 460857242a..ed1550836a 100644
--- a/user_guide_src/source/database/results/007.php
+++ b/user_guide_src/source/database/results/007.php
@@ -3,5 +3,5 @@
 $query = $db->query('SELECT * FROM users LIMIT 1;');
 $row   = $query->getRow(0, \App\Entities\User::class);
 
-echo $row->name; // access attributes
+echo $row->name;           // access attributes
 echo $row->reverse_name(); // or methods defined on the 'User' class
diff --git a/user_guide_src/source/database/results/015.php b/user_guide_src/source/database/results/015.php
index 7fff4e037b..7cc9b7996e 100644
--- a/user_guide_src/source/database/results/015.php
+++ b/user_guide_src/source/database/results/015.php
@@ -5,6 +5,6 @@ $query = $db->query('YOUR QUERY');
 $row = $query->getCustomRowObject(0, \App\Entities\User::class);
 
 if (isset($row)) {
-    echo $row->email;               // access attributes
+    echo $row->email;              // access attributes
     echo $row->lastLogin('Y-m-d'); // access class methods
 }

From 247e7407a05c8e57c67d41d4861ec006b52088e5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Nov 2023 08:53:01 +0900
Subject: [PATCH 5/5] docs: change sample code to be more practical

---
 user_guide_src/source/database/events.rst     |  4 +++-
 user_guide_src/source/database/events/001.php | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/database/events.rst b/user_guide_src/source/database/events.rst
index 08fe73b090..8cefcad22d 100644
--- a/user_guide_src/source/database/events.rst
+++ b/user_guide_src/source/database/events.rst
@@ -21,6 +21,8 @@ DBQuery
 This event is triggered whenever a new query has been run, whether successful or not. The only parameter is
 a :doc:`Query </database/queries>` instance of the current query. You could use this to display all queries
 in STDOUT, or logging to a file, or even creating tools to do automatic query analysis to help you spot
-potentially missing indexes, slow queries, etc. An example usage might be:
+potentially missing indexes, slow queries, etc.
+
+An example usage might be:
 
 .. literalinclude:: events/001.php
diff --git a/user_guide_src/source/database/events/001.php b/user_guide_src/source/database/events/001.php
index 4461b715af..ed2bb1fcec 100644
--- a/user_guide_src/source/database/events/001.php
+++ b/user_guide_src/source/database/events/001.php
@@ -1,4 +1,18 @@
 <?php
 
 // In app/Config/Events.php
-Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
+
+namespace Config;
+
+use CodeIgniter\Events\Events;
+use CodeIgniter\Exceptions\FrameworkException;
+use CodeIgniter\HotReloader\HotReloader;
+
+// ...
+
+Events::on(
+    'DBQuery',
+    static function (\CodeIgniter\Database\Query $query) {
+        log_message('info', (string) $query);
+    }
+);