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

Merge pull request #920 from bixuehujin/fixed-exception-toarray

Browse Source 
Incorrect array representation when has previous exception
This commit is contained in:
Qiang Xue
2013-09-29 09:04:17 -07:00
parent ed4553711e 5d7c37bd7e
commit a4a159633c
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/yii/base/Exception.php
View File

@@ -41,10 +41,10 @@ class Exception extends \Exception implements Arrayable
{
if ($exception instanceof self) {
$array = array(
'type' => get_class($this),
'name' => $this->getName(),
'message' => $this->getMessage(),
'code' => $this->getCode(),
'type' => get_class($exception),
'name' => $exception->getName(),
'message' => $exception->getMessage(),
'code' => $exception->getCode(),
);
} else {
$array = array(

23
tests/unit/framework/base/ExceptionTest.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
namespace yiiunit\framework\base;
use yii\test\TestCase;
use yii\base\UserException;
use yii\base\InvalidCallException;
class ExceptionTest extends TestCase
{
public function testToArrayWithPrevious()
{
$e = new InvalidCallException('bar', 0 ,new InvalidCallException('foo'));
$array = $e->toArray();
$this->assertEquals('bar', $array['message']);
$this->assertEquals('foo', $array['previous']['message']);
$e = new InvalidCallException('bar', 0 ,new UserException('foo'));
$array = $e->toArray();
$this->assertEquals('bar', $array['message']);
$this->assertEquals('foo', $array['previous']['message']);
}
}