Merge branch 'master' of github.com:geocoder-php/GeocoderLaravel into develop

Author: mikebronner

CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.0.21] - 3 Nov 2018
+### Added
+- `->toJson()` method when querying results.
+
+## [4.0.10] - 1 Jul 2018
+### Changed
+- service provider to register singleton and alias in `register()` method.
+
 ## [4.0.9] - 28 May 2018
 ### Added
 - class-name resolution from Service container, allowing for dependency

composer.json

@@ -27,26 +27,26 @@
         "geocoder-php/geo-plugin-provider": "^4.0",
         "geocoder-php/google-maps-provider": "^4.0",
         "guzzlehttp/psr7": "*",
-        "illuminate/cache": "5.0 - 5.6",
-        "illuminate/support": "5.0 - 5.6",
-        "php-http/curl-client": "^1.7",
+        "http-interop/http-factory-guzzle": "^1.0",
+        "illuminate/cache": "5.0 - 5.8",
+        "illuminate/support": "5.0 - 5.8",
+        "php-http/curl-client": "*",
         "php": ">=7.1.3",
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "codedungeon/phpunit-result-printer": "*",
-        "doctrine/dbal": "^2.5",
-        "fzaninotto/faker": "~1.4",
+        "doctrine/dbal": "*",
+        "fzaninotto/faker": "*",
         "geocoder-php/bing-maps-provider": "^4.0",
         "geocoder-php/geoip2-provider": "^4.0",
         "geocoder-php/maxmind-binary-provider": "^4.0",
-        "mockery/mockery": "0.9.*",
-        "orchestra/database": "3.6.*",
-        "orchestra/testbench": "3.6.*",
-        "orchestra/testbench-browser-kit": "3.6.*",
-        "orchestra/testbench-dusk": "3.6.x-dev@dev",
+        "mockery/mockery": "*",
+        "orchestra/testbench-browser-kit": "3.8.*",
+        "orchestra/database": "3.8.x-dev@dev",
+        "orchestra/testbench-dusk": "3.8.x-dev@dev",
+        "orchestra/testbench": "3.8.*",
         "php-coveralls/php-coveralls": "*",
-        "phpunit/phpunit": "^7.0",
+        "phpunit/phpunit": "^7.5",
         "sebastian/phpcpd": "*"
     },
     "autoload": {

phpunit.xml

@@ -7,10 +7,8 @@
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
-    printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer"
     processIsolation="false"
-    stopOnFailure="false"
-    syntaxCheck="false"
+    stopOnFailure="true"
 >
 <testsuites>
     <testsuite name="Browser">

src/ProviderAndDumperAggregator.php

@@ -14,13 +14,12 @@
 use Geocoder\Dumper\Kml;
 use Geocoder\Dumper\Wkb;
 use Geocoder\Dumper\Wkt;
-use Geocoder\Geocoder;
 use Geocoder\Laravel\Exceptions\InvalidDumperException;
 use Geocoder\ProviderAggregator;
 use Geocoder\Query\GeocodeQuery;
-use Geocoder\Query\Query;
 use Geocoder\Query\ReverseQuery;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 use ReflectionClass;
 
 /**
@@ -51,6 +50,13 @@ public function get() : Collection
         return $this->results;
     }
 
+    public function toJson() : string
+    {
+        return $this
+            ->dump("geojson")
+            ->first();
+    }
+
     public function dump(string $dumper) : Collection
     {
         $dumperClasses = collect([
@@ -66,6 +72,7 @@ public function dump(string $dumper) : Collection
                 "The dumper specified ('{$dumper}') is invalid. Valid dumpers ",
                 "are: geojson, gpx, kml, wkb, wkt.",
             ]);
+
             throw new InvalidDumperException($errorMessage);
         }
 
@@ -80,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;
@@ -149,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;
@@ -184,13 +191,15 @@ protected function cacheRequest(string $cacheKey, array $queryElements, string $
                     "value" => collect($this->aggregator->{$queryType}(...$queryElements)),
                 ];
             });
+
         $result = $this->preventCacheKeyHashCollision(
             $result,
             $hashedCacheKey,
             $cacheKey,
             $queryElements,
             $queryType
         );
+
         $this->removeEmptyCacheEntry($result, $hashedCacheKey);
 
         return $result;

tests/CreatesApplication.php

@@ -5,7 +5,7 @@
 
 trait CreatesApplication
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

tests/Feature/Providers/GeocoderServiceTest.php

@@ -81,14 +81,8 @@ public function testItResolvesAGivenAddressWithUmlauts()
 
     public function testItResolvesAGivenAddressWithUmlautsInRegion()
     {
-        config()->set('geocoder.providers.Geocoder\Provider\Chain\Chain.Geocoder\Provider\GoogleMaps\GoogleMaps', [
-            'de-DE',
-            null,
-        ]);
-        app()->register(GeocoderService::class);
-
         $results = app('geocoder')
-            ->geocode('Obere Donaustrasse 22, Wien, Österreich')
+            ->geocode('Obere Donaustraße 22, Wien, Österreich')
             ->get();
 
         $this->assertEquals('22', $results->first()->getStreetNumber());

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;