Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 12.x Compatibility #43

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
name: run-tests

on: [ push, pull_request ]
on:
- push
- pull_request

jobs:
test:
runs-on: ubuntu-latest

strategy:
fail-fast: true
matrix:
php: [8.3, 8.2, 8.1]
laravel: [^10.0]
laravel: ['12.0', ^10.0]
dependencies: [lowest, highest]
exclude:
- laravel: '12.0'
php: 8.1

name: P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }}

Expand Down
134 changes: 67 additions & 67 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
{
"name": "interaction-design-foundation/laravel-geoip",
"description": "Support for multiple Geographical Location services.",
"license": "BSD-2-Clause",
"keywords": [
"laravel",
"geoip",
"geographical",
"location",
"geolocation",
"IP API",
"infoDB"
],
"require": {
"php": "^8.1",
"illuminate/cache": "^10.0 || ^11.0",
"illuminate/console": "^10.0 || ^11.0",
"illuminate/support": "^10.0 || ^11.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.50",
"geoip2/geoip2": "^3.0",
"orchestra/testbench": "^8.8 || ^9.0",
"phpstan/phpstan": "^2.1",
"phpunit/phpunit": "^10.5 || ^11.0",
"rector/rector": "^2.0",
"squizlabs/php_codesniffer": "^3.9",
"vimeo/psalm": "^5.25"
},
"suggest": {
"geoip2/geoip2": "Required to use the MaxMind database or web service with GeoIP (~2.1).",
"monolog/monolog": "Allows for storing location not found errors to the log"
},
"autoload": {
"psr-4": {
"InteractionDesignFoundation\\GeoIP\\": "src/"
"name": "interaction-design-foundation/laravel-geoip",
"description": "Support for multiple Geographical Location services.",
"license": "BSD-2-Clause",
"keywords": [
"laravel",
"geoip",
"geographical",
"location",
"geolocation",
"IP API",
"infoDB"
],
"require": {
"php": "^8.1",
"illuminate/cache": "^10.0 || ^11.0 || ^12.0",
"illuminate/console": "^10.0 || ^11.0 || ^12.0",
"illuminate/support": "^10.0 || ^11.0 || ^12.0"
},
"files": [
"src/helpers.php"
]
},
"autoload-dev": {
"psr-4": {
"InteractionDesignFoundation\\GeoIP\\Tests\\": "tests/"
}
},
"config": {
"sort-packages": true
},
"extra": {
"laravel": {
"aliases": {
"GeoIP": "InteractionDesignFoundation\\GeoIP\\Facades\\GeoIP"
},
"providers": [
"InteractionDesignFoundation\\GeoIP\\GeoIPServiceProvider"
]
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.50",
"geoip2/geoip2": "^3.0",
"orchestra/testbench": "^8.8 || ^9.0 || ^10.0",
"phpstan/phpstan": "^2.1",
"phpunit/phpunit": "^10.5 || ^11.0",
"rector/rector": "^2.0",
"squizlabs/php_codesniffer": "^3.9",
"vimeo/psalm": "^5.25 || ^6.7"
},
"suggest": {
"geoip2/geoip2": "Required to use the MaxMind database or web service with GeoIP (~2.1).",
"monolog/monolog": "Allows for storing location not found errors to the log"
},
"autoload": {
"psr-4": {
"InteractionDesignFoundation\\GeoIP\\": "src/"
},
"files": [
"src/helpers.php"
]
},
"autoload-dev": {
"psr-4": {
"InteractionDesignFoundation\\GeoIP\\Tests\\": "tests/"
}
},
"config": {
"sort-packages": true
},
"extra": {
"laravel": {
"aliases": {
"GeoIP": "InteractionDesignFoundation\\GeoIP\\Facades\\GeoIP"
},
"providers": [
"InteractionDesignFoundation\\GeoIP\\GeoIPServiceProvider"
]
}
},
"scripts": {
"cs": "@php-cs-fixer",
"php-cs-fixer": "@php -d memory_limit=-1 vendor/bin/php-cs-fixer fix --no-interaction --ansi --verbose",
"phpcs": "vendor/bin/phpcs --standard=phpcs.xml src",
"phpstan": "vendor/bin/phpstan --level=0 --no-progress analyse --configuration phpstan.neon --memory-limit 2G",
"psalm": "vendor/bin/psalm",
"rector": "vendor/bin/rector process --config rector.php ",
"sa": "@psalm",
"sa:bl": "@psalm --set-baseline=psalm-baseline.xml",
"test": "vendor/bin/phpunit"
}
},
"scripts": {
"cs": "@php-cs-fixer",
"php-cs-fixer": "@php -d memory_limit=-1 vendor/bin/php-cs-fixer fix --no-interaction --ansi --verbose",
"phpcs": "vendor/bin/phpcs --standard=phpcs.xml src",
"phpstan": "vendor/bin/phpstan --level=0 --no-progress analyse --configuration phpstan.neon --memory-limit 2G",
"psalm": "vendor/bin/psalm",
"rector": "vendor/bin/rector process --config rector.php ",
"sa": "@psalm",
"sa:bl": "@psalm --set-baseline=psalm-baseline.xml",
"test": "vendor/bin/phpunit"
}
}