Tweaked changes from PR, included HTTP Response Factory

Fixes #148

Author: mikebronner

composer.json

@@ -27,6 +27,7 @@
         "geocoder-php/geo-plugin-provider": "^4.0",
         "geocoder-php/google-maps-provider": "^4.0",
         "guzzlehttp/psr7": "*",
+        "http-interop/http-factory-guzzle": "^1.0",
         "illuminate/cache": "5.0 - 5.8",
         "illuminate/support": "5.0 - 5.8",
         "php-http/curl-client": "*",

phpunit.xml

@@ -8,7 +8,7 @@
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
     processIsolation="false"
-    stopOnFailure="false"
+    stopOnFailure="true"
 >
 <testsuites>
     <testsuite name="Browser">

src/ProviderAndDumperAggregator.php

@@ -9,20 +9,18 @@
  * @license    MIT License
  */
 
-use ReflectionClass;
-use Geocoder\Geocoder;
+use Geocoder\Dumper\GeoJson;
 use Geocoder\Dumper\Gpx;
 use Geocoder\Dumper\Kml;
 use Geocoder\Dumper\Wkb;
 use Geocoder\Dumper\Wkt;
-use Geocoder\Query\Query;
-use Illuminate\Support\Str;
-use Geocoder\Dumper\GeoJson;
+use Geocoder\Laravel\Exceptions\InvalidDumperException;
 use Geocoder\ProviderAggregator;
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Illuminate\Support\Collection;
-use Geocoder\Laravel\Exceptions\InvalidDumperException;
+use Illuminate\Support\Str;
+use ReflectionClass;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
@@ -89,7 +87,7 @@ public function dump(string $dumper) : Collection
 
     public function geocode(string $value) : self
     {
-        $cacheKey = Str::slug(strtolower(urlencode($value)));
+        $cacheKey = (new Str)->slug(strtolower(urlencode($value)));
         $this->results = $this->cacheRequest($cacheKey, [$value], "geocode");
 
         return $this;
@@ -158,7 +156,7 @@ public function registerProvidersFromConfig(Collection $providers) : self
 
     public function reverse(float $latitude, float $longitude) : self
     {
-        $cacheKey = Str::slug(strtolower(urlencode("{$latitude}-{$longitude}")));
+        $cacheKey = (new Str)->slug(strtolower(urlencode("{$latitude}-{$longitude}")));
         $this->results = $this->cacheRequest($cacheKey, [$latitude, $longitude], "reverse");
 
         return $this;

tests/config/testConfig.php

@@ -11,7 +11,6 @@
 use Geocoder\Provider\GeoIP2\GeoIP2;
 use Geocoder\Provider\GeoPlugin\GeoPlugin;
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
-use Geocoder\Provider\HostIp\HostIp;
 use GeoIp2\Database\Reader;
 use Http\Client\Curl\Client;