feat: rename ExitExceptionInterface and add getExitCode()

codeigniter4 · Jul 24, 2022 · 3bac9cb · 3bac9cb
1 parent dc51f1e
commit 3bac9cb
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 34 deletions.
diff --git a/system/Database/Exceptions/DatabaseException.php b/system/Database/Exceptions/DatabaseException.php
@@ -11,15 +11,13 @@
 
 namespace CodeIgniter\Database\Exceptions;
 
-use CodeIgniter\Exceptions\ExitExceptionInterface;
+use CodeIgniter\Exceptions\HasExitCodeInterface;
 use Error;
 
-class DatabaseException extends Error implements ExceptionInterface, ExitExceptionInterface
+class DatabaseException extends Error implements ExceptionInterface, HasExitCodeInterface
 {
-    /**
-     * Exit status code
-     *
-     * @var int
-     */
-    protected $code = EXIT_DATABASE;
+    public function getExitCode(): int
+    {
+        return EXIT_DATABASE;
+    }
 }
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
@@ -12,7 +12,7 @@
 namespace CodeIgniter\Debug;
 
 use CodeIgniter\API\ResponseTrait;
-use CodeIgniter\Exceptions\ExitExceptionInterface;
+use CodeIgniter\Exceptions\HasExitCodeInterface;
 use CodeIgniter\Exceptions\HTTPExceptionInterface;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\CLIRequest;
@@ -321,8 +321,8 @@ protected function determineCodes(Throwable $exception): array
             $statusCode = $exception->getCode();
         }
 
-        if ($exception instanceof ExitExceptionInterface) {
-            $exitStatus = $exception->getCode();
+        if ($exception instanceof HasExitCodeInterface) {
+            $exitStatus = $exception->getExitCode();
         }
 
         return [$statusCode, $exitStatus];

diff --git a/system/Entity/Exceptions/CastException.php b/system/Entity/Exceptions/CastException.php
@@ -11,20 +11,18 @@
 
 namespace CodeIgniter\Entity\Exceptions;
 
-use CodeIgniter\Exceptions\ExitExceptionInterface;
 use CodeIgniter\Exceptions\FrameworkException;
+use CodeIgniter\Exceptions\HasExitCodeInterface;
 
 /**
  * CastException is thrown for invalid cast initialization and management.
  */
-class CastException extends FrameworkException implements ExitExceptionInterface
+class CastException extends FrameworkException implements HasExitCodeInterface
 {
-    /**
-     * Exit status code
-     *
-     * @var int
-     */
-    protected $code = EXIT_CONFIG;
+    public function getExitCode(): int
+    {
+        return EXIT_CONFIG;
+    }
 
     /**
      * Thrown when the cast class does not extends BaseCast.

diff --git a/system/Exceptions/CastException.php b/system/Exceptions/CastException.php
@@ -18,16 +18,14 @@
  *
  * @codeCoverageIgnore
  */
-class CastException extends CriticalError implements ExitExceptionInterface
+class CastException extends CriticalError implements HasExitCodeInterface
 {
     use DebugTraceableTrait;
 
-    /**
-     * Exit status code
-     *
-     * @var int
-     */
-    protected $code = EXIT_CONFIG;
+    public function getExitCode(): int
+    {
+        return EXIT_CONFIG;
+    }
 
     public static function forInvalidJsonFormatException(int $error)
     {

diff --git a/system/Exceptions/ConfigException.php b/system/Exceptions/ConfigException.php
@@ -14,16 +14,14 @@
 /**
  * Exception for automatic logging.
  */
-class ConfigException extends CriticalError implements ExitExceptionInterface
+class ConfigException extends CriticalError implements HasExitCodeInterface
 {
     use DebugTraceableTrait;
 
-    /**
-     * Exit status code
-     *
-     * @var int
-     */
-    protected $code = EXIT_CONFIG;
+    public function getExitCode(): int
+    {
+        return EXIT_CONFIG;
+    }
 
     public static function forDisabledMigrations()
     {

diff --git a/system/Exceptions/ExitExceptionInterface.php → system/Exceptions/HasExitCodeInterface.php b/system/Exceptions/ExitExceptionInterface.php → system/Exceptions/HasExitCodeInterface.php
@@ -14,6 +14,10 @@
 /**
  * Interface for Exceptions that has exception code as exit code.
  */
-interface ExitExceptionInterface
+interface HasExitCodeInterface
 {
+    /**
+     * Returns exit status code.
+     */
+    public function getExitCode(): int;
 }