From 34686ca1dc52d334f9dc366bf4ad2770a68b1687 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 4 Dec 2011 13:10:28 +0100 Subject: [PATCH] BUGFIX Restoring system error handlers in bootstrap.php so running tests through the phpunit binary behaves the same way as TestRunner (specifically to fix DeprecationTest on our CI infrastructure) --- tests/bootstrap.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index ff5d964c5..1381ad6c3 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -32,4 +32,7 @@ if(!class_exists('Object')) { $_SERVER['REQUEST_URI'] = BASE_URL . '/dev'; -TestRunner::use_test_manifest(); \ No newline at end of file +TestRunner::use_test_manifest(); + +// Remove the error handler so that PHPUnit can add its own +restore_error_handler(); \ No newline at end of file