Update for 4.0 release, bring tests to green

Author: mikebronner

composer.json

@@ -23,22 +23,19 @@
         }
     ],
     "require": {
+        "geocoder-php/chain-provider": "^4.0",
+        "geocoder-php/geo-plugin-provider": "^4.0",
+        "geocoder-php/google-maps-provider": "^4.0",
         "illuminate/cache": "5.*",
         "illuminate/support": "5.*",
         "php": "^7.0",
-        "php-http/message": "^1.5",
-        "php-http/curl-client": "^1.7",
-        "guzzlehttp/psr7": "^1.4",
-        "geocoder-php/chain-provider": "dev-master@dev",
-        "geocoder-php/bing-maps-provider": "dev-master@dev",
-        "geocoder-php/geo-plugin-provider": "dev-master@dev",
-        "geocoder-php/google-maps-provider": "dev-master@dev",
-        "willdurand/geocoder": "dev-master as 4.0.0-beta2"
+        "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
         "doctrine/dbal": "^2.5",
         "fzaninotto/faker": "~1.4",
-        "geocoder-php/maxmind-binary-provider": "dev-master@dev",
+        "geocoder-php/bing-maps-provider": "^4.0",
+        "geocoder-php/maxmind-binary-provider": "^4.0",
         "laravel/laravel": "5.4.*",
         "mockery/mockery": "0.9.*",
         "phpunit/phpunit": "~5.0",
@@ -56,8 +53,10 @@
         }
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "2.0.0-dev"
+        "laravel": {
+            "providers": [
+                "Geocoder\\Laravel\\Providers\\GeocoderService"
+            ]
         }
     },
     "minimum-stability": "dev",

config/geocoder.php

@@ -22,14 +22,6 @@
             ],
             GeoPlugin::class  => [],
         ],
-        BingMaps::class => [
-            'en-US',
-            env('BING_MAPS_API_KEY'),
-        ],
-        GoogleMaps::class => [
-            'us',
-            env('GOOGLE_MAPS_API_KEY'),
-        ],
     ],
     'adapter'  => Client::class,
 ];

tests/Laravel5_3/Providers/GeocoderServiceTest.php

@@ -67,12 +67,12 @@ public function testItResolvesAGivenIPAddress()
 
         // Act
         $results = app('geocoder')
-            ->geocode('72.229.28.185')
+            ->geocode('8.8.8.8')
             ->get();
 
         // Assert
-        $this->assertEquals('US', $results->first()->getCountry()->getCode());
         $this->assertTrue($results->isNotEmpty());
+        $this->assertEquals('US', $results->first()->getCountry()->getCode());
     }
 
     public function testItResolvesAGivenAddressWithUmlauts()

tests/Laravel5_3/TestCase.php

@@ -19,6 +19,9 @@ public function createApplication()
     {
         $app = require __DIR__ . '/../../vendor/laravel/laravel/bootstrap/app.php';
         $app->make(Kernel::class)->bootstrap();
+        config([
+            'geocoder' => include(__DIR__ . '/../assets/testConfig.php'),
+        ]);
 
         return $app;
     }

tests/assets/testConfig.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of the GeocoderLaravel library.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Http\Client\Curl\Client;
+use Geocoder\Provider\BingMaps\BingMaps;
+use Geocoder\Provider\Chain\Chain;
+use Geocoder\Provider\GeoPlugin\GeoPlugin;
+use Geocoder\Provider\GoogleMaps\GoogleMaps;
+
+return [
+    'cache-duraction' => 999999999,
+    'providers' => [
+        Chain::class => [
+            GoogleMaps::class => [
+                'en-US',
+                env('GOOGLE_MAPS_API_KEY'),
+            ],
+            GeoPlugin::class  => [],
+        ],
+        BingMaps::class => [
+            'en-US',
+            env('BING_MAPS_API_KEY'),
+        ],
+        GoogleMaps::class => [
+            'us',
+            env('GOOGLE_MAPS_API_KEY'),
+        ],
+    ],
+    'adapter'  => Client::class,
+];