Merge branch 'master' into feature/add-testruns-for-php83

geocoder-php · Mar 4, 2024 · e1e1664 · e1e1664
2 parents aacd87e + 05ad05d
commit e1e1664
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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/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"
     }
-}
+}