Merge remote-tracking branch 'upstream/main' into var_object

Author: ArnabChatterjee20k

composer.json

@@ -37,7 +37,7 @@
         "ext-pdo": "*",
         "ext-mongodb": "*",
         "ext-mbstring": "*",
-        "utopia-php/validators": "0.0.*",
+        "utopia-php/framework": "0.33.*",
         "utopia-php/cache": "0.13.*",
         "utopia-php/pools": "0.8.*",
         "utopia-php/mongo": "0.11.*"

composer.lock

@@ -88,16 +88,18 @@ public function commitTransaction(): bool
     {
         if ($this->inTransaction === 0) {
             return false;
-        } elseif ($this->inTransaction > 1) {
-            $this->inTransaction--;
-            return true;
         }
 
         if (!$this->getPDO()->inTransaction()) {
             $this->inTransaction = 0;
             return false;
         }
 
+        if ($this->inTransaction > 1) {
+            $this->inTransaction--;
+            return true;
+        }
+
         try {
             $result = $this->getPDO()->commit();
             $this->inTransaction = 0;
@@ -130,6 +132,7 @@ public function rollbackTransaction(): bool
                 $this->inTransaction = 0;
             }
         } catch (PDOException $e) {
+            $this->inTransaction = 0;
             throw new DatabaseException('Failed to rollback transaction: ' . $e->getMessage(), $e->getCode(), $e);
         }
 
@@ -153,6 +156,7 @@ public function ping(): bool
     public function reconnect(): void
     {
         $this->getPDO()->reconnect();
+        $this->inTransaction = 0;
     }
 
     /**