Update requirements versions and adjust tests accordingly

Author: ramsey

composer.json

@@ -6,16 +6,16 @@
         "sort-packages": true
     },
     "require": {
-        "php": ">=5.6.0",
+        "php": "^5.6|^7.0",
         "guzzlehttp/guzzle": "^6.0",
         "paragonie/random_compat": "^1|^2"
     },
     "require-dev": {
         "eloquent/liberator": "^2.0",
-        "eloquent/phony": "^0.14.1",
-        "jakub-onderka/php-parallel-lint": "~0.9",
-        "phpunit/phpunit": "^5.0",
-        "squizlabs/php_codesniffer": "^2.0"
+        "eloquent/phony-phpunit": "^1.0|^3.0",
+        "jakub-onderka/php-parallel-lint": "^0.9.2",
+        "phpunit/phpunit": "^5.7|^6.0",
+        "squizlabs/php_codesniffer": "^2.3|^3.0"
     },
     "keywords": [
         "oauth",

test/src/Grant/GrantFactoryTest.php

@@ -6,7 +6,7 @@
 use League\OAuth2\Client\Grant\AbstractGrant;
 use League\OAuth2\Client\Grant\Exception\InvalidGrantException;
 use League\OAuth2\Client\Test\Grant\Fake as MockGrant;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class GrantFactoryTest extends TestCase
 {

test/src/Grant/GrantTestCase.php

@@ -4,7 +4,7 @@
 
 use Eloquent\Phony\Phpunit\Phony;
 use GuzzleHttp\ClientInterface;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use League\OAuth2\Client\Token\AccessToken;

test/src/Provider/AbstractProviderTest.php

@@ -13,7 +13,7 @@
 use League\OAuth2\Client\Token\AccessToken;
 use League\OAuth2\Client\Tool\RequestFactory;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;

test/src/Provider/Exception/IdentityProviderException.php

@@ -4,7 +4,7 @@
 
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 
-class IdentityProviderExceptionTest extends \PHPUnit_Framework_TestCase
+class IdentityProviderExceptionTest extends \PHPUnit\Framework\TestCase
 {
     protected $result;
 

test/src/Provider/GenericProviderTest.php

@@ -7,7 +7,7 @@
 use League\OAuth2\Client\Provider\GenericProvider;
 use League\OAuth2\Client\Provider\GenericResourceOwner;
 use League\OAuth2\Client\Token\AccessToken;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\RequestInterface;
 

test/src/Token/AccessTokenTest.php

@@ -4,7 +4,7 @@
 
 use Eloquent\Phony\Phpunit\Phony;
 use League\OAuth2\Client\Token\AccessToken;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class AccessTokenTest extends TestCase
 {

test/src/Tool/ArrayAccessorTraitTest.php

@@ -3,9 +3,9 @@
 namespace League\OAuth2\Client\Test\Tool;
 
 use League\OAuth2\Client\Tool\ArrayAccessorTrait;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class ArrayAccessorTraitTest extends PHPUnit_Framework_TestCase
+class ArrayAccessorTraitTest extends TestCase
 {
     use ArrayAccessorTrait;
 

test/src/Tool/ProviderRedirectTraitTest.php

@@ -6,11 +6,11 @@
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\BadResponseException;
 use League\OAuth2\Client\Tool\ProviderRedirectTrait;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\RequestInterface;
 
-class ProviderRedirectTraitTest extends PHPUnit_Framework_TestCase
+class ProviderRedirectTraitTest extends TestCase
 {
     use ProviderRedirectTrait;
 
@@ -84,6 +84,8 @@ public function testClientLimitsRedirectResponse()
 
         $this->setHttpClient($client->get())->setRedirectLimit($redirectLimit);
         $finalResponse = $this->getResponse($request->get());
+
+        $this->assertInstanceOf(ResponseInterface::class, $finalResponse);
     }
 
     public function testClientLimitsRedirectLoopWhenRedirectNotDetected()
@@ -103,6 +105,8 @@ public function testClientLimitsRedirectLoopWhenRedirectNotDetected()
 
         $this->setHttpClient($client->get())->setRedirectLimit($redirectLimit);
         $finalResponse = $this->getResponse($request->get());
+
+        $this->assertInstanceOf(ResponseInterface::class, $finalResponse);
     }
 
     public function testClientErrorReturnsResponse()
@@ -123,5 +127,7 @@ public function testClientErrorReturnsResponse()
 
         $this->setHttpClient($client->get());
         $finalResponse = $this->getResponse($request->get());
+
+        $this->assertInstanceOf(ResponseInterface::class, $finalResponse);
     }
 }

test/src/Tool/QueryBuilderTraitTest.php

@@ -3,9 +3,9 @@
 namespace League\OAuth2\Client\Test\Tool;
 
 use League\OAuth2\Client\Tool\QueryBuilderTrait;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class QueryBuilderTraitTest extends PHPUnit_Framework_TestCase
+class QueryBuilderTraitTest extends TestCase
 {
     use QueryBuilderTrait;