fix exceptions

daycry · daycry · commit b9c0281dd4a2 · 2023-11-23T16:03:56.000+01:00
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "daycry/restful",
     "description": "Rest Server for Codeigniter 4",
-    "homepage": "https://github.com/daycry/restfull",
+    "homepage": "https://github.com/daycry/restful",
     "authors":
     [
         {
@@ -19,7 +19,8 @@
         "daycry/jwt": "^1.0",
         "daycry/class-finder": "^2.0",
         "daycry/cronjob": "^2.0",
-        "daycry/settings": "^1"
+        "daycry/settings": "^1",
+        "daycry/exceptions": "*"
     },
     "require-dev":
     {
@@ -79,6 +80,9 @@
         ]
     },
     "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true,
         "allow-plugins": {
             "phpstan/extension-installer": true
         }
diff --git a/src/Auth.php b/src/Auth.php
@@ -4,12 +4,12 @@
 
 namespace Daycry\RestFul;
 
+use Daycry\Exceptions\Interfaces\BaseExceptionInterface;
 use Daycry\RestFul\Libraries\Authentication;
 use Daycry\RestFul\Exceptions\AuthenticationException;
 use Daycry\RestFul\Interfaces\AuthenticatorInterface;
 use Daycry\RestFul\Entities\User;
 use Daycry\RestFul\Models\UserModel;
