Skip to content

Commit 5b341ed

Browse files
committed
updated for latest phpunit and goaoup, version bump
1 parent 3a4da1c commit 5b341ed

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.0
1+
3.0.0

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
}
1414
},
1515
"require": {
16-
"php": ">=5.6.0",
16+
"php": ">=7.0.0",
1717
"goaop/framework": "^2.2.0",
18+
"phpunit/phpunit": "> 6.0.0",
1819
"symfony/finder": "~2.4|~3.0|~4.0"
1920
},
2021
"require-dev": {

src/AspectMock/Proxy/Verifier.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
namespace AspectMock\Proxy;
3-
use \PHPUnit_Framework_ExpectationFailedException as fail;
3+
use \PHPUnit\Framework\ExpectationFailedException as fail;
44
use AspectMock\Util\ArgumentsFormatter;
55

66
/**
@@ -52,7 +52,7 @@ protected function onlyExpectedArguments($expectedParams, $passedArgs)
5252
*
5353
* @param $name
5454
* @param null $params
55-
* @throws \PHPUnit_Framework_ExpectationFailedException
55+
* @throws \PHPUnit\Framework\ExpectationFailedException
5656
* @param array $params
5757
* @throws fail
5858
*/
@@ -101,7 +101,7 @@ public function verifyInvokedOnce($name, $params = null)
101101
* @param $name
102102
* @param $times
103103
* @param array $params
104-
* @throws \PHPUnit_Framework_ExpectationFailedException
104+
* @throws \PHPUnit\Framework\ExpectationFailedException
105105
*/
106106
public function verifyInvokedMultipleTimes($name, $times, $params = null)
107107
{
@@ -144,7 +144,7 @@ public function verifyInvokedMultipleTimes($name, $times, $params = null)
144144
*
145145
* @param $name
146146
* @param null $params
147-
* @throws \PHPUnit_Framework_ExpectationFailedException
147+
* @throws \PHPUnit\Framework\ExpectationFailedException
148148
*/
149149
public function verifyNeverInvoked($name, $params = null)
150150
{

tests/_data/demo/UserModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function getInfo($info)
8080

8181
function save()
8282
{
83-
throw new \PHPUnit_Framework_AssertionFailedError("I should not be called");
83+
throw new \PHPUnit\Framework\AssertionFailedError("I should not be called");
8484
}
8585

8686
public function __call($name, $args = array())

tests/unit/FunctionInjectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function testVerifierFullyQualifiedNamespace()
9696

9797
/**
9898
* @test
99-
* @expectedException PHPUnit_Framework_ExpectationFailedException
99+
* @expectedException PHPUnit\Framework\ExpectationFailedException
100100
*/
101101
public function testFailedVerification()
102102
{

tests/unit/MockFailedTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class MockFailedTest extends \PHPUnit\Framework\TestCase
1212

1313
protected function setUp()
1414
{
15-
$this->expectException('PHPUnit_Framework_ExpectationFailedException');
15+
$this->expectException('PHPUnit\Framework\ExpectationFailedException');
1616
}
1717

1818
protected function tearDown()

0 commit comments

Comments
 (0)