From b3ef74d3097c42b100fc899c779abb3adcabe61f Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 3 May 2011 09:24:04 +0200 Subject: [PATCH] [HttpKernel] Fix console output for reals --- .../Component/HttpKernel/Debug/ExceptionListenerTest.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/Symfony/Tests/Component/HttpKernel/Debug/ExceptionListenerTest.php b/tests/Symfony/Tests/Component/HttpKernel/Debug/ExceptionListenerTest.php index e76a35197d..fb73eb0996 100644 --- a/tests/Symfony/Tests/Component/HttpKernel/Debug/ExceptionListenerTest.php +++ b/tests/Symfony/Tests/Component/HttpKernel/Debug/ExceptionListenerTest.php @@ -45,9 +45,8 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase */ public function testHandleWithoutLogger($event, $event2) { - // store the current log_errors, and disable it temporarily - $logErrors = ini_set('log_errors', false); - $errorLog = ini_set('error_log', '/dev/null'); + // store the current error_log, and disable it temporarily + $errorLog = ini_set('error_log', file_exists('/dev/null') ? '/dev/null' : 'nul'); $l = new ExceptionListener('foo'); $l->onCoreException($event); @@ -60,8 +59,7 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase $this->assertSame('foo', $e->getMessage()); } - // restore the old settings - ini_set('log_errors', $logErrors); + // restore the old error_log ini_set('error_log', $errorLog); }