diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-01-31 13:26:20 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-01-31 13:26:20 +0100 |
| commit | d06657c99573e3975e735e8cb7f8cc5ccb510851 (patch) | |
| tree | 4402747f36aed8c1ed7761884ad47c16876cf78e /tests/test_framework/phpbb_database_test_case.php | |
| parent | 7ff0cff4cdd477702c606bf0188d6ecaa21c833d (diff) | |
| parent | e685c1c005ec146fe802f1ff6fb38cb1fe34ed7a (diff) | |
| download | forums-d06657c99573e3975e735e8cb7f8cc5ccb510851.tar forums-d06657c99573e3975e735e8cb7f8cc5ccb510851.tar.gz forums-d06657c99573e3975e735e8cb7f8cc5ccb510851.tar.bz2 forums-d06657c99573e3975e735e8cb7f8cc5ccb510851.tar.xz forums-d06657c99573e3975e735e8cb7f8cc5ccb510851.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10011] Tests don't work on PHP < 5.3
Conflicts:
tests/security/redirect_test.php
Diffstat (limited to 'tests/test_framework/phpbb_database_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_database_test_case.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index a325855da4..32d2696f1c 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -111,9 +111,9 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test 'dbpasswd' => isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '', ); } - else if (file_exists(__DIR__ . '/../test_config.php')) + else if (file_exists(dirname(__FILE__) . '/../test_config.php')) { - include(__DIR__ . '/../test_config.php'); + include(dirname(__FILE__) . '/../test_config.php'); return array( 'dbms' => $dbms, @@ -129,7 +129,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test // Silently use sqlite return array( 'dbms' => 'sqlite', - 'dbhost' => __DIR__ . '/../phpbb_unit_tests.sqlite2', // filename + 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename 'dbport' => '', 'dbname' => '', 'dbuser' => '', @@ -340,7 +340,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test } } - $sql = $this->split_sql_file(file_get_contents(__DIR__ . "/../../phpBB/install/schemas/{$dbms['SCHEMA']}_schema.sql"), $config['dbms']); + $sql = $this->split_sql_file(file_get_contents(dirname(__FILE__) . "/../../phpBB/install/schemas/{$dbms['SCHEMA']}_schema.sql"), $config['dbms']); foreach ($sql as $query) { @@ -376,7 +376,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test $config = $this->get_database_config(); - require_once __DIR__ . '/../../phpBB/includes/db/' . $config['dbms'] . '.php'; + require_once dirname(__FILE__) . '/../../phpBB/includes/db/' . $config['dbms'] . '.php'; $dbal = 'dbal_' . $config['dbms']; $db = new $dbal(); $db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']); |