From 63ec41bb5b82d97ebf498539c1ab305e5a11eeba Mon Sep 17 00:00:00 2001 From: Khairul Ashraff Date: Tue, 5 Apr 2022 11:07:26 +0800 Subject: [PATCH 1/4] Update to support Laravel 8.0 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 8ffecfe..319a755 100644 --- a/composer.json +++ b/composer.json @@ -20,15 +20,15 @@ } }, "require": { - "php": ">=7.2", - "orchestra/support": "^3.8 || ^4.0 || ^5.0", - "php-http/guzzle6-adapter": "^2.0", + "php": "^7.4 || ^8.0", + "orchestra/support": "^6.0", + "php-http/guzzle7-adapter": "^1.0", "willdurand/geocoder": "^4.2" }, "require-dev": { "geocoder-php/google-maps-provider": "^4.4", "geocoder-php/nominatim-provider": "^5.0", - "orchestra/testbench": "~3.8.5 || ^4.5 || ^5.0" + "orchestra/testbench": "^6.0" }, "suggest": { "geocoder-php/google-maps-provider": "Use google_maps provider for reverse geolocation (^4.4).", From 26d95d0657edae183aae28e74bc64d5f3acb9061 Mon Sep 17 00:00:00 2001 From: Khairul Ashraff Date: Tue, 5 Apr 2022 11:11:20 +0800 Subject: [PATCH 2/4] Remove branch alias. --- composer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/composer.json b/composer.json index 319a755..bf7232f 100644 --- a/composer.json +++ b/composer.json @@ -34,11 +34,6 @@ "geocoder-php/google-maps-provider": "Use google_maps provider for reverse geolocation (^4.4).", "geocoder-php/nominatim-provider": "Use nominatim provider for reverse geolocation (^5.0)." }, - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "config": { "optimize-autoloader": true, "preferred-install": "dist", From 3ed270af81d2e056a72bbf00ba73f5be2ef91dfd Mon Sep 17 00:00:00 2001 From: Khairul Ashraff Date: Tue, 19 Apr 2022 13:17:05 +0800 Subject: [PATCH 3/4] Re-add branch-alias --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index bf7232f..319a755 100644 --- a/composer.json +++ b/composer.json @@ -34,6 +34,11 @@ "geocoder-php/google-maps-provider": "Use google_maps provider for reverse geolocation (^4.4).", "geocoder-php/nominatim-provider": "Use nominatim provider for reverse geolocation (^5.0)." }, + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, "config": { "optimize-autoloader": true, "preferred-install": "dist", From 2a7e8cd04ca03d43a3310564b8b40b6ec914dfe4 Mon Sep 17 00:00:00 2001 From: Khairul Ashraff Date: Tue, 19 Apr 2022 13:25:21 +0800 Subject: [PATCH 4/4] Use guzzle 7 --- src/Manager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Manager.php b/src/Manager.php index 730c1a3..ffee69a 100644 --- a/src/Manager.php +++ b/src/Manager.php @@ -5,7 +5,7 @@ use Geocoder\Provider\GoogleMaps\GoogleMaps; use Geocoder\Provider\Nominatim\Nominatim; use Geocoder\ProviderAggregator; -use Http\Adapter\Guzzle6\Client as Guzzle6HttpAdapter; +use Http\Adapter\Guzzle7\Client as Guzzle7HttpAdapter; class Manager extends \Illuminate\Support\Manager { @@ -47,7 +47,7 @@ protected function createNominatimDriver() */ protected function createHttpClient() { - return new Guzzle6HttpAdapter(); + return new Guzzle7HttpAdapter(); } /**