Skip to content

Commit 4aab2bb

Browse files
authored
Merge pull request #79 from Alexgmin/master
Thanks for the help on cleaning things up! :)
2 parents 33e2254 + 81154ba commit 4aab2bb

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

src/Exceptions/InvalidDumperException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Geocoder\Laravel\Exceptions;
1313

14-
use Geocoder\Exception\Exception;
1514
use Exception as BaseException;
15+
use Geocoder\Exception\Exception;
1616

1717
/**
1818
* Exception to indicate an invalidly specified dumper identifier when calling

src/Facades/Geocoder.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
class Geocoder extends Facade
2020
{
2121
/**
22-
* Get the registered name of the component.
23-
*
24-
* @return string
25-
*/
22+
* Get the registered name of the component.
23+
*
24+
* @return string
25+
*/
2626
protected static function getFacadeAccessor()
2727
{
2828
return 'geocoder';

src/ProviderAndDumperAggregator.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
* @license MIT License
99
*/
1010

11-
use Geocoder\ProviderAggregator;
12-
use Geocoder\Geocoder;
11+
use Geocoder\Dumper\GeoJson;
1312
use Geocoder\Dumper\Gpx;
1413
use Geocoder\Dumper\Kml;
1514
use Geocoder\Dumper\Wkb;
1615
use Geocoder\Dumper\Wkt;
17-
use Geocoder\Dumper\GeoJson;
16+
use Geocoder\Geocoder;
1817
use Geocoder\Laravel\Exceptions\InvalidDumperException;
18+
use Geocoder\ProviderAggregator;
1919
use Illuminate\Support\Collection;
2020

2121
/**
@@ -37,8 +37,9 @@ public function all()
3737
}
3838

3939
/**
40-
* @param string
40+
* @param $dumper
4141
* @return Collection
42+
* @throws InvalidDumperException
4243
*/
4344
public function dump($dumper)
4445
{
@@ -50,7 +51,7 @@ public function dump($dumper)
5051
'wkt' => Wkt::class,
5152
]);
5253

53-
if (! $dumperClasses->has($dumper)) {
54+
if (!$dumperClasses->has($dumper)) {
5455
$errorMessage = implode('', [
5556
"The dumper specified ('{$dumper}') is invalid. Valid dumpers ",
5657
"are: geojson, gpx, kml, wkb, wkt.",

src/Providers/GeocoderService.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
use Geocoder\Laravel\Facades\Geocoder;
1313
use Geocoder\Laravel\ProviderAndDumperAggregator;
1414
use Geocoder\Provider\Chain;
15+
use Illuminate\Foundation\AliasLoader;
1516
use Illuminate\Support\Collection;
1617
use Illuminate\Support\ServiceProvider;
17-
use Illuminate\Foundation\AliasLoader;
1818
use ReflectionClass;
1919

2020
/**
@@ -60,7 +60,7 @@ public function register()
6060
/**
6161
* Instantiate the configured Providers, as well as the Chain Provider.
6262
*
63-
* @param Collection
63+
* @param Collection $providers
6464
* @return array
6565
*/
6666
private function getProviders(Collection $providers)
@@ -85,7 +85,7 @@ private function getProviders(Collection $providers)
8585
*
8686
* @param array
8787
* @param string
88-
* @return string
88+
* @return array
8989
*/
9090
private function getArguments(array $arguments, $provider)
9191
{

0 commit comments

Comments
 (0)