Removed the "prepend" strategy for finding PSR7 (#13)

* Removed the "prepend" strategy for finding PSR7

* Bumping depdendencies

* Update

* minor

Author: Nyholm

.travis.yml

@@ -2,7 +2,7 @@ language: php
 sudo: false
 
 php:
-  - 7.0
+  - 7.2
 
 before_install:
   - echo "Disable xdebug" && phpenv config-rm xdebug.ini
@@ -12,4 +12,3 @@ install:
 
 script:
   - ./vendor/bin/phpunit
-

composer.json

@@ -2,26 +2,23 @@
     "name":        "geocoder-php/provider-integration-tests",
     "type":        "library",
     "description": "Integration tests Geocoder provider",
-    "keywords":    [
-        "geocoder",
-        "provider",
-        "test"
-    ],
+    "keywords":    ["geocoder", "provider", "test"],
     "license":     "MIT",
     "minimum-stability": "dev",
-    "authors":     [
+    "authors":
+    [
         {
             "name":     "Tobias Nyholm",
             "email":    "tobias.nyholm@gmail.com",
             "homepage": "https://github.com/nyholm"
         }
     ],
     "require":     {
-        "php": "^7.0",
-        "phpunit/phpunit": "^6.1",
+        "php": "^7.1",
+        "phpunit/phpunit": "^7.5",
         "psr/http-message-implementation": "^1.0",
-        "php-http/mock-client": "^1.0",
-        "nyholm/psr7": "^0.2.2|^1.0.0"
+        "php-http/mock-client": "^1.1",
+        "nyholm/psr7": "^1.0.0"
     },
     "require-dev": {
         "php-http/curl-client": "^1.7",

src/BaseTestCase.php

@@ -12,7 +12,6 @@
 
 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;
@@ -29,12 +28,6 @@ abstract class BaseTestCase extends TestCase
      */
     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

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

src/ProviderIntegrationTest.php

@@ -23,7 +23,6 @@
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Http\Client\HttpClient;
-use Http\Discovery\ClassDiscovery;
 use Http\Discovery\HttpClientDiscovery;
 use Nyholm\Psr7\Response;
 use PHPUnit\Framework\TestCase;
@@ -60,12 +59,6 @@ abstract protected function getCacheDir();
      */
     abstract protected function getApiKey();
 
-    public static function setUpBeforeClass()
-    {
-        parent::setUpBeforeClass();
-        ClassDiscovery::prependStrategy('\Nyholm\Psr7\Httplug\DiscoveryStrategy');
-    }
-
     /**
      * @param ResponseInterface $response
      *