diff --git a/CHANGELOG.md b/CHANGELOG.md index f27957e..d88fd12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to `ipinfolaravel` will be documented in this file. +## v2.5.0 + +- Added support for Laravel 10 with latest IPinfo PHP package. +- No longer supports `PHP < 8` + ## v2.4.0 - Added support for a custom IP selector function. diff --git a/composer.json b/composer.json index d3fe1e7..3689e39 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,8 @@ "homepage": "https://github.com/ipinfo/ipinfolaravel", "keywords": ["Laravel", "ipinfolaravel"], "require": { - "illuminate/support": ">=5, <10", - "ipinfo/ipinfo": "^2.3.1" + "illuminate/support": ">=9", + "ipinfo/ipinfo": ">=2.3.1" }, "require-dev": { "phpunit/phpunit": ">=8 <10", diff --git a/testapp/composer.json b/testapp/composer.json index 02fd0ef..fee23cf 100644 --- a/testapp/composer.json +++ b/testapp/composer.json @@ -2,42 +2,24 @@ "name": "laravel/laravel", "type": "project", "description": "The Laravel Framework.", - "keywords": [ - "framework", - "laravel" - ], + "keywords": ["framework", "laravel"], "license": "MIT", - "repositories": [ - { - "type": "path", - "url": ".." - } - ], "require": { - "php": "^7.3|^8.0", - "fideloper/proxy": "^4.4", - "fruitcake/laravel-cors": "^2.0", - "guzzlehttp/guzzle": "^7.0.1", - "laravel/framework": "^8.12", - "laravel/tinker": "^2.5", - "ipinfo/ipinfolaravel": "*" + "php": "^8.1", + "guzzlehttp/guzzle": "^7.2", + "laravel/framework": "^10.0", + "laravel/sanctum": "^3.2", + "laravel/tinker": "^2.8", + "ipinfo/ipinfolaravel": "^2.5.0" }, "require-dev": { - "facade/ignition": "^2.5", "fakerphp/faker": "^1.9.1", - "mockery/mockery": "^1.4.2", - "nunomaduro/collision": "^5.0", - "phpunit/phpunit": "^9.3.3" - }, - "config": { - "optimize-autoloader": true, - "preferred-install": "dist", - "sort-packages": true - }, - "extra": { - "laravel": { - "dont-discover": [] - } + "laravel/pint": "^1.0", + "laravel/sail": "^1.18", + "mockery/mockery": "^1.4.4", + "nunomaduro/collision": "^7.0", + "phpunit/phpunit": "^10.0", + "spatie/laravel-ignition": "^2.0" }, "autoload": { "psr-4": { @@ -51,18 +33,35 @@ "Tests\\": "tests/" } }, - "minimum-stability": "dev", - "prefer-stable": true, "scripts": { "post-autoload-dump": [ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "@php artisan package:discover --ansi" ], + "post-update-cmd": [ + "@php artisan vendor:publish --tag=laravel-assets --ansi --force" + ], "post-root-package-install": [ "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], "post-create-project-cmd": [ "@php artisan key:generate --ansi" ] - } -} + }, + "extra": { + "laravel": { + "dont-discover": [] + } + }, + "config": { + "optimize-autoloader": true, + "preferred-install": "dist", + "sort-packages": true, + "allow-plugins": { + "pestphp/pest-plugin": true, + "php-http/discovery": true + } + }, + "minimum-stability": "stable", + "prefer-stable": true +}