perf: remove all check functions

Author: fullstackondemand

src/Controller/AbstractAuthController.php

@@ -5,7 +5,6 @@
 use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
 use RestJS\Message\Response;
-use function RestJS\errorHandler;
 use function RestJS\response;
 use Slim\Exception\HttpBadRequestException;
 use Slim\Exception\HttpUnauthorizedException;
@@ -30,7 +29,7 @@ public function login($req, $res) {
             throw new HttpBadRequestException($req, "Username or password is required.");
 
         /** Check User Entity */
-        $user = errorHandler($this->_model->filter(['username' => $username]));
+        $user = $this->_model->filter(['username' => $username]);
 
         if (!$user)
             throw new HttpUnauthorizedException($req, 'Invalid user credentials');
@@ -74,11 +73,8 @@ public function regenerateAccessToken($req, $res) {
             /** Decode Json Web Token */
             $decodedToken = (array) JWT::decode($refreshToken, new Key($_ENV['REFRESH_TOKEN_SECRET'], 'HS256'));
         } catch (\Exception $e) {
-            $decodedToken = null;
+            throw new HttpUnauthorizedException($req, "Invalid access token");
         }
-
-        if (!$decodedToken)
-        throw new HttpUnauthorizedException($req, "Invalid access token");
 
         /** Check User Entity */
         $user = $this->_model->findById($decodedToken['id']);

src/Controller/AbstractController.php

@@ -3,7 +3,7 @@
 namespace RestJS\Controller;
 
 use RestJS\Message\Response;
-use function RestJS\response, RestJS\checkNull;
+use function RestJS\response;
 use Slim\Exception\HttpBadRequestException;
 
 /** Abstract Controller Functions */
@@ -30,13 +30,19 @@ public function findByColumn($req, $res, $args) {
     /** Delete Data by Id */
     public function delete($req, $res, $args) {
         $data = $this->_model->delete($args);
-        checkNull($data, $req);
+
+        // Check data is deleted
+        if (!$data)
+            throw new HttpBadRequestException($req, "Something went wrong...");
+
         return response($req, $res, new Response(message: "This item has been successfully removed.", data: $data));
     }
 
     /** Insert Data */
     public function insert($req, $res, $args) {
-        if (!$req->getParsedBody())
+
+        // Check user input valid form data
+        if(!$req->getParsedBody())
             throw new HttpBadRequestException($req, "Please enter valid form data.");
 
         $data = $this->_model->insert([...$req->getParsedBody(), ...$args]);
@@ -45,11 +51,17 @@ public function insert($req, $res, $args) {
 
     /** Update by Id */
     public function update($req, $res, $args) {
+
+        // check user input valid form data
         if (!$req->getParsedBody())
             throw new HttpBadRequestException($req, "Please enter valid form data.");
 
         $data = $this->_model->update($req->getParsedBody(), $args);
-        checkNull($data, $req);
+        
+        // Check data is updated
+        if (!$data)
+            throw new HttpBadRequestException($req, "Something went wrong...");
+
         return response($req, $res, new Response(message: "This item has been successfully updated.", data: $data));
     }
 }

src/Middleware/AbstractAuthMiddleware.php

@@ -31,14 +31,10 @@ public function process(Request $req, RequestHandler $handler): ResponseInterfac
         try {
             /** Decode Json Web Token */
             $decodedToken = (array) JWT::decode($token, new Key($_ENV['ACCESS_TOKEN_SECRET'], 'HS256'));
-        }
-        catch (\Exception $e) {
-            $decodedToken = null;
-        }
-
-        if (!$decodedToken)
+        } catch (\Exception $e) {
             throw new HttpUnauthorizedException($req, "Invalid access token");
-
+        }
+        
         /** Check User Entity */
         $user = $this->_user->findById($decodedToken['id']);
 

src/Model/AbstractModel.php

@@ -32,12 +32,12 @@ public function findBy(array $args): array {
     }
 
     /** Filter Data by Conditional */
-    public function filter(array $args): object {
+    public function filter(array $args): object|null {
         return $this->repository->findOneBy($args);
     }
 
     /** Find Data by Id */
-    public function findById($id): object {
+    public function findById($id): object|null {
         return $this->repository->find($id);
     }
 

src/function.php

@@ -2,26 +2,11 @@
 declare(strict_types=1);
 namespace RestJS;
 
-use Slim\Exception\HttpBadRequestException;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
 /** Query Response Function */
 function response(Request $req, Response $res, mixed $args) {
     $res->getBody()->write(json_encode($args));
     return $res;
-}
-
-/** Check Null Value Function */
-function checkNull($value, $req) {
-    !boolval($value) && throw new HttpBadRequestException($req, "Something went wrong...");
-}
-
-/** Callback Error Handler Function */
-function errorHandler($callback) {
-    try {
-        return $callback;
-    } catch (\Exception $e) {
-        return null;
-    }
 }