From 726842624890661261296fed495c612c7ea10624 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 15 Oct 2018 07:59:52 +0000 Subject: Merge branch 'dev' into 'dev' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci. See merge request hubzilla/core!1332 (cherry picked from commit c39de966df2ff28674697be77a527b2214afef42) b77acb3e add gitlab-ci.yml and phpunit.xml 22275f30 fix dba_pdoTest 0db047e5 fix phpunit error with html2markdown test and temporary disable failing markdown… --- tests/unit/includes/dba/dba_pdoTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/unit/includes/dba/dba_pdoTest.php') diff --git a/tests/unit/includes/dba/dba_pdoTest.php b/tests/unit/includes/dba/dba_pdoTest.php index 12e574d42..689f5a7ce 100644 --- a/tests/unit/includes/dba/dba_pdoTest.php +++ b/tests/unit/includes/dba/dba_pdoTest.php @@ -55,7 +55,7 @@ class dba_pdoTest extends DatabaseTestCase { return new YamlDataSet(dirname(__FILE__) . '/_files/account.yml'); } - protected function setUp() { + protected function setUp(): void { // Will invoke getDataSet() to load fixtures into DB parent::setUp(); @@ -74,7 +74,7 @@ class dba_pdoTest extends DatabaseTestCase { $this->assertTrue($this->dba->connected, 'Pre condition failed, DB is not connected.'); $this->assertInstanceOf('PDO', $this->dba->db); } - protected function tearDown() { + protected function tearDown(): void { $this->dba = null; } -- cgit v1.2.3