Merge branch 'refactor' into refactor-moneyphp

This commit is contained in:
Patrick
2022-02-05 18:14:55 +01:00
committed by GitHub
2 changed files with 7 additions and 13 deletions

View File

@@ -11,19 +11,13 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
php-version: ['7.4', '8.0', '8.1'] php-version: ['8.0', '8.1']
laravel-version: ['5.8.*', '^6.0', '^7.0', '^8.0', '^9.0'] laravel-version: ['^6.0', '^7.0', '^8.0', '^9.0']
exclude: exclude:
- laravel-version: '5.8.*'
php-version: '8.0'
- laravel-version: '5.8.*'
php-version: '8.1'
- laravel-version: '^6.0' - laravel-version: '^6.0'
php-version: '8.1' php-version: '8.1'
- laravel-version: '^7.0' - laravel-version: '^7.0'
php-version: '8.1' php-version: '8.1'
- laravel-version: '^9.0'
php-version: '7.4'
name: PHP ${{ matrix.php-version }} - Laravel ${{ matrix.laravel-version }} name: PHP ${{ matrix.php-version }} - Laravel ${{ matrix.laravel-version }}
env: env:
PHP_VERSION: ${{ matrix.php-versions }} PHP_VERSION: ${{ matrix.php-versions }}

View File

@@ -16,17 +16,17 @@
} }
], ],
"require": { "require": {
"php": "^7.4|^8.0", "php": "^8.0",
"illuminate/support": "5.8.*|^6.0|^7.0|^8.0|^9.0", "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
"illuminate/session": "5.8.*|^6.0|^7.0|^8.0|^9.0", "illuminate/session": "^6.0|^7.0|^8.0|^9.0",
"illuminate/events": "5.8.*|^6.0|^7.0|^8.0|^9.0", "illuminate/events": "^6.0|^7.0|^8.0|^9.0",
"nesbot/carbon": "^2.0", "nesbot/carbon": "^2.0",
"moneyphp/money": "^3.3.0|^4.0.0" "moneyphp/money": "^3.3.0|^4.0.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~8.0|~9.0", "phpunit/phpunit": "~8.0|~9.0",
"mockery/mockery": "^1.0", "mockery/mockery": "^1.0",
"orchestra/testbench": "^3.8|^4.0|^5.0|^6.0|^7.0" "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {