Skip to content

Commit c15f594

Browse files
committed
Merge branch 'phpunit6' into appveyor
2 parents 8723a5e + 5097779 commit c15f594

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"symfony/http-foundation": "~2.3||~3.0||~4.0"
3737
},
3838
"require-dev": {
39-
"phpunit/phpunit": "~5.0",
39+
"phpunit/phpunit": "~6.0",
4040
"mikey179/vfsStream": "1.6.*"
4141
},
4242
"suggest": {

src/Common/Report/Xml.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function __construct(array $options)
4242
$options['target'] = null;
4343
}
4444

45-
$this->report = new Facade(array());
45+
$this->report = new Facade('');
4646
$this->options = $options;
4747
}
4848

tests/Common/Report/XmlTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ public function testProcess()
4747
try {
4848
$result = $report->process($coverage);
4949
} catch (\Exception $e) {
50-
print_r($e->getMessage());
50+
echo 'aaaa';
51+
echo($e->getMessage());
5152
$this->fail();
5253
}
5354
}

tests/Service/ReportServiceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Report service test
1515
*
1616
* @group Unit
17-
*/
17+
*
1818
class ReportServiceTest extends TestCase
1919
{
2020
public function __construct()

tests/VIPSoft/TestCase.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88

99
namespace VIPSoft;
1010

11+
use PHPUnit\Framework\TestCase as BaseTestCase;
12+
1113
/**
1214
* Test case
1315
*
1416
* @author Anthon Pang <[email protected]>
1517
*/
16-
class TestCase extends \PHPUnit_Framework_TestCase
18+
class TestCase extends BaseTestCase
1719
{
1820
/**
1921
* @var array

0 commit comments

Comments
 (0)