Skip to content

Commit

Permalink
[1.x] Merge develop (#28)
Browse files Browse the repository at this point in the history
* Adds L11 support (#24)

* Runs tests on develop too
  • Loading branch information
nunomaduro authored Jan 15, 2024
1 parent c342e57 commit 045c708
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- develop
- '*.x'
pull_request:
schedule:
Expand All @@ -19,8 +20,8 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.2]
laravel: [10]
php: [8.2, 8.3]
laravel: [10, 11]

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}

Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@
"php": "^8.2",
"ext-pcntl": "*",
"ext-mbstring": "*",
"illuminate/console": "^10.24",
"illuminate/contracts": "^10.24",
"illuminate/log": "^10.24",
"illuminate/process": "^10.24",
"illuminate/support": "^10.24",
"nunomaduro/termwind": "^1.15"
"illuminate/console": "^10.24|^11.0",
"illuminate/contracts": "^10.24|^11.0",
"illuminate/log": "^10.24|^11.0",
"illuminate/process": "^10.24|^11.0",
"illuminate/support": "^10.24|^11.0",
"nunomaduro/termwind": "^1.15|^2.0"
},
"require-dev": {
"laravel/pint": "^1.13",
"orchestra/testbench": "^8.12",
"orchestra/testbench": "^8.12|^9.0",
"pestphp/pest": "^2.20",
"pestphp/pest-plugin-type-coverage": "^2.3",
"phpstan/phpstan": "^1.10",
"symfony/var-dumper": "^6.3"
"symfony/var-dumper": "^6.3|^7.0"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -63,6 +63,6 @@
"pestphp/pest-plugin": true
}
},
"minimum-stability": "stable",
"minimum-stability": "dev",
"prefer-stable": true
}

0 comments on commit 045c708

Please sign in to comment.