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

[ErrorHandler] Never throw on warnings triggered by assert() and set assert.exception=1 in Debug::enable()

Browse Source
This commit is contained in:
Nicolas Grekas 2020-02-07 19:04:34 +01:00
parent 05663c338f
commit f18ef6ca08
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/ErrorHandler/Debug.php
View File

@ -29,6 +29,11 @@ class Debug
ini_set('display_errors', 1);
}
ini_set('zend.assertions', 1);
ini_set('assert.active', 1);
ini_set('assert.warning', 0);
ini_set('assert.exception', 1);
DebugClassLoader::enable();
return ErrorHandler::register(new ErrorHandler(new BufferingLogger(), true));

5
src/Symfony/Component/ErrorHandler/ErrorHandler.php
View File

@ -413,6 +413,11 @@ class ErrorHandler
$throw = $this->thrownErrors & $type & $level;
$type &= $level | $this->screamedErrors;
// Never throw on warnings triggered by assert()
if (E_WARNING === $type && 'a' === $message[0] && 0 === strncmp($message, 'assert(): ', 10)) {
$throw = 0;
}
if (!$type || (!$log && !$throw)) {
return !$silenced && $type && $log;
}

35
src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
View File

@ -615,4 +615,39 @@ class ErrorHandlerTest extends TestCase
}
}
}
public function testAssertQuietEval()
{
$ini = [
ini_set('zend.assertions', 1),
ini_set('assert.active', 1),
ini_set('assert.bail', 0),
ini_set('assert.warning', 1),
ini_set('assert.callback', null),
ini_set('assert.exception', 0),
];
$logger = new BufferingLogger();
$handler = new ErrorHandler($logger);
$handler = ErrorHandler::register($handler);
try {
\assert(false);
} finally {
restore_error_handler();
restore_exception_handler();
ini_set('zend.assertions', $ini[0]);
ini_set('assert.active', $ini[1]);
ini_set('assert.bail', $ini[2]);
ini_set('assert.warning', $ini[3]);
ini_set('assert.callback', $ini[4]);
ini_set('assert.exception', $ini[5]);
}
$logs = $logger->cleanLogs();
$this->assertSame('warning', $logs[0][0]);
$this->assertSame('Warning: assert(): assert(false) failed', $logs[0][1]);
}
}