Require PHP7 and PHPUnit 6 (#7)

* require PHP7

* cs

* Removed bootstrap file

* Added missing response

Author: Nyholm

.cached_responses/maps.googleapis.com_56a86eba9a0b3b14e39bc8c0b13a5ebb4a017803

@@ -0,0 +1,5 @@
+s:52:"{
+   "results" : [],
+   "status" : "ZERO_RESULTS"
+}
+";

composer.json

@@ -17,12 +17,12 @@
         }
     ],
     "require":     {
-        "php": "^5.5 || ^7.0",
-        "phpunit/phpunit": "^4.8 || ^5.4",
+        "php": "^7.0",
+        "phpunit/phpunit": "^6.1",
         "psr/http-message-implementation": "^1.0",
         "willdurand/geocoder": "^4.0",
         "php-http/mock-client": "^1.0",
-        "guzzlehttp/psr7": "^1.4"
+        "nyholm/psr7": "^0.2.2"
     },
     "require-dev": {
         "php-http/curl-client": "^1.7"

src/BaseTestCase.php

@@ -10,23 +10,31 @@
 
 namespace Geocoder\IntegrationTest;
 
-use GuzzleHttp\Psr7\Response;
 use Http\Client\Curl\Client as HttplugClient;
 use Http\Client\HttpClient;
+use Http\Discovery\ClassDiscovery;
 use Http\Mock\Client as MockedHttpClient;
+use Nyholm\Psr7\Response;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
+abstract class BaseTestCase extends TestCase
 {
     /**
      * @return string|null the directory where cached responses are stored
      */
     abstract protected function getCacheDir();
 
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+        ClassDiscovery::prependStrategy('\Nyholm\Psr7\Httplug\DiscoveryStrategy');
+    }
+
     /**
      * Get a real HTTP client. If a cache dir is set to a path it will use cached responses.
      *

src/CachedResponseClient.php

@@ -10,9 +10,9 @@
 
 namespace Geocoder\IntegrationTest;
 
-use GuzzleHttp\Psr7;
-use GuzzleHttp\Psr7\Response;
 use Http\Client\HttpClient;
+use Nyholm\Psr7\Factory\StreamFactory;
+use Nyholm\Psr7\Response;
 use Psr\Http\Message\RequestInterface;
 
 /**
@@ -62,7 +62,7 @@ public function sendRequest(RequestInterface $request)
 
         $file = sprintf('%s/%s_%s', $this->cacheDir, $host, sha1($url));
         if (is_file($file) && is_readable($file)) {
-            return new Response(200, [], Psr7\stream_for(unserialize(file_get_contents($file))));
+            return new Response(200, [], (new StreamFactory())->createStream(unserialize(file_get_contents($file))));
         }
 
         $response = $this->delegate->sendRequest($request);

src/ProviderIntegrationTest.php

@@ -19,15 +19,17 @@
 use Geocoder\Provider\Provider;
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
-use GuzzleHttp\Psr7\Response;
 use Http\Client\HttpClient;
+use Http\Discovery\ClassDiscovery;
 use Http\Discovery\HttpClientDiscovery;
+use Nyholm\Psr7\Response;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-abstract class ProviderIntegrationTest extends \PHPUnit_Framework_TestCase
+abstract class ProviderIntegrationTest extends TestCase
 {
     /**
      * @var array with functionName => reason
@@ -49,6 +51,12 @@ abstract protected function getCacheDir();
      */
     abstract protected function getApiKey();
 
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+        ClassDiscovery::prependStrategy('\Nyholm\Psr7\Httplug\DiscoveryStrategy');
+    }
+
     /**
      * @param ResponseInterface $response
      *