From 5b341ed86f37bf93fe4d4e40e66a53c453322b1b Mon Sep 17 00:00:00 2001 From: Davert Date: Tue, 20 Mar 2018 10:37:48 +0200 Subject: [PATCH] updated for latest phpunit and goaoup, version bump --- VERSION | 2 +- composer.json | 3 ++- src/AspectMock/Proxy/Verifier.php | 8 ++++---- tests/_data/demo/UserModel.php | 2 +- tests/unit/FunctionInjectorTest.php | 2 +- tests/unit/MockFailedTest.php | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index 50aea0e..56fea8a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.0 \ No newline at end of file +3.0.0 \ No newline at end of file diff --git a/composer.json b/composer.json index 9297eca..8771a92 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,9 @@ } }, "require": { - "php": ">=5.6.0", + "php": ">=7.0.0", "goaop/framework": "^2.2.0", + "phpunit/phpunit": "> 6.0.0", "symfony/finder": "~2.4|~3.0|~4.0" }, "require-dev": { diff --git a/src/AspectMock/Proxy/Verifier.php b/src/AspectMock/Proxy/Verifier.php index a4e8ec0..a4b77b6 100644 --- a/src/AspectMock/Proxy/Verifier.php +++ b/src/AspectMock/Proxy/Verifier.php @@ -1,6 +1,6 @@ expectException('PHPUnit_Framework_ExpectationFailedException'); + $this->expectException('PHPUnit\Framework\ExpectationFailedException'); } protected function tearDown()