fix: Exception rework

system/Autoloader/Autoloader.php

@@ -14,17 +14,17 @@
 namespace CodeIgniter\Autoloader;
 
 use CodeIgniter\Exceptions\ConfigException;
+use CodeIgniter\Exceptions\InvalidArgumentException;
+use CodeIgniter\Exceptions\RuntimeException;
 use Composer\Autoload\ClassLoader;
 use Composer\InstalledVersions;
 use Config\Autoload;
 use Config\Kint as KintConfig;
 use Config\Modules;
 use Config\Services;
-use InvalidArgumentException;
 use Kint;
 use Kint\Renderer\CliRenderer;
 use Kint\Renderer\RichRenderer;
-use RuntimeException;
 
 /**
  * An autoloader that uses both PSR4 autoloading, and traditional classmaps.

system/BaseModel.php

@@ -21,13 +21,13 @@
 use CodeIgniter\Database\Query;
 use CodeIgniter\DataConverter\DataConverter;
 use CodeIgniter\Entity\Entity;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 use CodeIgniter\Exceptions\ModelException;
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Pager\Pager;
 use CodeIgniter\Validation\ValidationInterface;
 use Config\Feature;
 use Config\Services;
-use InvalidArgumentException;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionProperty;

system/CLI/CLI.php

@@ -14,8 +14,8 @@
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\CLI\Exceptions\CLIException;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 use Config\Services;
-use InvalidArgumentException;
 use Throwable;
 
 /**

system/CLI/Exceptions/CLIException.php

@@ -14,7 +14,7 @@
 namespace CodeIgniter\CLI\Exceptions;
 
 use CodeIgniter\Exceptions\DebugTraceableTrait;
-use RuntimeException;
+use CodeIgniter\Exceptions\RuntimeException;
 
 /**
  * CLIException

system/Cache/Exceptions/CacheException.php

@@ -14,13 +14,12 @@
 namespace CodeIgniter\Cache\Exceptions;
 
 use CodeIgniter\Exceptions\DebugTraceableTrait;
-use CodeIgniter\Exceptions\ExceptionInterface;
-use RuntimeException;
+use CodeIgniter\Exceptions\RuntimeException;
 
 /**
  * CacheException
  */
-class CacheException extends RuntimeException implements ExceptionInterface
+class CacheException extends RuntimeException
 {
     use DebugTraceableTrait;
 

system/Cache/Handlers/BaseHandler.php

@@ -15,9 +15,10 @@
 
 use Closure;
 use CodeIgniter\Cache\CacheInterface;
+use CodeIgniter\Exceptions\BadMethodCallException;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 use Config\Cache;
 use Exception;
-use InvalidArgumentException;
 
 /**
  * Base class for cache handling
@@ -108,6 +109,6 @@ public function remember(string $key, int $ttl, Closure $callback)
      */
     public function deleteMatching(string $pattern)
     {
-        throw new Exception('The deleteMatching method is not implemented.');
+        throw new BadMethodCallException('The deleteMatching method is not implemented.');
     }
 }

system/Cache/Handlers/MemcachedHandler.php

@@ -13,6 +13,7 @@
 
 namespace CodeIgniter\Cache\Handlers;
 
+use CodeIgniter\Exceptions\BadMethodCallException;
 use CodeIgniter\Exceptions\CriticalError;
 use CodeIgniter\I18n\Time;
 use Config\Cache;
