Bump phpunit to 6.x

Author: barryvdh

composer.json

@@ -28,8 +28,8 @@
     "require": {
         "php-http/mock-client": "^1",
         "php-http/guzzle6-adapter": "^1.1.1",
-        "mockery/mockery": "^0.9",
-        "phpunit/phpunit": "^5.7.25"
+        "mockery/mockery": "^1",
+        "phpunit/phpunit": "^6"
     },
     "require-dev": {
         "omnipay/common": "^3",
@@ -39,5 +39,7 @@
         "branch-alias": {
             "dev-master": "3.0.x-dev"
         }
-    }
+    },
+    "minimum-stability": "rc",
+    "prefer-stable": true
 }

src/GatewayTestCase.php

@@ -2,13 +2,18 @@
 
 namespace Omnipay\Tests;
 
+use Omnipay\Common\AbstractGateway;
+
 /**
  * Base Gateway Test class
  *
  * Ensures all gateways conform to consistent standards
  */
 abstract class GatewayTestCase extends TestCase
 {
+    /** @var AbstractGateway */
+    protected $gateway;
+
     public function testGetNameNotEmpty()
     {
         $name = $this->gateway->getName();

src/TestCase.php

@@ -4,7 +4,7 @@
 
 use Mockery as m;
 use Omnipay\Common\Http\Client;
-use PHPUnit\Framework\TestCase as PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 use Psr\Http\Message\ResponseInterface;
 use ReflectionObject;
 use Http\Mock\Client as MockClient;
@@ -15,7 +15,7 @@
  *
  * Guzzle mock methods area based on those in GuzzleTestCase
  */
-abstract class TestCase extends PHPUnit_Framework_TestCase
+abstract class TestCase extends PHPUnitTestCase
 {
     /** @var  \Omnipay\Common\Message\RequestInterface */
     private $mockRequest;
@@ -163,4 +163,8 @@ public function getHttpRequest()
 
         return $this->httpRequest;
     }
+
+    public function tearDown() {
+        \Mockery::close();
+    }
 }