From 81154ba8edb446534d3ae49a9790551ae03c3384 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 12 May 2017 22:03:48 +0200 Subject: [PATCH] Fixed PHPDocs. Rearranged imports alphabetically. --- src/Exceptions/InvalidDumperException.php | 2 +- src/Facades/Geocoder.php | 8 ++++---- src/ProviderAndDumperAggregator.php | 11 ++++++----- src/Providers/GeocoderService.php | 6 +++--- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/Exceptions/InvalidDumperException.php b/src/Exceptions/InvalidDumperException.php index d3b58a3..e5a1a13 100644 --- 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 index 749e852..04d576a 100644 --- 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 index 0d3b78b..1a21fc0 100644 --- 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 index 8d5b775..0e81934 100644 --- 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) {