diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-02 13:23:09 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-02 15:45:24 +0200 |
| commit | d419bd1899016e425bd9baad8ede507014f2691f (patch) | |
| tree | e07f5e834266517f3e14e0a53ebeb0c92d90861d /tests | |
| parent | 86c073ec3ef7a6bfd3224dd7208387d19b4354a3 (diff) | |
| download | forums-d419bd1899016e425bd9baad8ede507014f2691f.tar forums-d419bd1899016e425bd9baad8ede507014f2691f.tar.gz forums-d419bd1899016e425bd9baad8ede507014f2691f.tar.bz2 forums-d419bd1899016e425bd9baad8ede507014f2691f.tar.xz forums-d419bd1899016e425bd9baad8ede507014f2691f.zip | |
[feature/sqlite3] Use SQLite3 by default
PHPBB3-9728
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_framework/phpbb_test_case_helpers.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 0a1037c884..aba63a0498 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -104,23 +104,23 @@ class phpbb_test_case_helpers { $config = array(); - if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>=')) + + if (extension_loaded('sqlite3')) { $config = array_merge($config, array( - 'dbms' => 'phpbb\db\driver\sqlite', - 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename + 'dbms' => 'phpbb\db\driver\sqlite3', + 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite3', // filename 'dbport' => '', 'dbname' => '', 'dbuser' => '', 'dbpasswd' => '', )); } - - if (extension_loaded('sqlite3') && version_compare(PHP_VERSION, '5.4.0', '>=') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>=')) + else if (extension_loaded('sqlite')) { $config = array_merge($config, array( - 'dbms' => 'phpbb\db\driver\sqlite3', - 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite3', // filename + 'dbms' => 'phpbb\db\driver\sqlite', + 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename 'dbport' => '', 'dbname' => '', 'dbuser' => '', |