Merge branch 'geocoder-php:master' into master

Chris53897 · web-flow · commit 0b0fd74008cf · 2024-03-04T17:23:49.000+01:00
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "cache/simple-cache-bridge": "^1.0",
         "cache/void-adapter": "^1.0",
         "geocoder-php/provider-integration-tests": "^1.6.3",
-        "geoip2/geoip2": "~2.0",
+        "geoip2/geoip2": "^2.0|^3.0",
         "nyholm/nsa": "^1.1",
         "nyholm/psr7": "^1.0",
         "php-cs-fixer/shim": "^3.22",
diff --git a/src/Common/.github/workflows/component.yml b/src/Common/.github/workflows/component.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Http/.github/workflows/component.yml b/src/Http/.github/workflows/component.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Plugin/.github/workflows/component.yml b/src/Plugin/.github/workflows/component.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/AlgoliaPlaces/.github/workflows/provider.yml b/src/Provider/AlgoliaPlaces/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/ArcGISOnline/.github/workflows/provider.yml b/src/Provider/ArcGISOnline/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/AzureMaps/.github/workflows/provider.yml b/src/Provider/AzureMaps/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/BingMaps/.github/workflows/provider.yml b/src/Provider/BingMaps/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/Cache/.github/workflows/provider.yml b/src/Provider/Cache/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/Chain/.github/workflows/provider.yml b/src/Provider/Chain/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/FreeGeoIp/.github/workflows/provider.yml b/src/Provider/FreeGeoIp/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/GeoIP2/.github/workflows/provider.yml b/src/Provider/GeoIP2/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/GeoIP2/composer.json b/src/Provider/GeoIP2/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "geoip2/geoip2": "~2.0",
+        "geoip2/geoip2": "^2.0|^3.0",
         "willdurand/geocoder": "^4.0"
     },
     "provide": {
@@ -42,4 +42,4 @@
         "test": "vendor/bin/phpunit",
         "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
     }
-}
+}
diff --git a/src/Provider/GeoPlugin/.github/workflows/provider.yml b/src/Provider/GeoPlugin/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/GeocodeEarth/.github/workflows/provider.yml b/src/Provider/GeocodeEarth/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/Geonames/.github/workflows/provider.yml b/src/Provider/Geonames/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/GoogleMaps/.github/workflows/provider.yml b/src/Provider/GoogleMaps/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/GoogleMapsPlaces/.github/workflows/provider.yml b/src/Provider/GoogleMapsPlaces/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/GraphHopper/.github/workflows/provider.yml b/src/Provider/GraphHopper/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/Here/.github/workflows/provider.yml b/src/Provider/Here/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/HostIp/.github/workflows/provider.yml b/src/Provider/HostIp/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/IP2Location/.github/workflows/provider.yml b/src/Provider/IP2Location/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/IP2LocationBinary/.github/workflows/provider.yml b/src/Provider/IP2LocationBinary/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/IpInfo/.github/workflows/provider.yml b/src/Provider/IpInfo/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/IpInfoDb/.github/workflows/provider.yml b/src/Provider/IpInfoDb/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/Ipstack/.github/workflows/provider.yml b/src/Provider/Ipstack/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/LocationIQ/.github/workflows/provider.yml b/src/Provider/LocationIQ/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/MapQuest/.github/workflows/provider.yml b/src/Provider/MapQuest/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/MapTiler/.github/workflows/provider.yml b/src/Provider/MapTiler/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/Mapbox/.github/workflows/provider.yml b/src/Provider/Mapbox/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/MaxMind/.github/workflows/provider.yml b/src/Provider/MaxMind/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/MaxMindBinary/.github/workflows/provider.yml b/src/Provider/MaxMindBinary/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/Nominatim/.github/workflows/provider.yml b/src/Provider/Nominatim/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/OpenCage/.github/workflows/provider.yml b/src/Provider/OpenCage/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/OpenRouteService/.github/workflows/provider.yml b/src/Provider/OpenRouteService/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/Pelias/.github/workflows/provider.yml b/src/Provider/Pelias/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/Photon/.github/workflows/provider.yml b/src/Provider/Photon/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/PickPoint/.github/workflows/provider.yml b/src/Provider/PickPoint/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/TomTom/.github/workflows/provider.yml b/src/Provider/TomTom/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
diff --git a/src/Provider/Yandex/.github/workflows/provider.yml b/src/Provider/Yandex/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
     steps:
     - uses: actions/checkout@v4
     - name: Use PHP ${{ matrix.php-version }}
