diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c1dad7e..b97b4413 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ CHANGELOG ========= -3.3.0 (unreleased) +3.3.0 (2025-11-20) ------------------ * A new `anonymizer` property has been added to `GeoIp2\Model\Insights`. diff --git a/README.md b/README.md index 64e5d560..d8535edd 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ You should now have the file `composer.phar` in your project directory. Run in your project root: ```sh -php composer.phar require geoip2/geoip2:^3.2.0 +php composer.phar require geoip2/geoip2:^3.3.0 ``` You should now have the files `composer.json` and `composer.lock` as well as diff --git a/composer.json b/composer.json index c386a04d..1dd316db 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,8 @@ } ], "require": { - "maxmind-db/reader": "^1.12.1", - "maxmind/web-service-common": "~0.10", + "maxmind-db/reader": "^1.13.0", + "maxmind/web-service-common": "~0.11", "php": ">=8.1", "ext-json": "*" }, diff --git a/dev-bin/release.sh b/dev-bin/release.sh index 68012ead..dcedef88 100755 --- a/dev-bin/release.sh +++ b/dev-bin/release.sh @@ -2,6 +2,14 @@ set -eu -o pipefail +# Check that we're not on the main branch +current_branch=$(git branch --show-current) +if [ "$current_branch" = "main" ]; then + echo "Error: Releases should not be done directly on the main branch." + echo "Please create a release branch and run this script from there." + exit 1 +fi + phar='geoip2.phar' changelog=$(cat CHANGELOG.md) @@ -46,10 +54,10 @@ perl -pi -e "s/(?<=const VERSION = ').+?(?=';)/$tag/g" src/WebService/Client.php perl -pi -e "s{(?<=php composer\.phar require geoip2/geoip2:).+}{^$version}g" README.md -box_phar_hash='aa0966319f709e74bf2bf1d58ddb987903ae4f6d0a9d335ec2261813c189f7fc box.phar' +box_phar_hash='f98cf885a7c07c84df66e33888f1d93f063298598e0a5f41ca322aeb9683179b box.phar' if ! echo "$box_phar_hash" | sha256sum -c; then - wget -O box.phar "https://github.com/box-project/box/releases/download/4.6.6/box.phar" + wget -O box.phar "https://github.com/box-project/box/releases/download/4.6.10/box.phar" fi echo "$box_phar_hash" | sha256sum -c @@ -94,10 +102,10 @@ if [ -n "$(git status --porcelain)" ]; then fi # Using Composer is possible, but they don't recommend it. -phpdocumentor_phar_hash='5223cc8455d53c51fcd5a3d4ac7817acdbec3f3e325981688d345f2468097230 phpDocumentor.phar' +phpdocumentor_phar_hash='aa00973d88b278fe59fd8dce826d8d5419df589cb7563ac379856ec305d6b938 phpDocumentor.phar' if ! echo "$phpdocumentor_phar_hash" | sha256sum -c; then - wget -O phpDocumentor.phar https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.7.1/phpDocumentor.phar + wget -O phpDocumentor.phar https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.8.1/phpDocumentor.phar fi echo "$phpdocumentor_phar_hash" | sha256sum -c diff --git a/src/WebService/Client.php b/src/WebService/Client.php index debe8e84..8d5646fd 100644 --- a/src/WebService/Client.php +++ b/src/WebService/Client.php @@ -54,7 +54,7 @@ class Client implements ProviderInterface private readonly WsClient $client; private static string $basePath = '/geoip/v2.1'; - public const VERSION = 'v3.2.0'; + public const VERSION = 'v3.3.0'; /** * Constructor.