-use Daycry\RestFul\Interfaces\BaseException;
 
 /**
  * @method Result    attempt(array $credentials)
@@ -144,7 +144,7 @@ public function __call(string $method, array $args)
             if ($authenticate && method_exists($authenticate, $method)) {
                 return $authenticate->{$method}(...$args);
             }
-        } catch(BaseException $ex) {
+        } catch(BaseExceptionInterface $ex) {
             return false;
         }
     }
diff --git a/src/Authenticators/AccessToken.php b/src/Authenticators/AccessToken.php
@@ -8,7 +8,6 @@
 use Daycry\RestFul\Exceptions\AuthenticationException;
 use Daycry\RestFul\Models\UserModel;
 use Daycry\RestFul\Models\UserIdentityModel;
-use CodeIgniter\Config\Services;
 use Daycry\RestFul\Entities\User;
 
 class AccessToken extends Base implements AuthenticatorInterface
diff --git a/src/Exceptions/AuthenticationException.php b/src/Exceptions/AuthenticationException.php
@@ -4,7 +4,7 @@
 
 namespace Daycry\RestFul\Exceptions;
 
-use Daycry\RestFul\Exceptions\RuntimeException;
+use Daycry\Exceptions\Exceptions\RuntimeException;
 
 class AuthenticationException extends RuntimeException
 {
diff --git a/src/Exceptions/AuthorizationException.php b/src/Exceptions/AuthorizationException.php
@@ -4,7 +4,7 @@
 
 namespace Daycry\RestFul\Exceptions;
 
-use Daycry\RestFul\Exceptions\RuntimeException;
+use Daycry\Exceptions\Exceptions\RuntimeException;
 
 class AuthorizationException extends RuntimeException
 {
diff --git a/src/Exceptions/CorsException.php b/src/Exceptions/CorsException.php
@@ -4,7 +4,7 @@
 
 namespace Daycry\RestFul\Exceptions;
 
-use Daycry\RestFul\Exceptions\RuntimeException;
+use Daycry\Exceptions\Exceptions\RuntimeException;
 
 class CorsException extends RuntimeException
 {
diff --git a/src/Exceptions/DatabaseException.php b/src/Exceptions/DatabaseException.php
@@ -4,6 +4,8 @@
 
 namespace Daycry\RestFul\Exceptions;
 
+use Daycry\Exceptions\Exceptions\RuntimeException;
+
 class DatabaseException extends RuntimeException
 {
 }
diff --git a/src/Exceptions/FailTooManyRequestsException.php b/src/Exceptions/FailTooManyRequestsException.php
@@ -2,7 +2,7 @@
 
 namespace Daycry\RestFul\Exceptions;
 
-use Daycry\RestFul\Exceptions\RuntimeException;
+use Daycry\Exceptions\Exceptions\RuntimeException;
 
 class FailTooManyRequestsException extends RuntimeException
 {
diff --git a/src/Exceptions/ForbiddenException.php b/src/Exceptions/ForbiddenException.php
@@ -4,7 +4,7 @@
 
 namespace Daycry\RestFul\Exceptions;
 
-use Daycry\RestFul\Exceptions\RuntimeException;
+use Daycry\Exceptions\Exceptions\RuntimeException;
 use Config\Services;
 
 class ForbiddenException extends RuntimeException
diff --git a/src/Exceptions/LogicException.php b/src/Exceptions/LogicException.php
@@ -4,8 +4,8 @@
 
 namespace Daycry\RestFul\Exceptions;
 
-use Daycry\RestFul\Interfaces\BaseException;
+use Daycry\Exceptions\Interfaces\BaseExceptionInterface;
 
-class LogicException extends \LogicException implements BaseException
+class LogicException extends \LogicException implements BaseExceptionInterface
 {
 }
diff --git a/src/Exceptions/RuntimeException.php b/src/Exceptions/RuntimeException.php
diff --git a/src/Exceptions/ValidationException.php b/src/Exceptions/ValidationException.php
@@ -4,6 +4,8 @@
 
 namespace Daycry\RestFul\Exceptions;
 
+use Daycry\Exceptions\Exceptions\RuntimeException;
+
 class ValidationException extends RuntimeException
 {
     public static $authorized = true;
diff --git a/src/Filters/AccessFilter.php b/src/Filters/AccessFilter.php
@@ -8,8 +8,8 @@
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Config\Services;
+use Daycry\Exceptions\Interfaces\BaseExceptionInterface;
 use Daycry\RestFul\Exceptions\AuthorizationException;
-use Daycry\RestFul\Interfaces\BaseException;
 use Daycry\RestFul\Traits\Authenticable;
 
 /**
@@ -48,7 +48,7 @@ public function before(RequestInterface $request, $arguments = null)
                     throw AuthorizationException::forNotEnoughPrivilege();
                 }
 
-            } catch(BaseException $ex) {
+            } catch(BaseExceptionInterface $ex) {
 
                 $logger->setAuthorized(false)
                     ->setResponseCode($ex->getCode())
diff --git a/src/Interfaces/BaseException.php b/src/Interfaces/BaseException.php
diff --git a/src/Libraries/Logger.php b/src/Libraries/Logger.php
@@ -10,8 +10,8 @@
 use Daycry\Encryption\Encryption;
 use Daycry\RestFul\Entities\Endpoint;
 use CodeIgniter\Debug\Timer;
+use Daycry\Exceptions\Interfaces\BaseExceptionInterface;
 use Daycry\RestFul\Models\LogModel;
-use Daycry\RestFul\Interfaces\BaseException;
 
 class Logger
 {
@@ -85,7 +85,7 @@ public function save(): int
             //If authenticator not exists
             try {
                 $userId = auth()->id();
-            } catch(BaseException $ex) {
+            } catch(BaseExceptionInterface $ex) {
                 $userId = null;
             }
 
diff --git a/src/RestFul.php b/src/RestFul.php
@@ -15,10 +15,10 @@
 use Daycry\RestFul\Validators\Whitelist;
 use Daycry\RestFul\Validators\Limit;
 use Daycry\RestFul\Libraries\Logger;
-use Daycry\RestFul\Interfaces\BaseException;
 use Daycry\RestFul\Exceptions\ForbiddenException;
 use Daycry\RestFul\Models\AttemptModel;
 use Config\Mimes;
+use Daycry\Exceptions\Interfaces\BaseExceptionInterface;
 use ReflectionProperty;
 use stdClass;
 
@@ -152,7 +152,7 @@ public function __destruct()
      * @param string $method
      * @param array  $params     The params passed to the controller method
      *
-     * @throws BaseException
+     * @throws BaseExceptionInterface
      */
     public function _remap($method, ...$params)
     {
@@ -199,7 +199,7 @@ public function _remap($method, ...$params)
 
             return call_user_func_array([ $this, $method ], $params);
 
-        } catch (BaseException $ex) {
+        } catch (BaseExceptionInterface $ex) {
 
             if(property_exists($ex, 'authorized')) {
                 $this->_isRequestAuthorized = (new ReflectionProperty($ex, 'authorized'))->getValue();
diff --git a/src/Traits/Authenticable.php b/src/Traits/Authenticable.php
@@ -7,7 +7,7 @@
 use Daycry\RestFul\Entities\Endpoint;
 use Daycry\RestFul\Exceptions\AuthenticationException;
 use Daycry\RestFul\Validators\AccessToken;
-use Daycry\RestFul\Interfaces\BaseException;
+use Daycry\Exceptions\Interfaces\BaseExceptionInterface;
 
 trait Authenticable
 {
@@ -34,7 +34,7 @@ public function doLogin(?Endpoint $endpoint = null)
                 }
             }
 
-        } catch(BaseException $ex) {
+        } catch(BaseExceptionInterface $ex) {
             if($strictApiAndAuth || !$alias) {
                 throw $ex;
             }
@@ -46,7 +46,7 @@ public function doLogin(?Endpoint $endpoint = null)
                 $authenticator->authenticate();
             }
 
