Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/9855] Do not include the PHPUnit Framework manually on 3.5+.
  [ticket/9855] Make tests run under PHPUnit 3.5.

2 files changed, 14 insertions, 3 deletions

diff --git a/tests/all_tests.php b/tests/all_tests.php
index 07d6f89524..feaaa1f0a1 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
 {
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';