updated for latest phpunit and goaoup, version bump

Codeception · Mar 20, 2018 · 5b341ed · 5b341ed
1 parent 3a4da1c
commit 5b341ed
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.0
+3.0.0
diff --git 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
@@ -1,6 +1,6 @@
 <?php
 namespace AspectMock\Proxy;
-use \PHPUnit_Framework_ExpectationFailedException as fail;
+use \PHPUnit\Framework\ExpectationFailedException as fail;
 use AspectMock\Util\ArgumentsFormatter;
 
 /**
@@ -52,7 +52,7 @@ protected function onlyExpectedArguments($expectedParams, $passedArgs)
      *
      * @param $name
      * @param null $params
-     * @throws \PHPUnit_Framework_ExpectationFailedException
+     * @throws \PHPUnit\Framework\ExpectationFailedException
      * @param array $params
      * @throws fail
      */
@@ -101,7 +101,7 @@ public function verifyInvokedOnce($name, $params = null)
      * @param $name
      * @param $times
      * @param array $params
-     * @throws \PHPUnit_Framework_ExpectationFailedException
+     * @throws \PHPUnit\Framework\ExpectationFailedException
      */
     public function verifyInvokedMultipleTimes($name, $times, $params = null)
     {
@@ -144,7 +144,7 @@ public function verifyInvokedMultipleTimes($name, $times, $params = null)
      *
      * @param $name
      * @param null $params
-     * @throws \PHPUnit_Framework_ExpectationFailedException
+     * @throws \PHPUnit\Framework\ExpectationFailedException
      */
     public function verifyNeverInvoked($name, $params = null)
     {

diff --git a/tests/_data/demo/UserModel.php b/tests/_data/demo/UserModel.php
@@ -80,7 +80,7 @@ public function getInfo($info)
 
     function save()
     {
-        throw new \PHPUnit_Framework_AssertionFailedError("I should not be called");
+        throw new \PHPUnit\Framework\AssertionFailedError("I should not be called");
     }
 
     public function __call($name, $args = array())

diff --git a/tests/unit/FunctionInjectorTest.php b/tests/unit/FunctionInjectorTest.php
@@ -96,7 +96,7 @@ public function testVerifierFullyQualifiedNamespace()
 
     /**
      * @test
-     * @expectedException PHPUnit_Framework_ExpectationFailedException
+     * @expectedException PHPUnit\Framework\ExpectationFailedException
      */
     public function testFailedVerification()
     {

diff --git a/tests/unit/MockFailedTest.php b/tests/unit/MockFailedTest.php
@@ -12,7 +12,7 @@ class MockFailedTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->expectException('PHPUnit_Framework_ExpectationFailedException');
+        $this->expectException('PHPUnit\Framework\ExpectationFailedException');
     }        
 
     protected function tearDown()
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,7 +96,7 @@ public function testVerifierFullyQualifiedNamespace() @@
         /**
          * @test
-         * @expectedException PHPUnit_Framework_ExpectationFailedException
+         * @expectedException PHPUnit\Framework\ExpectationFailedException
          */
         public function testFailedVerification()
         {
@@ Expand Down @@