diff options
author | Mario <mario@mariovavti.com> | 2018-10-15 07:59:52 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2018-10-15 10:00:06 +0200 |
commit | 726842624890661261296fed495c612c7ea10624 (patch) | |
tree | aaa93e99cedf84d05a584d45002368dfd5659762 /tests/unit/includes/dba/dba_pdoTest.php | |
parent | eb133ef9a7f208a8a21894c4f2bc32f3377221bb (diff) | |
download | volse-hubzilla-726842624890661261296fed495c612c7ea10624.tar.gz volse-hubzilla-726842624890661261296fed495c612c7ea10624.tar.bz2 volse-hubzilla-726842624890661261296fed495c612c7ea10624.zip |
Merge branch 'dev' into 'dev'
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…
Diffstat (limited to 'tests/unit/includes/dba/dba_pdoTest.php')
-rw-r--r-- | tests/unit/includes/dba/dba_pdoTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |