Commit5081daa

committed

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

2 parents2238063 +4aab2bb commit5081daaCopy full SHA for 5081daa

File tree

+14

-13

lines changed

+14

-13

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`
`12`	`12`	`namespaceGeocoder\Laravel\Exceptions;`
`13`	`13`
`14`		`-useGeocoder\Exception\Exception;`
`15`	`14`	`useExceptionasBaseException;`
	`15`	`+useGeocoder\Exception\Exception;`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* Exception to indicate an invalidly specified dumper identifier when calling`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@`
`19`	`19`	`class Geocoderextends Facade`
`20`	`20`	`{`
`21`	`21`	`/**`
`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`	`+*/`
`26`	`26`	`protectedstaticfunctiongetFacadeAccessor()`
`27`	`27`	`{`
`28`	`28`	`return'geocoder';`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,14 @@`
`8`	`8`	`* @license MIT License`
`9`	`9`	`*/`
`10`	`10`
`11`		`-useGeocoder\ProviderAggregator;`
`12`		`-useGeocoder\Geocoder;`
	`11`	`+useGeocoder\Dumper\GeoJson;`
`13`	`12`	`useGeocoder\Dumper\Gpx;`
`14`	`13`	`useGeocoder\Dumper\Kml;`
`15`	`14`	`useGeocoder\Dumper\Wkb;`
`16`	`15`	`useGeocoder\Dumper\Wkt;`
`17`		`-useGeocoder\Dumper\GeoJson;`
	`16`	`+useGeocoder\Geocoder;`
`18`	`17`	`useGeocoder\Laravel\Exceptions\InvalidDumperException;`
	`18`	`+useGeocoder\ProviderAggregator;`
`19`	`19`	`useIlluminate\Support\Collection;`
`20`	`20`
`21`	`21`	`/**`
`@@ -37,8 +37,9 @@ public function all()`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
`40`		`- * @paramstring`
	`40`	`+ * @param$dumper`
`41`	`41`	`* @return Collection`
	`42`	`+ * @throws InvalidDumperException`
`42`	`43`	`*/`
`43`	`44`	`publicfunctiondump($dumper)`
`44`	`45`	`{`
`@@ -50,7 +51,7 @@ public function dump($dumper)`
`50`	`51`	`'wkt' => Wkt::class,`
`51`	`52`	`]);`
`52`	`53`
`53`		`-if (!$dumperClasses->has($dumper)) {`
	`54`	`+if (!$dumperClasses->has($dumper)) {`
`54`	`55`	`$errorMessage =implode('', [`
`55`	`56`	`"The dumper specified ('{$dumper}') is invalid. Valid dumpers",`
`56`	`57`	`"are: geojson, gpx, kml, wkb, wkt.",`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`	`useGeocoder\Laravel\Facades\Geocoder;`
`13`	`13`	`useGeocoder\Laravel\ProviderAndDumperAggregator;`
`14`	`14`	`useGeocoder\Provider\Chain;`
	`15`	`+useIlluminate\Foundation\AliasLoader;`
`15`	`16`	`useIlluminate\Support\Collection;`
`16`	`17`	`useIlluminate\Support\ServiceProvider;`
`17`		`-useIlluminate\Foundation\AliasLoader;`
`18`	`18`	`useReflectionClass;`
`19`	`19`
`20`	`20`	`/**`
`@@ -60,7 +60,7 @@ public function register()`
`60`	`60`	`/**`
`61`	`61`	`* Instantiate the configured Providers, as well as the Chain Provider.`
`62`	`62`	`*`
`63`		`- * @param Collection`
	`63`	`+ * @param Collection $providers`
`64`	`64`	`* @return array`
`65`	`65`	`*/`
`66`	`66`	`privatefunctiongetProviders(Collection$providers)`
`@@ -85,7 +85,7 @@ private function getProviders(Collection $providers)`
`85`	`85`	`*`
`86`	`86`	`* @param array`
`87`	`87`	`* @param string`
`88`		`- * @returnstring`
	`88`	`+ * @returnarray`
`89`	`89`	`*/`
`90`	`90`	`privatefunctiongetArguments(array$arguments,$provider)`
`91`	`91`	`{`

Comments

(0)