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 cf03da29fbbab53ee60defc6f74b22259e21f3df..6d3a75ab1be203b4c8d6e99e9a29ad21c81ee1cf 100644 (file)
--- a/tests/DatabaseTestTrait.php
+++ b/tests/DatabaseTestTrait.php
@@ -53,16 +53,14 @@ trait DatabaseTestTrait
        /**
         * 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;
                        }
@@ -73,8 +71,27 @@ trait DatabaseTestTrait
                        }
 
                        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);
+       }
 }