diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'Seldaek/exception_test'

Browse Source 
* Seldaek/exception_test:
  [HttpKernel] Fix console output for reals
This commit is contained in:
Fabien Potencier 2011-05-03 13:43:49 +02:00
commit 3c2b3f2537
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Symfony/Tests/Component/HttpKernel/Debug/ExceptionListenerTest.php
View File

@ -45,9 +45,8 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
*/ */
public function testHandleWithoutLogger($event, $event2) public function testHandleWithoutLogger($event, $event2)
{ {
// store the current log_errors, and disable it temporarily // store the current error_log, and disable it temporarily
$logErrors = ini_set('log_errors', false); $errorLog = ini_set('error_log', file_exists('/dev/null') ? '/dev/null' : 'nul');
$errorLog = ini_set('error_log', '/dev/null');
$l = new ExceptionListener('foo'); $l = new ExceptionListener('foo');
$l->onCoreException($event); $l->onCoreException($event);
@ -60,8 +59,7 @@ class ExceptionListenerTest extends \PHPUnit_Framework_TestCase
$this->assertSame('foo', $e->getMessage()); $this->assertSame('foo', $e->getMessage());
} }
// restore the old settings // restore the old error_log
ini_set('log_errors', $logErrors);
ini_set('error_log', $errorLog); ini_set('error_log', $errorLog);
} }