Upgrade to PHPUnit-6

As PHPUnit-6 doesn't support PHP-5 I, have to drop that support here as
well. Therefore this commit requires a major release. Older PHPUnit
versions cannot be supported any more. Refer to version 1 if you need
support for PHP-5, PHPUnit-4 or PHPUnit-5.

See also: #14

Author: malkusch

.travis.yml

@@ -8,55 +8,18 @@ cache:
 
 env:
   - PHPUNIT_VERSION=dev-master
-  - PHPUNIT_VERSION=~5.7.0
-  - PHPUNIT_VERSION=~5.6.0
-  - PHPUNIT_VERSION=~5.5.0
-  - PHPUNIT_VERSION=~5.4.0
-  - PHPUNIT_VERSION=~5.3.0
-  - PHPUNIT_VERSION=~5.2.0
-  - PHPUNIT_VERSION=~5.1.0
-  - PHPUNIT_VERSION=~5.0.0
-  - PHPUNIT_VERSION=~4.8.0
-  - PHPUNIT_VERSION=~4.7.0
-  - PHPUNIT_VERSION=~4.6.0
-  - PHPUNIT_VERSION=~4.5.0
-  - PHPUNIT_VERSION=~4.4.0
-  - PHPUNIT_VERSION=~4.3.0
-  - PHPUNIT_VERSION=~4.2.0
-  - PHPUNIT_VERSION=~4.1.0
-  - PHPUNIT_VERSION=~4.0.0
+  - PHPUNIT_VERSION=~6.0.0
 
 php:
   - 7.1
   - 7.0
-  - 5.6
-  - 5.5
   - hhvm
 
 matrix:
   fast_finish: true
   allow_failures:
     - php: hhvm
     - env: PHPUNIT_VERSION=dev-master
-  exclude:
-    - env: PHPUNIT_VERSION=~5.0.0
-      php: 5.5
-    - env: PHPUNIT_VERSION=~5.1.0
-      php: 5.5
-    - env: PHPUNIT_VERSION=~5.2.0
-      php: 5.5
-    - env: PHPUNIT_VERSION=~5.3.0
-      php: 5.5
-    - env: PHPUNIT_VERSION=~5.4.0
-      php: 5.5
-    - env: PHPUNIT_VERSION=~5.5.0
-      php: 5.5
-    - env: PHPUNIT_VERSION=~5.6.0
-      php: 5.5
-    - env: PHPUNIT_VERSION=~5.7.0
-      php: 5.5
-    - env: PHPUNIT_VERSION=dev-master
-      php: 5.5
 
 install:
   - composer require phpunit/phpunit:${PHPUNIT_VERSION}

classes/MockDisabler.php

@@ -3,6 +3,8 @@
 namespace phpmock\phpunit;
 
 use phpmock\Deactivatable;
+use PHPUnit\Framework\BaseTestListener;
+use PHPUnit\Framework\Test;
 
 /**
  * Test listener for PHPUnit integration.
@@ -14,7 +16,7 @@
  * @license http://www.wtfpl.net/txt/copying/ WTFPL
  * @internal
  */
-class MockDisabler extends \PHPUnit_Framework_BaseTestListener
+class MockDisabler extends BaseTestListener
 {
 
     /**
@@ -35,12 +37,12 @@ public function __construct(Deactivatable $deactivatable)
     /**
      * Disables the function mocks.
      *
-     * @param \PHPUnit_Framework_Test $test The test.
-     * @param int                     $time The test duration.
+     * @param Test $test The test.
+     * @param int  $time The test duration.
      *
      * @see Mock::disable()
      */
-    public function endTest(\PHPUnit_Framework_Test $test, $time)
+    public function endTest(Test $test, $time)
     {
         parent::endTest($test, $time);
 

composer.json

@@ -17,14 +17,11 @@
         "psr-4": {"phpmock\\phpunit\\": "classes/"}
     },
     "require": {
-        "php": ">=5.5",
-        "phpunit/phpunit": "^4.0.0 || ^5.0.0",
-        "php-mock/php-mock-integration": "^1"
+        "php": ">=7",
+        "phpunit/phpunit": "^6",
+        "php-mock/php-mock-integration": "^2"
     },
     "archive": {
         "exclude": ["/tests"]
-    },
-    "conflict": {
-        "phpunit/phpunit-mock-objects": "3.2.0"
     }
 }

tests/MockDisablerTest.php

@@ -3,6 +3,7 @@
 namespace phpmock\phpunit;
 
 use phpmock\Mock;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests MockDisabler.
@@ -12,7 +13,7 @@
  * @license http://www.wtfpl.net/txt/copying/ WTFPL
  * @see MockDisabler
  */
-class MockDisablerTest extends \PHPUnit_Framework_TestCase
+class MockDisablerTest extends TestCase
 {
 
     /**

tests/MockObjectProxyTest.php

@@ -3,6 +3,7 @@
 namespace phpmock\phpunit;
 
 use \PHPUnit_Framework_MockObject_Builder_InvocationMocker as InvocationMocker;
+use PHPUnit\Framework\TestCase;
 use phpmock\integration\MockDelegateFunctionBuilder;
 
 /**
@@ -14,7 +15,7 @@
  * @see MockObjectProxy
  * @requires PHPUnit 4.5.0
  */
-class MockObjectProxyTest extends \PHPUnit_Framework_TestCase
+class MockObjectProxyTest extends TestCase
 {
 
     /**

tests/PHPMockTest.php

@@ -3,6 +3,7 @@
 namespace phpmock\phpunit;
 
 use phpmock\AbstractMockTest;
+use PHPUnit\Framework\ExpectationFailedException;
 
 /**
  * Tests PHPMock.
@@ -58,7 +59,7 @@ public function testFunctionMockFailsExpectation()
 
             $time->__phpunit_verify();
             $this->fail("Expectation should fail");
-        } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+        } catch (ExpectationFailedException $e) {
             time(); // satisfy the expectation
         }
     }