From a4d8e3384e115eebe827d55e196d54e66a14b799 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sun, 9 Jul 2017 17:28:23 +0200 Subject: [PATCH 1/3] Do not install optional packages by default --- composer.json | 28 +++++++++++++++------------- src/Providers/GeocoderService.php | 2 -- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index acc6b19..6a59e87 100644 --- a/composer.json +++ b/composer.json @@ -23,20 +23,10 @@ } ], "require": { - "geocoder-php/bing-maps-provider": "dev-master@dev", - "geocoder-php/chain-provider": "dev-master@dev", - "geocoder-php/common-http": "dev-master@dev", - "geocoder-php/geo-plugin-provider": "dev-master@dev", - "geocoder-php/google-maps-provider": "dev-master@dev", - "geocoder-php/maxmind-binary-provider": "dev-master@dev", - "guzzlehttp/guzzle": "^6.2", + "php": "^7.0", "illuminate/cache": "~5.0", "illuminate/support": "~5.0", - "php": "^7.0", - "php-http/curl-client": "^1.7", - "php-http/guzzle6-adapter": "^1.1", - "php-http/message": "^1.5", - "willdurand/geocoder": "dev-master@dev" + "willdurand/geocoder": "^4.0" }, "require-dev": { "doctrine/dbal": "^2.5", @@ -44,7 +34,17 @@ "laravel/laravel": "5.4.*", "mockery/mockery": "0.9.*", "phpunit/phpunit": "~5.0", - "satooshi/php-coveralls" : "dev-master@dev" + "php-http/message": "^1.5", + "php-http/curl-client": "^1.7", + "php-http/discovery": "^1.0", + "guzzlehttp/psr7": "^1.4", + "geocoder-php/bing-maps-provider": "^4.0", + "geocoder-php/chain-provider": "^4.0", + "geocoder-php/common-http": "^4.0", + "geocoder-php/geo-plugin-provider": "^4.0@dev", + "geocoder-php/google-maps-provider": "^4.0", + "geocoder-php/maxmind-binary-provider": "^4.0", + "satooshi/php-coveralls" : "^1.0" }, "autoload": { "psr-4": { @@ -62,6 +62,8 @@ "dev-master": "2.0.0-dev" } }, + "minimum-stability": "beta", + "prefer-stable": true, "config": { "preferred-install": "dist", "sort-packages": true diff --git a/src/Providers/GeocoderService.php b/src/Providers/GeocoderService.php index 5e03fba..36d5e86 100644 --- a/src/Providers/GeocoderService.php +++ b/src/Providers/GeocoderService.php @@ -11,8 +11,6 @@ use Geocoder\Laravel\Facades\Geocoder; use Geocoder\Laravel\ProviderAndDumperAggregator; -use Geocoder\Provider\Chain\Chain; -use Illuminate\Foundation\AliasLoader; use Illuminate\Support\Collection; use Illuminate\Support\ServiceProvider; use ReflectionClass; From cd68186c4836efb713f27e0601b14079b39a04e2 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 13 Jul 2017 09:16:14 +0200 Subject: [PATCH 2/3] Moved back some packages to require-section --- composer.json | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 6a59e87..5b824be 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,14 @@ "php": "^7.0", "illuminate/cache": "~5.0", "illuminate/support": "~5.0", - "willdurand/geocoder": "^4.0" + "php-http/message": "^1.5", + "php-http/curl-client": "^1.7", + "guzzlehttp/psr7": "^1.4", + "geocoder-php/chain-provider": "^4.0", + "geocoder-php/bing-maps-provider": "^4.0", + "geocoder-php/geo-plugin-provider": "^4.0@dev", + "geocoder-php/google-maps-provider": "^4.0", + "geocoder-php/maxmind-binary-provider": "^4.0" }, "require-dev": { "doctrine/dbal": "^2.5", @@ -34,16 +41,6 @@ "laravel/laravel": "5.4.*", "mockery/mockery": "0.9.*", "phpunit/phpunit": "~5.0", - "php-http/message": "^1.5", - "php-http/curl-client": "^1.7", - "php-http/discovery": "^1.0", - "guzzlehttp/psr7": "^1.4", - "geocoder-php/bing-maps-provider": "^4.0", - "geocoder-php/chain-provider": "^4.0", - "geocoder-php/common-http": "^4.0", - "geocoder-php/geo-plugin-provider": "^4.0@dev", - "geocoder-php/google-maps-provider": "^4.0", - "geocoder-php/maxmind-binary-provider": "^4.0", "satooshi/php-coveralls" : "^1.0" }, "autoload": { From c54398bad3cc530559bbf99735731cf4e0ed9b32 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 13 Jul 2017 09:17:41 +0200 Subject: [PATCH 3/3] Use beta version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5b824be..9a65594 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "guzzlehttp/psr7": "^1.4", "geocoder-php/chain-provider": "^4.0", "geocoder-php/bing-maps-provider": "^4.0", - "geocoder-php/geo-plugin-provider": "^4.0@dev", + "geocoder-php/geo-plugin-provider": "^4.0", "geocoder-php/google-maps-provider": "^4.0", "geocoder-php/maxmind-binary-provider": "^4.0" },