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

adjusted guide and small code adjustements

Browse Source
This commit is contained in:
Carsten Brandt
2014-03-29 20:15:32 +01:00
parent 33543cbdb3
commit bb2906917d
2 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
framework/base/ErrorHandler.php
View File

@@ -81,11 +81,7 @@ class ErrorHandler extends Component
if ($this->discardExistingOutput) {
$this->clearOutput();
}
if (PHP_SAPI === 'cli') {
Console::stderr($this->renderException($exception));
} else {
echo $this->renderException($exception);
}
$this->renderException($exception);
if (!YII_ENV_TEST) {
exit(1);
}
@@ -168,11 +164,7 @@ class ErrorHandler extends Component
if ($this->discardExistingOutput) {
$this->clearOutput();
}
if (PHP_SAPI === 'cli') {
Console::stderr($this->renderException($exception));
} else {
echo $this->renderException($exception);
}
$this->renderException($exception);
exit(1);
}
}
@@ -180,7 +172,6 @@ class ErrorHandler extends Component
/**
* Renders an exception without using rich format.
* @param \Exception $exception the exception to be rendered.
* @return string the rendering result
*/
protected function renderException($exception)
{
@@ -202,7 +193,12 @@ class ErrorHandler extends Component
} else {
$message = $this->formatMessage('Error: ') . $exception->getMessage();
}
return $message . "\n";
if (PHP_SAPI === 'cli') {
Console::stderr($message . "\n");
} else {
echo $message . "\n";
}
}
/**
@@ -229,7 +225,6 @@ class ErrorHandler extends Component
*/
protected function logException($exception)
{
// TODO logger may not be registered
$category = get_class($exception);
if ($exception instanceof HttpException) {
$category = 'yii\\web\\HttpException:' . $exception->statusCode;