feat: 🔧 Allow adapter configuration via config file.

Author: mikebronner

.php-codesniffer/MikeBronner/ruleset.xml

@@ -370,7 +370,7 @@
 	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
         <properties>
             <property name="rootNamespaces" type="array">
-                <element key="app" value="App" />
+                <element key="src" value="Geocoder\Laravel" />
                 <element key="database/factories" value="Database\Factories" />
                 <element key="database/seeders" value="Database\Seeders" />
                 <element key="tests" value="Tests" />

README.md

@@ -190,8 +190,18 @@ return [
     | swap in a different adapter (e.g., `Http\Client\Curl\Client` from
     | `php-http/curl-client`, which you would need to install separately).
     |
+    | To pass constructor arguments (timeouts, proxies, client options, etc.)
+    | use the array form `[Class => [args]]`. Arguments are forwarded to the
+    | adapter's constructor — it's on you to match its signature. Named args
+    | are supported: `[Class => ['timeout' => 10]]`.
+    |
     | Default: LaravelHttpClient::class
     |
+    | Examples:
+    |   'adapter' => LaravelHttpClient::class,
+    |   'adapter' => [LaravelHttpClient::class => ['timeout' => 10, 'retry' => [3, 100]]],
+    |   'adapter' => [Http\Client\Curl\Client::class => [null, null, [CURLOPT_PROXY => '...']]],
+    |
     */
     'adapter'  => LaravelHttpClient::class,
 
@@ -221,14 +231,37 @@ By default we ship `Geocoder\Laravel\Http\LaravelHttpClient`, a thin PSR-18
  client that delegates every request to Laravel's `Http` facade. This means:
 
 - `Http::fake()` and `Http::assertSent()` work in your tests with no extra setup
-- `Http::timeout()`, `Http::retry()`, `Http::withMiddleware()`, and any other
-  Laravel HTTP client configuration applies to geocoder requests
 - One less third-party HTTP client to manage
 
-If you need a different transport, set `'adapter'` in `config/geocoder.php` to
- any class that implements `Psr\Http\Client\ClientInterface`. To go back to the
- previous CURL adapter, install `php-http/curl-client` and set
- `'adapter' => Http\Client\Curl\Client::class`.
+#### Configuring Adapter Options
+You can pass constructor arguments to the adapter via the array form
+ `[Class => [args]]` in `config/geocoder.php`. Arguments are forwarded directly
+ to the adapter's constructor — it's on you to match its signature. Named
+ arguments are supported.
+
+The default `LaravelHttpClient` accepts `timeout`, `connectTimeout`, `retry`,
+ and `options` (Guzzle transport options). These are forwarded to the
+ underlying Laravel `PendingRequest`:
+```php
+'adapter' => [LaravelHttpClient::class => [
+    'timeout' => 10,
+    'connectTimeout' => 3,
+    'retry' => [3, 100],             // [times, sleepMilliseconds]
+    'options' => ['verify' => false], // Guzzle transport options
+]],
+```
+
+#### Using a Different Transport
+Set `'adapter'` to any class that implements `Psr\Http\Client\ClientInterface`.
+ To go back to the previous CURL adapter, install `php-http/curl-client` and
+ pass your CURL options the same way:
+```php
+'adapter' => [Http\Client\Curl\Client::class => [
+    null,
+    null,
+    [CURLOPT_PROXY => env('CURL_PROXY'), CURLOPT_PROXYUSERPWD => env('CURL_PROXYUSERPWD')],
+]],
+```
 
 ### Customization
 If you would like to make changes to the default configuration, publish and

config/geocoder.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Geocoder\Laravel\Http\LaravelHttpClient;
 use Geocoder\Provider\Chain\Chain;
 use Geocoder\Provider\GeoPlugin\GeoPlugin;
@@ -79,8 +81,18 @@
     | swap in a different adapter (e.g., `Http\Client\Curl\Client` from
     | `php-http/curl-client`, which you would need to install separately).
     |
+    | To pass constructor arguments (timeouts, proxies, client options, etc.)
+    | use the array form `[Class => [args]]`. Arguments are forwarded to the
+    | adapter's constructor — it's on you to match its signature. Named args
+    | are supported: `[Class => ['timeout' => 10]]`.
+    |
     | Default: LaravelHttpClient::class
     |
+    | Examples:
+    |   'adapter' => LaravelHttpClient::class,
+    |   'adapter' => [LaravelHttpClient::class => ['timeout' => 10, 'retry' => [3, 100]]],
+    |   'adapter' => [Http\Client\Curl\Client::class => [null, null, [CURLOPT_PROXY => '...']]],
+    |
     */
     'adapter'  => LaravelHttpClient::class,
 

src/Http/LaravelHttpClient.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Geocoder\Laravel\Http;
 
 use Illuminate\Support\Facades\Http;
@@ -9,6 +11,14 @@
 
 class LaravelHttpClient implements ClientInterface
 {
+    public function __construct(
+        public ?int $timeout = null,
+        public ?int $connectTimeout = null,
+        public ?array $retry = null,
+        public array $options = [],
+    ) {}
+
+    // phpcs:ignore SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh,SlevomatCodingStandard.Functions.FunctionLength.FunctionLength
     public function sendRequest(RequestInterface $request): ResponseInterface
     {
         $headers = [];
@@ -20,8 +30,27 @@ public function sendRequest(RequestInterface $request): ResponseInterface
         $body = (string) $request->getBody();
         $pending = Http::withHeaders($headers);
 
+        if ($this->timeout !== null) {
+            $pending = $pending->timeout($this->timeout);
+        }
+
+        if ($this->connectTimeout !== null) {
+            $pending = $pending->connectTimeout($this->connectTimeout);
+        }
+
+        if ($this->retry !== null) {
+            $pending = $pending->retry(...$this->retry);
+        }
+
+        if ($this->options !== []) {
+            $pending = $pending->withOptions($this->options);
+        }
+
         if ($body !== '') {
-            $pending = $pending->withBody($body, $request->getHeaderLine('Content-Type') ?: 'application/octet-stream');
+            $pending = $pending->withBody(
+                $body,
+                $request->getHeaderLine('Content-Type') ?: 'application/octet-stream',
+            );
         }
 
         return $pending

src/ProviderAndDumperAggregator.php

@@ -233,7 +233,26 @@ protected function getAdapterClass(string $provider) : string
             return $specificAdapters->get($provider);
         }
 
-        return config('geocoder.adapter');
+        $adapter = config('geocoder.adapter');
+
+        if (is_array($adapter)) {
+            return array_key_first($adapter);
+        }
+
+        return $adapter;
+    }
+
+    protected function buildAdapter(string $class)
+    {
+        $adapterConfig = config('geocoder.adapter');
+
+        if (is_array($adapterConfig) && isset($adapterConfig[$class])) {
+            $reflection = new ReflectionClass($class);
+
+            return $reflection->newInstanceArgs($adapterConfig[$class]);
+        }
+
+        return app($class);
     }
 
     protected function getReader()
@@ -264,7 +283,7 @@ protected function getArguments(array $arguments, string $provider) : array
             if ($this->requiresReader($provider)) {
                 $adapter = new $adapter($this->getReader());
             } else {
-                $adapter = app($adapter);
+                $adapter = $this->buildAdapter($adapter);
             }
 
             array_unshift($arguments, $adapter);

tests/Feature/Providers/GeocoderServiceTest.php

@@ -194,14 +194,17 @@
 });
 
 it('does not cache empty results', function () {
+    Http::swap(new \Illuminate\Http\Client\Factory());
     Http::fake([
         'nominatim.openstreetmap.org/search*' => Http::response([]),
     ]);
-    $cacheKey = md5(Str::slug(strtolower(urlencode('_'))));
+    $providerName = app('geocoder')->getProvider()->getName();
+    $hashedCacheKey = sha1("{$providerName}-" . Str::slug(strtolower(urlencode('_'))));
 
     Geocoder::geocode('_')->get();
 
-    expect(app('cache')->has("geocoder-{$cacheKey}"))->toBeFalse();
+    $store = app('cache')->store(config('geocoder.cache.store'));
+    expect($store->has($hashedCacheKey))->toBeFalse();
 });
 
 it('can disable caching', function () {
@@ -231,6 +234,44 @@
     expect($provider->getName())->toBe('nominatim');
 });
 
