php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-22 01:30:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Yii-style for PHP fatal and parse errors

Browse Source
This commit is contained in:
Alexander Makarov
2013-02-12 00:08:28 +04:00
parent ab42ab2d52
commit 842caa3aae
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
framework/base/Application.php
View File

@@ -126,6 +126,7 @@ class Application extends Module
*/ */
public function init() public function init()
{ {
ob_start();
$this->preloadComponents(); $this->preloadComponents();
} }
@@ -138,10 +139,27 @@ class Application extends Module
*/ */
public function end($status = 0, $exit = true) public function end($status = 0, $exit = true)
{ {
$lastError = error_get_last();
if(isset($lastError['type']) && in_array($lastError['type'], array(E_ERROR, E_PARSE))) {
ob_end_clean();
$exception = new \ErrorException($lastError['message'], 0, $lastError['type'], $lastError['file'], $lastError['line']);
$this->logException($exception);
if (($handler = $this->getErrorHandler()) !== null) {
$handler->handle($exception);
} else {
$this->renderException($exception);
}
die(1);
}
if (!$this->_ended) { if (!$this->_ended) {
$this->_ended = true; $this->_ended = true;
$this->afterRequest(); $this->afterRequest();
} }
ob_end_flush();
if ($exit) { if ($exit) {
exit($status); exit($status);
} }
@@ -155,6 +173,7 @@ class Application extends Module
public function run() public function run()
{ {
$this->beforeRequest(); $this->beforeRequest();
register_shutdown_function(array($this,'end'),0,false);
$status = $this->processRequest(); $status = $this->processRequest();
$this->afterRequest(); $this->afterRequest();
return $status; return $status;