Merge pull request #156 from geocoder-php/feature/update-to-laravel-6

Update For Laravel 6

Author: mikebronner

.phpunit.result.cache

@@ -0,0 +1 @@
+C:37:"PHPUnit\Runner\DefaultTestResultCache":2941:{a:2:{s:7:"defects";a:2:{s:94:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItReverseGeocodesCoordinates";i:4;s:77:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testCacheIsUsed";i:4;}s:5:"times";a:26:{s:94:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItReverseGeocodesCoordinates";d:0.296;s:89:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItResolvesAGivenAddress";d:0.222;s:91:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItResolvesAGivenIPAddress";d:0.01;s:100:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItResolvesAGivenAddressWithUmlauts";d:0.216;s:108:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItResolvesAGivenAddressWithUmlautsInRegion";d:0.21;s:91:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItCanUseASpecificProvider";d:0.187;s:83:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItDumpsAndAddress";d:0.214;s:101:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItThrowsAnExceptionForInvalidDumper";d:0.207;s:72:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testConfig";d:0.008;s:81:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testLoadedProviders";d:0.01;s:74:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testGeocoder";d:0.009;s:77:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testCacheIsUsed";d:0.247;s:93:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testGeocodeQueryProvidesResults";d:0.262;s:93:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testReverseQueryProvidesResults";d:0.391;s:87:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testFacadeProvidesResults";d:0.215;s:102:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItCanUseMaxMindBinaryWithoutProvider";d:0.008;s:86:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testGetNameReturnsString";d:0.007;s:83:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testLimitingOfResults";d:0.804;s:84:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testFetchingAllResults";d:0.231;s:78:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testGetProviders";d:0.007;s:77:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testGetProvider";d:0.007;s:92:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testJapaneseCharacterGeocoding";d:0.461;s:81:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItProvidesState";d:0.218;s:86:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItProvidesAdminLevel";d:0.201;s:91:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItHandlesOnlyCityAndState";d:0.788;s:90:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testEmptyResultsAreNotCached";d:0.586;}}}

composer.json

@@ -28,8 +28,8 @@
         "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",
+        "illuminate/cache": "5.0 - 6.0",
+        "illuminate/support": "5.0 - 6.0",
         "php-http/curl-client": "*",
         "php": ">=7.1.3",
         "willdurand/geocoder": "^4.0"
@@ -41,12 +41,11 @@
         "geocoder-php/geoip2-provider": "^4.0",
         "geocoder-php/maxmind-binary-provider": "^4.0",
         "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.*",
+        "orchestra/testbench-browser-kit": "3.9.x-dev@dev",
+        "orchestra/testbench-dusk": "3.9.x-dev@dev",
+        "orchestra/testbench": "3.9.x-dev@dev",
         "php-coveralls/php-coveralls": "*",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "8.*",
         "sebastian/phpcpd": "*"
     },
     "autoload": {
@@ -67,6 +66,7 @@
             ]
         }
     },
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "preferred-install": "dist",

tests/CreatesApplication.php

@@ -1,6 +1,5 @@
 <?php namespace Geocoder\Laravel\Tests;
 
-use Orchestra\Database\ConsoleServiceProvider;
 use Geocoder\Laravel\Providers\GeocoderService;
 
 trait CreatesApplication
@@ -20,7 +19,6 @@ protected function getPackageProviders($app)
     {
         return [
             GeocoderService::class,
-            ConsoleServiceProvider::class,
         ];
     }
 

tests/Feature/Providers/GeocoderServiceTest.php

@@ -16,6 +16,7 @@
 use Geocoder\Query\ReverseQuery;
 use Http\Client\Curl\Client as CurlAdapter;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -30,7 +31,7 @@ public function testItReverseGeocodesCoordinates()
             ->reverse(38.897957, -77.036560)
             ->get()
             ->filter(function (GoogleAddress $address) {
-                return str_contains($address->getStreetName() ?? '', 'Northwest');
+                return Str::contains($address->getStreetName() ?? '', 'Northwest');
             })
             ->first();
 
@@ -159,7 +160,7 @@ public function testGeocoder()
 
     public function testCacheIsUsed()
     {
-        $cacheKey = sha1(str_slug(strtolower(urlencode('1600 Pennsylvania Ave NW, Washington, DC 20500, USA'))));
+        $cacheKey = sha1(Str::slug(strtolower(urlencode('1600 Pennsylvania Ave NW, Washington, DC 20500, USA'))));
 
         $result = app('geocoder')
             ->geocode('1600 Pennsylvania Ave NW, Washington, DC 20500, USA')
@@ -270,7 +271,7 @@ public function testGetProvider()
 
     public function testJapaneseCharacterGeocoding()
     {
-        $cacheKey = sha1(str_slug(strtolower(urlencode('108-0075 東京都港区港南２丁目１６－３'))));
+        $cacheKey = sha1(Str::slug(strtolower(urlencode('108-0075 東京都港区港南２丁目１６－３'))));
 
         app('geocoder')
             ->geocode('108-0075 東京都港区港南２丁目１６－３')
@@ -310,7 +311,7 @@ public function testItHandlesOnlyCityAndState()
 
     public function testEmptyResultsAreNotCached()
     {
-        $cacheKey = md5(str_slug(strtolower(urlencode('_'))));
+        $cacheKey = md5(Str::slug(strtolower(urlencode('_'))));
 
         Geocoder::geocode('_')->get();