Merge pull request #333 from letsdrink/bug/fix-db-run-in-transaction

Catch Throwable instead of Exception in Db::runInTransaction()

Author: Karpol

src/Ouzo/Core/Db.php

@@ -7,13 +7,13 @@
 namespace Ouzo;
 
 use Closure;
-use Exception;
 use Ouzo\Db\PDOExceptionExtractor;
 use Ouzo\Db\StatementExecutor;
 use Ouzo\Db\TransactionalProxy;
 use Ouzo\Utilities\Arrays;
 use PDO;
 use PDOException;
+use Throwable;
 
 
 class Db
@@ -90,7 +90,7 @@ public function runInTransaction(Closure $callable): mixed
                 $result = call_user_func($callable);
                 $this->commitTransaction();
                 return $result;
-            } catch (Exception $e) {
+            } catch (Throwable $e) {
                 $this->rollbackTransactionSilently();
                 throw $e;
             }
@@ -126,7 +126,7 @@ private function rollbackTransactionSilently(): void
     {
         try {
             $this->rollbackTransaction();
-        } catch (Exception) {
+        } catch (Throwable) {
         }
     }
 

test/src/Ouzo/Core/DbTest.php

@@ -62,10 +62,10 @@ public function runInTransactionShouldInvokeRollbackOnFailure()
         $db->dbHandle = $dbHandle;
 
         //when
-        CatchException::when($db)->runInTransaction(fn() => throw new InvalidArgumentException());
+        CatchException::when($db)->runInTransaction(fn() => throw new Error());
 
         //then
-        CatchException::assertThat()->isInstanceOf('InvalidArgumentException');
+        CatchException::assertThat()->isInstanceOf('Error');
         Mock::verify($dbHandle)->beginTransaction();
         Mock::verify($dbHandle)->neverReceived()->commitTransaction();
         Mock::verify($dbHandle)->rollBack();