Merge pull request geocoder-php#164 from tooblue/patch-1

mikebronner · web-flow · commit f57688557255 · 2019-10-16T17:35:43.000-07:00
Allow passing reader class and arguments as array
diff --git a/README.md b/README.md
@@ -182,7 +182,8 @@ return [
     |
     | You can specify a reader for specific providers, like GeoIp2, which
     | connect to a local file-database. The reader should be set to an
-    | instance of the required reader class.
+    | instance of the required reader class or an array containing the reader
+    | class and arguments.
     |
     | Please consult the official Geocoder documentation for more info.
     | https://github.com/geocoder-php/geoip2-provider
diff --git a/config/geocoder.php b/config/geocoder.php
@@ -88,7 +88,8 @@
     |
     | You can specify a reader for specific providers, like GeoIp2, which
     | connect to a local file-database. The reader should be set to an
-    | instance of the required reader class.
+    | instance of the required reader class or an array containing the reader
+    | class and arguments.
     |
     | Please consult the official Geocoder documentation for more info.
     | https://github.com/geocoder-php/geoip2-provider
diff --git a/src/ProviderAndDumperAggregator.php b/src/ProviderAndDumperAggregator.php
@@ -221,6 +221,18 @@ protected function getAdapterClass(string $provider) : string
         return config('geocoder.adapter');
     }
 
+    protected function getReader()
+    {
+        if (is_array(config('geocoder.reader'))) {
+            $reflection = new ReflectionClass(config('geocoder.reader.class'));
+            $reader = $reflection->newInstanceArgs(config('geocoder.reader.arguments'));
+        } else {
+            $reader = config('geocoder.reader');
+        }
+
+        return $reader;
+    }
+
     protected function getArguments(array $arguments, string $provider) : array
     {
         if ($provider === 'Geocoder\Provider\Chain\Chain') {
@@ -232,9 +244,11 @@ protected function getArguments(array $arguments, string $provider) : array
         $adapter = $this->getAdapterClass($provider);
 
         if ($adapter) {
-            $adapter = $this->requiresReader($provider)
-                ? new $adapter(config('geocoder.reader'))
-                : new $adapter;
+            if ($this->requiresReader($provider)) {
+                $adapter = new $adapter($this->getReader());
+            } else {
+                $adapter = new $adapter;
+            }
 
             array_unshift($arguments, $adapter);
         }

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,8 @@ return [`
`182`	`182`	`\|`
`183`	`183`	`\| You can specify a reader for specific providers, like GeoIp2, which`
`184`	`184`	`\| connect to a local file-database. The reader should be set to an`
`185`		`- \| instance of the required reader class.`
	`185`	`+ \| instance of the required reader class or an array containing the reader`
	`186`	`+ \| class and arguments.`
`186`	`187`	`\|`
`187`	`188`	`\| Please consult the official Geocoder documentation for more info.`
`188`	`189`	`\| https://github.com/geocoder-php/geoip2-provider`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@`
`88`	`88`	`\|`
`89`	`89`	`\| You can specify a reader for specific providers, like GeoIp2, which`
`90`	`90`	`\| connect to a local file-database. The reader should be set to an`
`91`		`- \| instance of the required reader class.`
	`91`	`+ \| instance of the required reader class or an array containing the reader`
	`92`	`+ \| class and arguments.`
`92`	`93`	`\|`
`93`	`94`	`\| Please consult the official Geocoder documentation for more info.`
`94`	`95`	`\| https://github.com/geocoder-php/geoip2-provider`