diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-11-13 17:12:09 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-13 17:12:09 +0100 |
| commit | 1f2ec038fbcd35a22cf7ea4571baf347cfe85dac (patch) | |
| tree | 8791e50a82f28957b92beda5bdb3b57974a0db5f /tests/bootstrap.php | |
| parent | 07957668370c0a8adcce0ae596ee4b402f60146b (diff) | |
| parent | c9db08873f1e1d9f9f89da181d5aa374464fc250 (diff) | |
| download | forums-1f2ec038fbcd35a22cf7ea4571baf347cfe85dac.tar forums-1f2ec038fbcd35a22cf7ea4571baf347cfe85dac.tar.gz forums-1f2ec038fbcd35a22cf7ea4571baf347cfe85dac.tar.bz2 forums-1f2ec038fbcd35a22cf7ea4571baf347cfe85dac.tar.xz forums-1f2ec038fbcd35a22cf7ea4571baf347cfe85dac.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'tests/bootstrap.php')
| -rw-r--r-- | tests/bootstrap.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 65447eb95c..0e81f4372a 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -33,8 +33,9 @@ require_once 'test_framework/phpbb_test_case.php'; require_once 'test_framework/phpbb_database_test_case.php'; require_once 'test_framework/phpbb_database_test_connection_manager.php'; require_once 'test_framework/phpbb_functional_test_case.php'; +require_once 'test_framework/phpbb_ui_test_case.php'; -if (version_compare(PHP_VERSION,'5.3.19', ">=")) +if (version_compare(PHP_VERSION, '5.3.19', ">=") && file_exists(__DIR__ . '/vendor/autoload.php')) { - require_once 'test_framework/phpbb_ui_test_case.php'; + require_once __DIR__ . '/vendor/autoload.php'; } |