-        } catch(BaseException $ex) {
+        } catch(BaseExceptionInterface $ex) {
             if($strictApiAndAuth || (!$strictApiAndAuth && !$user)) {
                 throw $ex;
             }
diff --git a/src/Validators/Limit.php b/src/Validators/Limit.php
@@ -7,7 +7,7 @@
 use Daycry\RestFul\Models\LimitModel;
 use CodeIgniter\I18n\Time;
 use Daycry\RestFul\Exceptions\FailTooManyRequestsException;
-use Daycry\RestFul\Interfaces\BaseException;
+use Daycry\Exceptions\Interfaces\BaseExceptionInterface;
 
 class Limit
 {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "daycry/restful",`
`3`	`3`	`"description": "Rest Server for Codeigniter 4",`
`4`		`- "homepage": "https://github.com/daycry/restfull",`
	`4`	`+ "homepage": "https://github.com/daycry/restful",`
`5`	`5`	`"authors":`
`6`	`6`	`[`
`7`	`7`	`{`
`@@ -19,7 +19,8 @@`
`19`	`19`	`"daycry/jwt": "^1.0",`
`20`	`20`	`"daycry/class-finder": "^2.0",`
`21`	`21`	`"daycry/cronjob": "^2.0",`
`22`		`- "daycry/settings": "^1"`
	`22`	`+ "daycry/settings": "^1",`
	`23`	`+ "daycry/exceptions": "*"`
`23`	`24`	`},`
`24`	`25`	`"require-dev":`
`25`	`26`	`{`
`@@ -79,6 +80,9 @@`
`79`	`80`	`]`
`80`	`81`	`},`
`81`	`82`	`"config": {`
	`83`	`+ "optimize-autoloader": true,`
	`84`	`+ "preferred-install": "dist",`
	`85`	`+ "sort-packages": true,`
`82`	`86`	`"allow-plugins": {`
`83`	`87`	`"phpstan/extension-installer": true`
`84`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`
`5`	`5`	`namespace Daycry\RestFul;`
`6`	`6`
	`7`	`+use Daycry\Exceptions\Interfaces\BaseExceptionInterface;`
`7`	`8`	`use Daycry\RestFul\Libraries\Authentication;`
`8`	`9`	`use Daycry\RestFul\Exceptions\AuthenticationException;`
`9`	`10`	`use Daycry\RestFul\Interfaces\AuthenticatorInterface;`
`10`	`11`	`use Daycry\RestFul\Entities\User;`
`11`	`12`	`use Daycry\RestFul\Models\UserModel;`
`12`		`-use Daycry\RestFul\Interfaces\BaseException;`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* @method Result attempt(array $credentials)`
`@@ -144,7 +144,7 @@ public function __call(string $method, array $args)`
`144`	`144`	`if ($authenticate && method_exists($authenticate, $method)) {`
`145`	`145`	`return $authenticate->{$method}(...$args);`
`146`	`146`	`}`
`147`		`- } catch(BaseException $ex) {`
	`147`	`+ } catch(BaseExceptionInterface $ex) {`
`148`	`148`	`return false;`
`149`	`149`	`}`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Daycry\RestFul\Exceptions;`
`6`	`6`
`7`		`-use Daycry\RestFul\Exceptions\RuntimeException;`
	`7`	`+use Daycry\Exceptions\Exceptions\RuntimeException;`
`8`	`8`
`9`	`9`	`class AuthenticationException extends RuntimeException`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace Daycry\RestFul\Exceptions;`
`6`	`6`
	`7`	`+use Daycry\Exceptions\Exceptions\RuntimeException;`
	`8`	`+`
`7`	`9`	`class DatabaseException extends RuntimeException`
`8`	`10`	`{`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Daycry\RestFul\Exceptions;`
`4`	`4`
`5`		`-use Daycry\RestFul\Exceptions\RuntimeException;`
	`5`	`+use Daycry\Exceptions\Exceptions\RuntimeException;`
`6`	`6`
`7`	`7`	`class FailTooManyRequestsException extends RuntimeException`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace Daycry\RestFul\Exceptions;`
`6`	`6`
`7`		`-use Daycry\RestFul\Interfaces\BaseException;`
	`7`	`+use Daycry\Exceptions\Interfaces\BaseExceptionInterface;`
`8`	`8`
`9`		`-class LogicException extends \LogicException implements BaseException`
	`9`	`+class LogicException extends \LogicException implements BaseExceptionInterface`
`10`	`10`	`{`
`11`	`11`	`}`