Skip to content

Commit de34983

Browse files
authored
Merge pull request #91 from geocoder-php/nyholm-optional
Merging it in, will iron out the wrinkles.
2 parents c404104 + c54398b commit de34983

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

composer.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,25 @@
2323
}
2424
],
2525
"require": {
26-
"geocoder-php/bing-maps-provider": "dev-master@dev",
27-
"geocoder-php/chain-provider": "dev-master@dev",
28-
"geocoder-php/common-http": "dev-master@dev",
29-
"geocoder-php/geo-plugin-provider": "dev-master@dev",
30-
"geocoder-php/google-maps-provider": "dev-master@dev",
31-
"geocoder-php/maxmind-binary-provider": "dev-master@dev",
32-
"guzzlehttp/guzzle": "^6.2",
26+
"php": "^7.0",
3327
"illuminate/cache": "~5.0",
3428
"illuminate/support": "~5.0",
35-
"php": "^7.0",
36-
"php-http/curl-client": "^1.7",
37-
"php-http/guzzle6-adapter": "^1.1",
3829
"php-http/message": "^1.5",
39-
"willdurand/geocoder": "dev-master@dev"
30+
"php-http/curl-client": "^1.7",
31+
"guzzlehttp/psr7": "^1.4",
32+
"geocoder-php/chain-provider": "^4.0",
33+
"geocoder-php/bing-maps-provider": "^4.0",
34+
"geocoder-php/geo-plugin-provider": "^4.0",
35+
"geocoder-php/google-maps-provider": "^4.0",
36+
"geocoder-php/maxmind-binary-provider": "^4.0"
4037
},
4138
"require-dev": {
4239
"doctrine/dbal": "^2.5",
4340
"fzaninotto/faker": "~1.4",
4441
"laravel/laravel": "5.4.*",
4542
"mockery/mockery": "0.9.*",
4643
"phpunit/phpunit": "~5.0",
47-
"satooshi/php-coveralls" : "dev-master@dev"
44+
"satooshi/php-coveralls" : "^1.0"
4845
},
4946
"autoload": {
5047
"psr-4": {
@@ -62,6 +59,8 @@
6259
"dev-master": "2.0.0-dev"
6360
}
6461
},
62+
"minimum-stability": "beta",
63+
"prefer-stable": true,
6564
"config": {
6665
"preferred-install": "dist",
6766
"sort-packages": true

src/Providers/GeocoderService.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
use Geocoder\Laravel\Facades\Geocoder;
1313
use Geocoder\Laravel\ProviderAndDumperAggregator;
14-
use Geocoder\Provider\Chain\Chain;
15-
use Illuminate\Foundation\AliasLoader;
1614
use Illuminate\Support\Collection;
1715
use Illuminate\Support\ServiceProvider;
1816
use ReflectionClass;

0 commit comments

Comments
 (0)