diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-10-17 23:32:57 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-10-17 23:32:57 +0200 |
| commit | d56bf3b0604a8b7699cbd2b4cf7104e7344608bf (patch) | |
| tree | e4a49e5c887fd5d2cfa2e050f30821b4aff5e316 /tests/test_framework | |
| parent | e195c91b1df2098443310716a679cf9ad168dedd (diff) | |
| download | forums-d56bf3b0604a8b7699cbd2b4cf7104e7344608bf.tar forums-d56bf3b0604a8b7699cbd2b4cf7104e7344608bf.tar.gz forums-d56bf3b0604a8b7699cbd2b4cf7104e7344608bf.tar.bz2 forums-d56bf3b0604a8b7699cbd2b4cf7104e7344608bf.tar.xz forums-d56bf3b0604a8b7699cbd2b4cf7104e7344608bf.zip | |
[ticket/9855] Do not include the PHPUnit Framework manually on 3.5+.
PHPBB3-9855
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/framework.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/test_framework/framework.php b/tests/test_framework/framework.php index abdcd1ad79..3a11cc6df9 100644 --- a/tests/test_framework/framework.php +++ b/tests/test_framework/framework.php @@ -32,8 +32,12 @@ if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', '<')) trigger_error('PHPUnit >= 3.3.0 required'); } -require_once 'PHPUnit/Framework.php'; -require_once 'PHPUnit/Extensions/Database/TestCase.php'; +if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0', '<')) +{ + require_once 'PHPUnit/Framework.php'; + require_once 'PHPUnit/Extensions/Database/TestCase.php'; +} + require_once 'test_framework/phpbb_test_case_helpers.php'; require_once 'test_framework/phpbb_test_case.php'; require_once 'test_framework/phpbb_database_test_case.php'; |