gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_6' into QA_4_6-security

Browse Source
This commit is contained in:
Michal Čihař 2016-06-17 11:23:36 +02:00
commit 00b9be9c4a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/classes/ErrorTest.php
View File

@ -64,7 +64,7 @@ class ErrorTest extends PMATestCase
{
$bt = array(array('file'=>'bt1','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>$this)));
$this->object->setBacktrace($bt);
$bt[0]['args']['foo'] = 'object';
$bt[0]['args']['foo'] = '<Class:ErrorTest>';
$this->assertEquals($bt, $this->object->getBacktrace());
}
@ -127,7 +127,7 @@ class ErrorTest extends PMATestCase
public function testGetBacktraceDisplay()
{
$this->assertContains(
'PHPUnit_Framework_TestResult->run(object)<br />',
'PHPUnit_Framework_TestResult->run(<Class:ErrorTest>)<br />',
$this->object->getBacktraceDisplay()
);
}