Merge branch 'refactor' into refactor-moneyphp

This commit is contained in:
Patrick
2022-02-02 18:00:25 +01:00
committed by GitHub
3 changed files with 9 additions and 7 deletions

View File

@@ -12,7 +12,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
php-version: ['7.4', '8.0', '8.1'] php-version: ['7.4', '8.0', '8.1']
laravel-version: ['5.8.*', '^6.0', '^7.0', '^8.0'] laravel-version: ['5.8.*', '^6.0', '^7.0', '^8.0', '^9.0']
exclude: exclude:
- laravel-version: '5.8.*' - laravel-version: '5.8.*'
php-version: '8.0' php-version: '8.0'
@@ -22,6 +22,8 @@ jobs:
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

@@ -1021,7 +1021,7 @@ Cart::add('1239ad0', 'Product 2', 2, 5.95, ['size' => 'large']);
<a href="https://github.com/kekenec"> <a href="https://github.com/kekenec">
<img src="https://avatars.githubusercontent.com/u/11806874?v=4" width="100;" alt="kekenec"/> <img src="https://avatars.githubusercontent.com/u/11806874?v=4" width="100;" alt="kekenec"/>
<br /> <br />
<sub><b>kekenec</b></sub> <sub><b>Kekenec</b></sub>
</a> </a>
</td> </td>
<td align="center"> <td align="center">

View File

@@ -17,16 +17,16 @@
], ],
"require": { "require": {
"php": "^7.4|^8.0", "php": "^7.4|^8.0",
"illuminate/support": "5.8.*|^6.0|^7.0|^8.0", "illuminate/support": "5.8.*|^6.0|^7.0|^8.0|^9.0",
"illuminate/session": "5.8.*|^6.0|^7.0|^8.0", "illuminate/session": "5.8.*|^6.0|^7.0|^8.0|^9.0",
"illuminate/events": "5.8.*|^6.0|^7.0|^8.0", "illuminate/events": "5.8.*|^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" "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0|^7.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@@ -41,7 +41,7 @@
"suggest": { "suggest": {
"gloudemans/notify": "Simple flash notifications for Laravel" "gloudemans/notify": "Simple flash notifications for Laravel"
}, },
"minimum-stability": "stable", "minimum-stability": "dev",
"extra": { "extra": {
"laravel": { "laravel": {
"providers": [ "providers": [