Merge branch 'master' of github.com:geocoder-php/GeocoderLaravel

mikebronner · mikebronner · commit 5081daaf8642 · 2017-06-17T17:55:01.000-07:00
diff --git a/src/Exceptions/InvalidDumperException.php b/src/Exceptions/InvalidDumperException.php
@@ -11,8 +11,8 @@
 
 namespace Geocoder\Laravel\Exceptions;
 
-use Geocoder\Exception\Exception;
 use Exception as BaseException;
+use Geocoder\Exception\Exception;
 
 /**
  * Exception to indicate an invalidly specified dumper identifier when calling
diff --git a/src/Facades/Geocoder.php b/src/Facades/Geocoder.php
@@ -19,10 +19,10 @@
 class Geocoder extends Facade
 {
     /**
-    * Get the registered name of the component.
-    *
-    * @return string
-    */
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
     protected static function getFacadeAccessor()
     {
         return 'geocoder';
diff --git a/src/ProviderAndDumperAggregator.php b/src/ProviderAndDumperAggregator.php
@@ -8,14 +8,14 @@
  * @license    MIT License
  */
 
-use Geocoder\ProviderAggregator;
-use Geocoder\Geocoder;
+use Geocoder\Dumper\GeoJson;
 use Geocoder\Dumper\Gpx;
 use Geocoder\Dumper\Kml;
 use Geocoder\Dumper\Wkb;
 use Geocoder\Dumper\Wkt;
-use Geocoder\Dumper\GeoJson;
+use Geocoder\Geocoder;
 use Geocoder\Laravel\Exceptions\InvalidDumperException;
+use Geocoder\ProviderAggregator;
 use Illuminate\Support\Collection;
 
 /**
@@ -37,8 +37,9 @@ public function all()
     }
 
     /**
-     * @param string
+     * @param $dumper
      * @return Collection
+     * @throws InvalidDumperException
      */
     public function dump($dumper)
     {
@@ -50,7 +51,7 @@ public function dump($dumper)
             'wkt' => Wkt::class,
         ]);
 
-        if (! $dumperClasses->has($dumper)) {
+        if (!$dumperClasses->has($dumper)) {
             $errorMessage = implode('', [
                 "The dumper specified ('{$dumper}') is invalid. Valid dumpers ",
                 "are: geojson, gpx, kml, wkb, wkt.",
diff --git a/src/Providers/GeocoderService.php b/src/Providers/GeocoderService.php
@@ -12,9 +12,9 @@
 use Geocoder\Laravel\Facades\Geocoder;
 use Geocoder\Laravel\ProviderAndDumperAggregator;
 use Geocoder\Provider\Chain;
+use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Collection;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Foundation\AliasLoader;
 use ReflectionClass;
 
 /**
@@ -60,7 +60,7 @@ public function register()
     /**
      * Instantiate the configured Providers, as well as the Chain Provider.
      *
-     * @param Collection
+     * @param Collection $providers
      * @return array
      */
     private function getProviders(Collection $providers)
@@ -85,7 +85,7 @@ private function getProviders(Collection $providers)
      *
      * @param array
      * @param string
-     * @return string
+     * @return array
      */
     private function getArguments(array $arguments, $provider)
     {
