Merge pull request #10112 from nupplaphil/feat/phpunit_upgrade

[friendica.git] / tests / DatabaseTestTrait.php

diff --git a/tests/DatabaseTestTrait.php b/tests/DatabaseTestTrait.php
index d8a5c165a4f99f09042d4186180d7f5f9a3c3dc6..7d255c693b5b9ff996b5ee28d4771b15469293ca 100644 (file)
--- a/tests/DatabaseTestTrait.php
+++ b/tests/DatabaseTestTrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,23 +29,23 @@ use Friendica\Test\Util\Database\StaticDatabase;
  */
 trait DatabaseTestTrait
 {
-       protected function setUp()
+       protected function setUpDb()
        {
                StaticDatabase::statConnect($_SERVER);
                // Rollbacks every DB usage (in case the test couldn't call tearDown)
                StaticDatabase::statRollback();
                // Start the first, outer transaction
                StaticDatabase::getGlobConnection()->beginTransaction();
-
-               parent::setUp();
        }
 
-       protected function tearDown()
+       protected function tearDownDb()
        {
-               // Rollbacks every DB usage so we don't commit anything into the DB
-               StaticDatabase::statRollback();
-
-               parent::tearDown();
+               try {
+                       // Rollbacks every DB usage so we don't commit anything into the DB
+                       StaticDatabase::statRollback();
+               } catch (\PDOException $exception) {
+                       print_r("Found already rolled back transaction");
+               }
        }
 
        /**