Skip to content
This repository was archived by the owner on Jan 10, 2022. It is now read-only.

Commit e95cbd5

Browse files
committed
compatibility with PHPUnit < 6.x
1 parent 2a94471 commit e95cbd5

5 files changed

+59
-4
lines changed

tests/InitControllerTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ protected function tearDown()
3434
*/
3535
protected function createController()
3636
{
37-
$consoleCommand = $this->getMock(InitController::className(), ['stdout'], ['install', Yii::$app]);
37+
$consoleCommand = $this->getMockBuilder(InitController::className())
38+
->setConstructorArgs(['install', Yii::$app])
39+
->setMethods(['stdout'])
40+
->getMock();
3841
$consoleCommand->interactive = false;
3942
$consoleCommand->outputLog = false;
4043
return $consoleCommand;

tests/LocalFilePlaceholderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function testGetDefaultValue()
131131
$this->assertEquals($defaultValue, $model->getActualValue(), 'Unable to get default value!');
132132

133133
$model->default = null;
134-
$this->setExpectedException('\yii\base\Exception');
134+
$this->expectException('\yii\base\Exception');
135135
$model->getActualValue();
136136
}
137137
}

tests/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Base class for the 'Crontab' test cases.
1010
*/
11-
class TestCase extends \PHPUnit_Framework_TestCase
11+
class TestCase extends \PHPUnit\Framework\TestCase
1212
{
1313
protected function setUp()
1414
{

tests/bootstrap.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@
1212
require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
1313

1414
Yii::setAlias('@yii2tech/tests/unit/install', __DIR__);
15-
Yii::setAlias('@yii2tech/install', dirname(__DIR__));
15+
Yii::setAlias('@yii2tech/install', dirname(__DIR__));
16+
17+
require_once(__DIR__ . '/compatibility.php');

tests/compatibility.php

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?php
2+
/*
3+
* Ensures compatibility with PHPUnit < 6.x
4+
*/
5+
6+
namespace PHPUnit\Framework\Constraint {
7+
if (!class_exists('PHPUnit\Framework\Constraint\Constraint') && class_exists('PHPUnit_Framework_Constraint')) {
8+
abstract class Constraint extends \PHPUnit_Framework_Constraint {}
9+
}
10+
}
11+
12+
namespace PHPUnit\Framework {
13+
if (!class_exists('PHPUnit\Framework\TestCase') && class_exists('PHPUnit_Framework_TestCase')) {
14+
abstract class TestCase extends \PHPUnit_Framework_TestCase {
15+
/**
16+
* @param string $exception
17+
*/
18+
public function expectException($exception)
19+
{
20+
$this->setExpectedException($exception);
21+
}
22+
23+
/**
24+
* @param string $message
25+
*/
26+
public function expectExceptionMessage($message)
27+
{
28+
$parentClassMethods = get_class_methods('PHPUnit_Framework_TestCase');
29+
if (in_array('expectExceptionMessage', $parentClassMethods)) {
30+
parent::expectExceptionMessage($message);
31+
return;
32+
}
33+
$this->setExpectedException($this->getExpectedException(), $message);
34+
}
35+
36+
/**
37+
* @param string $messageRegExp
38+
*/
39+
public function expectExceptionMessageRegExp($messageRegExp)
40+
{
41+
$parentClassMethods = get_class_methods('PHPUnit_Framework_TestCase');
42+
if (in_array('expectExceptionMessageRegExp', $parentClassMethods)) {
43+
parent::expectExceptionMessageRegExp($messageRegExp);
44+
return;
45+
}
46+
$this->setExpectedExceptionRegExp($this->getExpectedException(), $messageRegExp);
47+
}
48+
}
49+
}
50+
}

0 commit comments

Comments
 (0)