@@ -197,7 +198,7 @@ public function delete(string $key)
      */
     public function deleteMatching(string $pattern)
     {
-        throw new Exception('The deleteMatching method is not implemented for Memcached. You must select File, Redis or Predis handlers to use it.');
+        throw new BadMethodCallException('The deleteMatching method is not implemented for Memcached. You must select File, Redis or Predis handlers to use it.');
     }
 
     /**

system/Cache/Handlers/WincacheHandler.php

@@ -13,9 +13,9 @@
 
 namespace CodeIgniter\Cache\Handlers;
 
+use CodeIgniter\Exceptions\BadMethodCallException;
 use CodeIgniter\I18n\Time;
 use Config\Cache;
-use Exception;
 
 /**
  * Cache handler for WinCache from Microsoft & IIS.
@@ -80,7 +80,7 @@ public function delete(string $key)
      */
     public function deleteMatching(string $pattern)
     {
-        throw new Exception('The deleteMatching method is not implemented for Wincache. You must select File, Redis or Predis handlers to use it.');
+        throw new BadMethodCallException('The deleteMatching method is not implemented for Wincache. You must select File, Redis or Predis handlers to use it.');
     }
 
     /**

system/Cache/ResponseCache.php

@@ -13,12 +13,12 @@
 
 namespace CodeIgniter\Cache;
 
+use CodeIgniter\Exceptions\RuntimeException;
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\Header;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Cache as CacheConfig;
-use Exception;
 
 /**
  * Web Page Caching
@@ -131,7 +131,7 @@ public function get($request, ResponseInterface $response): ?ResponseInterface
                 || ! isset($cachedResponse['output'])
                 || ! isset($cachedResponse['headers'])
             ) {
-                throw new Exception('Error unserializing page cache');
+                throw new RuntimeException('Error unserializing page cache');
             }
 
             $headers = $cachedResponse['headers'];

system/CodeIgniter.php

@@ -16,6 +16,7 @@
 use CodeIgniter\Debug\Timer;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\FrameworkException;
+use CodeIgniter\Exceptions\LogicException;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\Filters\Filters;
 use CodeIgniter\HTTP\CLIRequest;
@@ -41,7 +42,6 @@
 use Kint\Renderer\CliRenderer;
 use Kint\Renderer\RichRenderer;
 use Locale;
-use LogicException;
 use Throwable;
 
 /**

system/Commands/Database/ShowTableInfo.php

@@ -16,8 +16,8 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 use Config\Database;
-use InvalidArgumentException;
 
 /**
  * Get table data if it exists in the database.

system/Commands/Utilities/Optimize.php

@@ -17,8 +17,8 @@
 use CodeIgniter\Autoloader\FileLocatorCached;
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
+use CodeIgniter\Exceptions\RuntimeException;
 use CodeIgniter\Publisher\Publisher;
-use RuntimeException;
 
 /**
  * Optimize for production.

system/Common.php

@@ -20,6 +20,8 @@
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Debug\Timer;
+use CodeIgniter\Exceptions\InvalidArgumentException;
+use CodeIgniter\Exceptions\RuntimeException;
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\Exceptions\HTTPException;

system/Config/BaseConfig.php

@@ -11,11 +11,11 @@
 
 namespace CodeIgniter\Config;
 
+use CodeIgniter\Exceptions\RuntimeException;
 use Config\Encryption;
 use Config\Modules;
 use ReflectionClass;
 use ReflectionException;
-use RuntimeException;
 
 /**
  * Class BaseConfig

system/Config/BaseService.php

@@ -29,6 +29,7 @@
 use CodeIgniter\Debug\Toolbar;
 use CodeIgniter\Email\Email;
 use CodeIgniter\Encryption\EncrypterInterface;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 use CodeIgniter\Filters\Filters;
 use CodeIgniter\Format\Format;
 use CodeIgniter\Honeypot\Honeypot;
@@ -78,7 +79,6 @@
 use Config\Toolbar as ConfigToolbar;
 use Config\Validation as ConfigValidation;
 use Config\View as ConfigView;
-use InvalidArgumentException;
 
 /**
  * Services Configuration file.

system/Config/DotEnv.php

@@ -13,7 +13,7 @@
 
 namespace CodeIgniter\Config;
 
-use InvalidArgumentException;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 
 /**
  * Environment-specific configuration

system/Config/Factories.php

@@ -14,8 +14,8 @@
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Database\ConnectionInterface;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 use CodeIgniter\Model;
-use InvalidArgumentException;
 
 /**
  * Factories for creating instances.

system/Cookie/Cookie.php

@@ -15,11 +15,11 @@
 
 use ArrayAccess;
 use CodeIgniter\Cookie\Exceptions\CookieException;
+use CodeIgniter\Exceptions\InvalidArgumentException;
+use CodeIgniter\Exceptions\LogicException;
 use CodeIgniter\I18n\Time;
 use Config\Cookie as CookieConfig;
 use DateTimeInterface;
-use InvalidArgumentException;
-use LogicException;
 use ReturnTypeWillChange;
 
 /**

system/DataCaster/Cast/BaseCast.php

@@ -13,7 +13,7 @@
 
 namespace CodeIgniter\DataCaster\Cast;
 
-use InvalidArgumentException;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 
 abstract class BaseCast implements CastInterface
 {

system/DataCaster/Cast/DatetimeCast.php

@@ -14,8 +14,8 @@
 namespace CodeIgniter\DataCaster\Cast;
 
 use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 use CodeIgniter\I18n\Time;
-use InvalidArgumentException;
 
 /**
  * Class DatetimeCast

system/DataCaster/DataCaster.php

@@ -26,7 +26,7 @@
 use CodeIgniter\DataCaster\Cast\URICast;
 use CodeIgniter\Entity\Cast\CastInterface as EntityCastInterface;
 use CodeIgniter\Entity\Exceptions\CastException;
-use InvalidArgumentException;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 
 final class DataCaster
 {

system/Database/BaseBuilder.php

@@ -16,9 +16,9 @@
 use Closure;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Exceptions\DataException;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 use CodeIgniter\Traits\ConditionalTrait;
 use Config\Feature;
-use InvalidArgumentException;
 
 /**
  * Class BaseBuilder

system/Database/BasePreparedQuery.php

@@ -14,9 +14,9 @@
 namespace CodeIgniter\Database;
 
 use ArgumentCountError;
-use BadMethodCallException;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Events\Events;
+use CodeIgniter\Exceptions\BadMethodCallException;
 use ErrorException;
 
 /**

system/Database/Config.php

@@ -14,8 +14,8 @@
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 use Config\Database as DbConfig;
-use InvalidArgumentException;
 
 /**
  * Class Config

system/Database/Database.php

@@ -13,7 +13,7 @@
 
 namespace CodeIgniter\Database;
 
-use InvalidArgumentException;
+use CodeIgniter\Exceptions\InvalidArgumentException;
 
 /**
  * Database Connection Factory

system/Database/Exceptions/DataException.php

@@ -14,7 +14,7 @@
 namespace CodeIgniter\Database\Exceptions;
 
 use CodeIgniter\Exceptions\DebugTraceableTrait;
-use RuntimeException;
+use CodeIgniter\Exceptions\RuntimeException;
 
 class DataException extends RuntimeException implements ExceptionInterface
 {

system/Database/Exceptions/DatabaseException.php

@@ -14,9 +14,9 @@
 namespace CodeIgniter\Database\Exceptions;
 
 use CodeIgniter\Exceptions\HasExitCodeInterface;
-use Error;
+use CodeIgniter\Exceptions\RuntimeException;
 
-class DatabaseException extends Error implements ExceptionInterface, HasExitCodeInterface
+class DatabaseException extends RuntimeException implements ExceptionInterface, HasExitCodeInterface
 {
     public function getExitCode(): int
     {

system/Database/Forge.php

@@ -14,8 +14,8 @@
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
-use InvalidArgumentException;
-use RuntimeException;
+use CodeIgniter\Exceptions\InvalidArgumentException;
+use CodeIgniter\Exceptions\RuntimeException;
 use Throwable;
 
 /**

system/Database/MigrationRunner.php

@@ -16,11 +16,11 @@
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\ConfigException;
+use CodeIgniter\Exceptions\RuntimeException;
 use CodeIgniter\I18n\Time;
 use Config\Database;
 use Config\Migrations as MigrationsConfig;
 use Config\Services;
-use RuntimeException;
 use stdClass;
 
 /**

system/Database/MySQLi/Connection.php

@@ -15,7 +15,7 @@
 
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\Exceptions\DatabaseException;
-use LogicException;
+use CodeIgniter\Exceptions\LogicException;
 use mysqli;
 use mysqli_result;
 use mysqli_sql_exception;

system/Database/MySQLi/PreparedQuery.php

@@ -13,9 +13,9 @@
 
 namespace CodeIgniter\Database\MySQLi;
 
-use BadMethodCallException;
 use CodeIgniter\Database\BasePreparedQuery;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Exceptions\BadMethodCallException;
 use mysqli;
 use mysqli_result;
 use mysqli_sql_exception;