From 1e4ff6105a3fc34440f5b1294e574d7f8ca7c906 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 12 Nov 2014 20:34:36 +0100 Subject: [ticket/13325] Make installing composer dependencies in tests folder optional. Make phpbb_ui_test_case available unconditionally. Nothing depends on 5.3.19 here. Remove __init__ include. Composer classmap autoloading ensures classes can be loaded. PHPBB3-13325 --- tests/bootstrap.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/bootstrap.php') 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'; } -- cgit v1.2.1