+it('accepts configuration options on the default adapter', function () {
+    $client = new LaravelHttpClient(
+        timeout: 7,
+        connectTimeout: 3,
+        retry: [2, 50],
+        options: ['verify' => false],
+    );
+
+    expect($client->timeout)->toBe(7);
+    expect($client->connectTimeout)->toBe(3);
+    expect($client->retry)->toBe([2, 50]);
+    expect($client->options)->toBe(['verify' => false]);
+});
+
+it('defaults to null adapter options when none are configured', function () {
+    $client = new LaravelHttpClient();
+
+    expect($client->timeout)->toBeNull();
+    expect($client->connectTimeout)->toBeNull();
+    expect($client->retry)->toBeNull();
+    expect($client->options)->toBe([]);
+});
+
+it('resolves array-form adapter config with constructor arguments', function () {
+    config()->set('geocoder.adapter', [
+        LaravelHttpClient::class => ['timeout' => 15, 'retry' => [2, 100]],
+    ]);
+
+    $result = app('geocoder')
+        ->using('nominatim')
+        ->geocode('1600 Pennsylvania Ave NW, Washington, DC 20500, USA')
+        ->get()
+        ->first();
+
+    expect($result)->not->toBeNull();
+    expect($result->getStreetNumber())->toBe('1600');
+});
+
 it('does not collide reverse cache keys across coordinate signs', function () {
     $providerName = app('geocoder')->getProvider()->getName();
     $negativeKey = sha1("{$providerName}-" . strtolower(urlencode('-45.473282--73.834721')));