Cleanup: Handle nicely errors without anti-patterns

Author: pH-7

composer.json

@@ -15,11 +15,11 @@
 
     "config": {
         "platform": {
-            "php": "8.1.0"
+            "php": "8.2.0"
         }
     },
     "require": {
-        "php": ">=8.1.0",
+        "php": ">=8.2.0",
         "firebase/php-jwt": "^6.4",
         "respect/validation": "^2.2",
         "ph-7/php-http-response-header": "^1.0.2",

src/Dal/UserDal.php

@@ -4,15 +4,13 @@
 
 use PH7\ApiSimpleMenu\Entity\User as UserEntity;
 use RedBeanPHP\R;
+use RedBeanPHP\RedException\SQL;
 
 final class UserDal
 {
     public const TABLE_NAME = 'users';
 
-    /**
-     * @throws \RedBeanPHP\RedException\SQL
-     */
-    public static function create(UserEntity $userEntity): int|string
+    public static function create(UserEntity $userEntity): int|string|false
     {
         $userBean = R::dispense(self::TABLE_NAME);
         $userBean->user_uuid = $userEntity->getUserUuid();
@@ -22,14 +20,18 @@ public static function create(UserEntity $userEntity): int|string
         $userBean->phone = $userEntity->getPhone();
         $userBean->created_date = $userEntity->getCreationDate();
 
-        $id = R::store($userBean);
-
-        R::close();
+        try {
+            $id = R::store($userBean);
+        } catch (SQL $e) {
+            return false;
+        } finally {
+            R::close();
+        }
 
         return $id;
     }
 
-    public static function update(string $userUuid, UserEntity $userEntity): int|string
+    public static function update(string $userUuid, UserEntity $userEntity): int|string|false
     {
         $userBean = R::findOne(self::TABLE_NAME, 'user_uuid = :userUuid', ['userUuid' => $userUuid]);
 
@@ -52,10 +54,16 @@ public static function update(string $userUuid, UserEntity $userEntity): int|str
             }
 
             // save the user
-            return R::store($userBean);
+            try {
+                return R::store($userBean);
+            } catch (SQL $e) {
+                return false;
+            } finally {
+                R::close();
+            }
         }
 
-        return 0;
+        return false;
     }
 
     public static function get(string $userUuid): ?array

src/Service/User.php

@@ -7,7 +7,6 @@
 use PH7\JustHttp\StatusCode;
 use PH7\PhpHttpResponseHeader\Http;
 use Ramsey\Uuid\Uuid;
-use RedBeanPHP\RedException\SQL;
 use Respect\Validation\Validator as v;
 use PH7\ApiSimpleMenu\Entity\User as UserEntity;
 
@@ -30,9 +29,8 @@ public function create(mixed $data): array|object
                 ->setPhone($data->phone)
                 ->setCreationDate(date(self::DATE_TIME_FORMAT));
 
-            try {
-                UserDal::create($userEntity);
-            } catch (SQL $exception) {
+
+            if (UserDal::create($userEntity) === false) {
                 // Set an internal error when we cannot add an entry to the database
                 Http::setHeadersByCode(StatusCode::INTERNAL_SERVER_ERROR);
 
@@ -65,13 +63,12 @@ public function update(mixed $postBody): array|object
                 $userEntity->setPhone($postBody->phone);
             }
 
-            $result = UserDal::update($userUuid, $userEntity);
-            if ($result) {
-                return $postBody;
+            if (UserDal::update($userUuid, $userEntity) === false) {
+                // If invalid or got an error, give back an empty response
+                return [];
             }
 
-            // if invalid, give back an empty response
-            return [];
+            return $postBody;
         }
 
         throw new InvalidValidationException("Invalid user payload");