Commitf1509e0

committed

Fix loading of GeoIP2 provider within Chain provider

1 parent6934692 commitf1509e0Copy full SHA for f1509e0

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 17 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -226,19 +226,33 @@ protected function getArguments(array $arguments, string $provider) : array`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`$adapter =$this->getAdapterClass($provider);`
	`229`	`+$reader =null;`
`229`	`230`
`230`	`231`	`if ($adapter) {`
`231`		`-array_unshift($arguments, (new$adapter));`
	`232`	`+if ($this->requiresReader($provider)) {`
	`233`	`+$reader =config('geocoder.reader');`
	`234`	`+ }`
	`235`	`+`
	`236`	`+array_unshift($arguments,new$adapter($reader));`
`232`	`237`	`}`
`233`	`238`
`234`	`239`	`return$arguments;`
`235`	`240`	`}`
`236`	`241`
	`242`	`+protectedfunctionrequiresReader(string$class) :bool`
	`243`	`+ {`
	`244`	`+$specificAdapters =collect([`
	`245`	`+'Geocoder\Provider\GeoIP2\GeoIP2',`
	`246`	`+ ]);`
	`247`	`+`
	`248`	`+return$specificAdapters->contains($class);`
	`249`	`+ }`
	`250`	`+`
`237`	`251`	`protectedfunctiongetAdapterClass(string$provider) :string`
`238`	`252`	`{`
`239`	`253`	`$specificAdapters =collect([`
`240`		`-'Geocoder\Provider\GeoIP2' =>'Geocoder\Adapter\GeoIP2Adapter',`
`241`		`-'Geocoder\Provider\MaxMindBinary' =>null,`
	`254`	`+'Geocoder\Provider\GeoIP2\GeoIP2' =>'Geocoder\Provider\GeoIP2\GeoIP2Adapter',`
	`255`	`+'Geocoder\Provider\MaxMindBinary\MaxMindBinary' =>'',`
`242`	`256`	`]);`
`243`	`257`
`244`	`258`	`if ($specificAdapters->has($provider)) {`

Comments

(0)