Merge pull request #5772 from MrPetovan/bug/php7-remove-pear-text_highlighter

[friendica.git] / tests / DatabaseTest.php

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 9f0990a72d5e0e420a3f97c93d67ba4df9977a71..9844699b069e86b885a0f3eab393042956648adc 100644 (file)
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,7 +5,7 @@
 
 namespace Friendica\Test;
 
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use PHPUnit\DbUnit\DataSet\YamlDataSet;
 use PHPUnit\DbUnit\TestCaseTrait;
 use PHPUnit\Framework\TestCase;
@@ -32,11 +32,15 @@ abstract class DatabaseTest extends TestCase
         */
        protected function getConnection()
        {
-               if (!dba::connected()) {
+               if (!getenv('MYSQL_DATABASE')) {
+                       $this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
+               }
+
+               if (!DBA::connected()) {
                        $this->markTestSkipped('Could not connect to the database.');
                }
 
-               return $this->createDefaultDBConnection(dba::get_db(), getenv('MYSQL_DATABASE'));
+               return $this->createDefaultDBConnection(DBA::getConnection(), getenv('MYSQL_DATABASE'));
        }
 
        /**