summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-02-26 09:06:54 +0100
committerAndrey Andreev <narf@devilix.net>2015-02-26 09:06:54 +0100
commitb5925ec58a43b85bffb0d3aea6032f0b909b1121 (patch)
tree7d36d604191a923d2f6a72e99341c3ff665fe027
parent7127f973a161a21a50819993b8cf5eda7b9cbeff (diff)
Fix .travis.yml for PHP7 and try to fix a DB test
-rw-r--r--.travis.yml2
-rw-r--r--tests/codeigniter/database/DB_driver_test.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 26b194f6f..258ad76f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ matrix:
- php: hhvm
env: DB=pdo/pgsql
- php: 7
- env: mysql
+ env: DB=mysql
- php: 5.2
env: DB=sqlite
- php: 5.2
diff --git a/tests/codeigniter/database/DB_driver_test.php b/tests/codeigniter/database/DB_driver_test.php
index c04c42b09..26416d3fc 100644
--- a/tests/codeigniter/database/DB_driver_test.php
+++ b/tests/codeigniter/database/DB_driver_test.php
@@ -6,7 +6,7 @@ class DB_driver_test extends CI_TestCase {
{
$config = Mock_Database_DB::config(DB_DRIVER);
sscanf(DB_DRIVER, '%[^/]/', $driver_name);
- $driver = $this->$driver_name($config[DB_DRIVER]);
+ $driver = $this->{$driver_name}($config[DB_DRIVER]);
$this->assertTrue($driver->initialize());
}