Reset counter on reconnect or rollback failure

Author: Jake Barnby

composer.lock

@@ -88,14 +88,11 @@ 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 {
@@ -130,6 +127,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 +151,7 @@ public function ping(): bool
     public function reconnect(): void
     {
         $this->getPDO()->reconnect();
+        $this->inTransaction = 0;
     }
 
     /**