Merge pull request #6182 from kenjis/fix-exception-logging

refactor: replace $e->getMessage() with $e in log_message()

Author: kenjis

system/CLI/CLI.php

@@ -673,7 +673,7 @@ public static function generateDimensions()
             // Then let the developer know of the error.
             static::$height = null;
             static::$width  = null;
-            log_message('error', $e->getMessage());
+            log_message('error', (string) $e);
         }
     }
 

system/CLI/GeneratorTrait.php

@@ -234,7 +234,7 @@ protected function renderTemplate(array $data = []): string
         try {
             return view(config('Generators')->views[$this->name], $data, ['debug' => false]);
         } catch (Throwable $e) {
-            log_message('error', $e->getMessage());
+            log_message('error', (string) $e);
 
             return view("CodeIgniter\\Commands\\Generators\\Views\\{$this->template}", $data, ['debug' => false]);
         }

system/Cache/CacheFactory.php

@@ -73,7 +73,7 @@ public static function getHandler(Cache $config, ?string $handler = null, ?strin
         try {
             $adapter->initialize();
         } catch (CriticalError $e) {
-            log_message('critical', $e->getMessage() . ' Resorting to using ' . $backup . ' handler.');
+            log_message('critical', $e . ' Resorting to using ' . $backup . ' handler.');
 
             // get the next best cache handler (or dummy if the $backup also fails)
             $adapter = self::getHandler($config, $backup, 'dummy');

system/Cache/Handlers/FileHandler.php

@@ -102,7 +102,7 @@ public function save(string $key, $value, int $ttl = 60)
 
                 // @codeCoverageIgnoreStart
             } catch (Throwable $e) {
-                log_message('debug', 'Failed to set mode on cache file: ' . $e->getMessage());
+                log_message('debug', 'Failed to set mode on cache file: ' . $e);
                 // @codeCoverageIgnoreEnd
             }
 

system/Cookie/CookieStore.php

@@ -49,7 +49,7 @@ public static function fromCookieHeaders(array $headers, bool $raw = false)
             try {
                 return Cookie::fromHeaderString($header, $raw);
             } catch (CookieException $e) {
-                log_message('error', $e->getMessage());
+                log_message('error', (string) $e);
 
                 return false;
             }

system/Database/BaseConnection.php

@@ -380,7 +380,7 @@ public function initialize()
             $this->connID = $this->connect($this->pConnect);
         } catch (Throwable $e) {
             $connectionErrors[] = sprintf('Main connection [%s]: %s', $this->DBDriver, $e->getMessage());
-            log_message('error', 'Error connecting to the database: ' . $e->getMessage());
+            log_message('error', 'Error connecting to the database: ' . $e);
         }
 
         // No connection resource? Check if there is a failover else throw an error
@@ -401,7 +401,7 @@ public function initialize()
                         $this->connID = $this->connect($this->pConnect);
                     } catch (Throwable $e) {
                         $connectionErrors[] = sprintf('Failover #%d [%s]: %s', ++$index, $this->DBDriver, $e->getMessage());
-                        log_message('error', 'Error connecting to the database: ' . $e->getMessage());
+                        log_message('error', 'Error connecting to the database: ' . $e);
                     }
 
                     // If a connection is made break the foreach loop

system/Database/MySQLi/Connection.php

@@ -291,7 +291,7 @@ protected function execute(string $sql)
         try {
             return $this->connID->query($this->prepQuery($sql), $this->resultMode);
         } catch (mysqli_sql_exception $e) {
-            log_message('error', $e->getMessage());
+            log_message('error', (string) $e);
 
             if ($this->DBDebug) {
                 throw $e;

system/Database/OCI8/Connection.php

@@ -204,7 +204,7 @@ protected function execute(string $sql)
 
             return $result;
         } catch (ErrorException $e) {
-            log_message('error', $e->getMessage());
+            log_message('error', (string) $e);
 
             if ($this->DBDebug) {
                 throw $e;

system/Database/Postgre/Connection.php

@@ -134,7 +134,7 @@ protected function execute(string $sql)
         try {
             return pg_query($this->connID, $sql);
         } catch (ErrorException $e) {
-            log_message('error', $e);
+            log_message('error', (string) $e);
             if ($this->DBDebug) {
                 throw $e;
             }

system/Database/SQLite3/Connection.php

@@ -129,7 +129,7 @@ protected function execute(string $sql)
                 ? $this->connID->exec($sql)
                 : $this->connID->query($sql);
         } catch (ErrorException $e) {
-            log_message('error', $e);
+            log_message('error', (string) $e);
             if ($this->DBDebug) {
                 throw $e;
             }