tests: ✅ Switch to Pest for testing, replace PHPUnit with Pest, update test dependencies, add

LaravelHttpClient, and refactor tests to use Pest syntax and HTTP fakes.

Author: mikebronner

.github/workflows/laravel.yml

@@ -57,8 +57,8 @@ jobs:
     - name: Install Dependencies
       run: composer update --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
-    - name: Execute tests via PHPUnit
-      run: vendor/bin/phpunit --configuration phpunit.xml ${{ matrix.php == '8.5' && matrix.laravel == '13.*' && '--coverage-clover coverage.xml' || '' }}
+    - name: Execute tests via Pest
+      run: vendor/bin/pest --configuration phpunit.xml ${{ matrix.php == '8.5' && matrix.laravel == '13.*' && '--coverage-clover coverage.xml' || '' }}
 
     - name: Upload coverage to Codecov
       if: matrix.php == '8.5' && matrix.laravel == '13.*'

.gitignore

@@ -3,3 +3,4 @@ composer.phar
 composer.lock
 .DS_Store
 .phpunit.result.cache
+.phpunit.cache

README.md

@@ -10,15 +10,16 @@
 > If you still use **Laravel 4**, please check out the `0.4.x` branch
  [here](https://github.com/geocoder-php/GeocoderLaravel/tree/0.4.x).
 
-**Version 4.0.0 is a backwards-compatibility-breaking update. Please review
- this documentation, especially the _Usage_ section before installing.**
+**Version 5.0.0 is a backwards-compatibility-breaking update. Please review
+ the _Upgrading_ section, especially the new default HTTP adapter, before
+ installing.**
 
 This package allows you to use [**Geocoder**](http://geocoder-php.org/Geocoder/)
- in [**Laravel 5**](http://laravel.com/).
+ in [**Laravel**](http://laravel.com/).
 
 ## Requirements
-- PHP >= 7.1.3
-- Laravel >= 5.0
+- PHP >= 8.2
+- Laravel >= 11.0
 
 ## Installation
 1. Install the package via composer:
@@ -120,10 +121,10 @@ However, you are free to add or remove providers as needed, both inside the
  Chain provider, as well as along-side it. The following is the default
  configuration provided by the package:
 ```php
+use Geocoder\Laravel\Http\LaravelHttpClient;
 use Geocoder\Provider\Chain\Chain;
 use Geocoder\Provider\GeoPlugin\GeoPlugin;
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
-use Http\Client\Curl\Client;
 
 return [
 
@@ -173,16 +174,19 @@ return [
     | Adapter
     |--------------------------------------------------------------------------
     |
-    | You can specify which PSR-7-compliant HTTP adapter you would like to use.
-    | There are multiple options at your disposal: CURL, Guzzle, and others.
+    | The HTTP adapter to use when communicating with geocoding services. By
+    | default this package ships a PSR-18 client that delegates to Laravel's
+    | `Http` facade — this gives you `Http::fake()` in tests, native retry
+    | and timeout configuration, and any HTTP middleware you've registered.
     |
-    | Please consult the official Geocoder documentation for more info.
-    | https://github.com/geocoder-php/Geocoder#usage
+    | Provide any class that implements `Psr\Http\Client\ClientInterface` to
+    | swap in a different adapter (e.g., `Http\Client\Curl\Client` from
+    | `php-http/curl-client`, which you would need to install separately).
     |
-    | Default: Client::class (FQCN for CURL adapter)
+    | Default: LaravelHttpClient::class
     |
     */
-    'adapter'  => Client::class,
+    'adapter'  => LaravelHttpClient::class,
 
     /*
     |--------------------------------------------------------------------------
@@ -206,11 +210,18 @@ return [
 ```
 
 ### Adapters
-By default we provide a CURL adapter to get you running out of the box.
- However, if you have already installed Guzzle or any other PSR-7-compatible
- HTTP adapter, you are encouraged to replace the CURL adapter with it. Please
- see the [Geocoder Documentation](https://github.com/geocoder-php/Geocoder) for
- specific implementation details.
+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`.
 
 ### Customization
 If you would like to make changes to the default configuration, publish and
@@ -263,6 +274,38 @@ Anytime you upgrade this package, please remember to clear your cache, to preven
 php artisan cache:clear
 ```
 
+### 4.x to 5.x
+Update your `composer.json`:
+```json
+    "toin0u/geocoder-laravel": "^5.0",
+```
+
+**Breaking: default HTTP adapter changed.** The default `'adapter'` in
+ `config/geocoder.php` is now `Geocoder\Laravel\Http\LaravelHttpClient`
+ instead of `Http\Client\Curl\Client`. The new adapter is a PSR-18 client
+ that delegates to Laravel's `Http` facade, so `Http::fake()`, retries,
+ timeouts, and middleware all work transparently.
+
+If you have **published the geocoder config previously**, your config file
+ still pins the old curl adapter and will fail at runtime once
+ `php-http/curl-client` is no longer installed. Pick one:
+
+- **Recommended:** delete (or rename) your published `config/geocoder.php`
+  and re-publish it, then re-apply your customizations.
+- Or edit the existing file: change `use Http\Client\Curl\Client;` to
+  `use Geocoder\Laravel\Http\LaravelHttpClient;` and change
+  `'adapter' => Client::class` to `'adapter' => LaravelHttpClient::class`.
+- Or, if you want to keep the curl adapter, install it explicitly:
+  `composer require php-http/curl-client`. The published config keeps working
+  unchanged.
+
+**Other notable changes in 5.x:**
+- Minimum PHP raised to 8.2; minimum Laravel raised to 11.x.
+- `php-http/curl-client` removed from required dependencies (install it
+  yourself if you still need it).
+- `MaxMindBinary` provider support removed (the underlying PHP package was
+  abandoned). Use `geocoder-php/geoip2-provider` for MaxMind data instead.
+
 ### 1.x to 4.x
 Update your composer.json file:
 ```json

composer.json

@@ -30,20 +30,18 @@
         "guzzlehttp/psr7": "*",
         "http-interop/http-factory-guzzle": "^1.0",
         "illuminate/cache": "^11.0|^12.0|^13.0",
+        "illuminate/http": "^11.0|^12.0|^13.0",
         "illuminate/support": "^11.0|^12.0|^13.0",
-        "php-http/curl-client": "*",
         "willdurand/geocoder": "^4.0|^5.0"
     },
     "require-dev": {
-        "doctrine/dbal": "*",
+        "geocoder-php/nominatim-provider": "^5.0",
         "geocoder-php/bing-maps-provider": "^4.0",
         "geocoder-php/geoip2-provider": "^4.0",
         "geocoder-php/maxmind-binary-provider": "^4.0",
         "orchestra/testbench": "^9.0|^10.0|^11.0",
-        "orchestra/testbench-browser-kit": "^9.0|^10.0|^11.0",
-        "orchestra/testbench-dusk": "^9.0|^10.0|^11.0",
-        "php-coveralls/php-coveralls": "*",
-        "phpunit/phpunit": "^10.5|^11.5.3|^12.5.12"
+        "pestphp/pest": "^3.0|^4.0",
+        "pestphp/pest-plugin-laravel": "^3.0|^4.0"
     },
     "autoload": {
         "psr-4": {
@@ -52,7 +50,6 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\": "vendor/laravel/laravel/app/",
             "Geocoder\\Laravel\\Tests\\": "tests/"
         }
     },
@@ -69,7 +66,8 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "allow-plugins": {
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "pestphp/pest-plugin": true
         }
     }
 }

config/geocoder.php

@@ -1,9 +1,9 @@
 <?php
 
+use Geocoder\Laravel\Http\LaravelHttpClient;
 use Geocoder\Provider\Chain\Chain;
 use Geocoder\Provider\GeoPlugin\GeoPlugin;
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
-use Http\Client\Curl\Client;
 
 return [
     'cache' => [
@@ -70,16 +70,19 @@
     | Adapter
     |---------------------------------------------------------------------------
     |
-    | You can specify which PSR-7-compliant HTTP adapter you would like to use.
-    | There are multiple options at your disposal: CURL, Guzzle, and others.
+    | The HTTP adapter to use when communicating with geocoding services. By
+    | default this package ships a PSR-18 client that delegates to Laravel's
+    | `Http` facade — this gives you `Http::fake()` in tests, native retry
+    | and timeout configuration, and any HTTP middleware you've registered.
     |
-    | Please consult the official Geocoder documentation for more info.
-    | https://github.com/geocoder-php/Geocoder#usage
+    | Provide any class that implements `Psr\Http\Client\ClientInterface` to
+    | swap in a different adapter (e.g., `Http\Client\Curl\Client` from
+    | `php-http/curl-client`, which you would need to install separately).
     |
-    | Default: Client::class (FQCN for CURL adapter)
+    | Default: LaravelHttpClient::class
     |
     */
-    'adapter'  => Client::class,
+    'adapter'  => LaravelHttpClient::class,
 
     /*
     |---------------------------------------------------------------------------

phpunit.xml

@@ -26,6 +26,7 @@
     <env name="CACHE_DRIVER" value="array"/>
     <env name="SESSION_DRIVER" value="array"/>
     <env name="QUEUE_DRIVER" value="sync"/>
-    <env name="DB_CONNECTION" value="testing"/>
+    <env name="DB_CONNECTION" value="sqlite"/>
+    <env name="DB_DATABASE" value=":memory:"/>
   </php>
 </phpunit>

src/Http/LaravelHttpClient.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Geocoder\Laravel\Http;
+
+use Illuminate\Support\Facades\Http;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+class LaravelHttpClient implements ClientInterface
+{
+    public function sendRequest(RequestInterface $request): ResponseInterface
+    {
+        $headers = [];
+
+        foreach ($request->getHeaders() as $name => $values) {
+            $headers[$name] = implode(', ', $values);
+        }
+
+        $body = (string) $request->getBody();
+        $pending = Http::withHeaders($headers);
+
+        if ($body !== '') {
+            $pending = $pending->withBody($body, $request->getHeaderLine('Content-Type') ?: 'application/octet-stream');
+        }
+
+        return $pending
+            ->send($request->getMethod(), (string) $request->getUri())
+            ->toPsrResponse();
+    }
+}

src/ProviderAndDumperAggregator.php

@@ -227,7 +227,6 @@ protected function getAdapterClass(string $provider) : string
     {
         $specificAdapters = collect([
             'Geocoder\Provider\GeoIP2\GeoIP2' => 'Geocoder\Provider\GeoIP2\GeoIP2Adapter',
-            'Geocoder\Provider\MaxMindBinary\MaxMindBinary' => '',
         ]);
 
         if ($specificAdapters->has($provider)) {

tests/CreatesApplication.php

@@ -4,14 +4,6 @@
 
 trait CreatesApplication
 {
-    public function setUp() : void
-    {
-        parent::setUp();
-
-        $this->withFactories(__DIR__ . '/database/factories');
-        $this->loadMigrationsFrom(__DIR__ . '/database/migrations');
-    }
-
     /**
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -26,19 +18,10 @@ protected function getEnvironmentSetUp($app)
     {
         $config = require(__DIR__ . '/config/testConfig.php');
         $app['config']->set('geocoder', $config);
-        $app['config']->set('database.redis.default', [
-            'host' => env('REDIS_HOST', '192.168.10.10'),
-        ]);
-        $app['config']->set('database.redis.geocode-cache', [
-            'host' => env('REDIS_HOST', '192.168.10.10'),
-            'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', 6379),
-            'database' => 1,
-        ]);
         $app['config']->set('cache.stores.geocode', [
-            'driver' => 'redis',
-            'connection' => 'geocode-cache',
+            'driver' => 'array',
+            'serialize' => false,
         ]);
-        $app['config']->set('geocoder.store', 'geocode');
+        $app['config']->set('geocoder.cache.store', 'geocode');
     }
 }