Merge pull request #12820 from MrPetovan/bug/fatal-errors

[friendica.git] / tests / DatabaseTestTrait.php

diff --git a/tests/DatabaseTestTrait.php b/tests/DatabaseTestTrait.php
index f667e05de6d1be2bf6fe61421a79c4d4d972c369..6d3a75ab1be203b4c8d6e99e9a29ad21c81ee1cf 100644 (file)
--- a/tests/DatabaseTestTrait.php
+++ b/tests/DatabaseTestTrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,50 +29,69 @@ 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();
+               // Rollback the first, outer transaction just 2 be sure
+               StaticDatabase::getGlobConnection()->rollBack();
                // 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");
+               }
        }
 
        /**
         * Loads a given DB fixture for this DB test
         *
-        * @param string   $fixture The path to the fixture
+        * @param string[][] $fixture The fixture array
         * @param Database $dba     The DB connection
         *
         * @throws \Exception
         */
-       protected function loadFixture(string $fixture, Database $dba)
+       protected function loadDirectFixture(array $fixture, Database $dba)
        {
-               $data = include $fixture;
-
-               foreach ($data as $tableName => $rows) {
+               foreach ($fixture as $tableName => $rows) {
                        if (is_numeric($tableName)) {
                                continue;
                        }
 
                        if (!is_array($rows)) {
-                               $dba->p('TRUNCATE TABLE `' . $tableName . '``');
+                               $dba->e('TRUNCATE TABLE `' . $tableName . '``');
                                continue;
                        }
 
                        foreach ($rows as $row) {
-                               $dba->insert($tableName, $row, true);
+                               if (is_array($row)) {
+                                       $dba->insert($tableName, $row, true);
+                               } else {
+                                       throw new \Exception('row isn\'t an array');
+                               }
                        }
                }
        }
+
+       /**
+        * Loads a given DB fixture-file for this DB test
+        *
+        * @param string   $fixture The path to the fixture
+        * @param Database $dba     The DB connection
+        *
+        * @throws \Exception
+        */
+       protected function loadFixture(string $fixture, Database $dba)
+       {
+               $data = include $fixture;
+
+               $this->loadDirectFixture($data, $dba);
+       }
 }