From e195c91b1df2098443310716a679cf9ad168dedd Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 17 Oct 2010 23:10:49 +0200 Subject: [PATCH 1/2] [ticket/9855] Make tests run under PHPUnit 3.5. PHPBB3-9855 --- tests/all_tests.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/all_tests.php b/tests/all_tests.php index bae7725ee7..d1d711c4d7 100644 --- a/tests/all_tests.php +++ b/tests/all_tests.php @@ -28,7 +28,14 @@ require_once 'network/all_tests.php'; require_once 'random/all_tests.php'; // exclude the test directory from code coverage reports -PHPUnit_Util_Filter::addDirectoryToFilter('./'); +if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >= 0) +{ + PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist('./'); +} +else +{ + PHPUnit_Util_Filter::addDirectoryToFilter('./'); +} class phpbb_all_tests { From d56bf3b0604a8b7699cbd2b4cf7104e7344608bf Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 17 Oct 2010 23:32:57 +0200 Subject: [PATCH 2/2] [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(-) 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';