From d56bf3b0604a8b7699cbd2b4cf7104e7344608bf Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 17 Oct 2010 23:32:57 +0200 Subject: [ticket/9855] Do not include the PHPUnit Framework manually on 3.5+. PHPBB3-9855 --- tests/test_framework/framework.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tests/test_framework') 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'; -- cgit v1.2.1