Skip to content

Commit

Permalink
[2.x] Merging develop (#171)
Browse files Browse the repository at this point in the history
* Update composer.json

* [develop] Adds Symfony 7 support (#169)

* Adds Symfony 7 support

* Adjusts workflow

* Adjusts composer

* Uses only "^0.12"

* Uses `0.11.1` for PHP 7.2

---------

Co-authored-by: Dries Vints <dries@vints.io>
  • Loading branch information
nunomaduro and driesvints authored Jan 4, 2024
1 parent ac2f6d0 commit 502e0fe
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
12 changes: 11 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,38 @@ jobs:
fail-fast: true
matrix:
php: [7.2, 7.3, 7.4, '8.0', 8.1, 8.2, 8.3]
laravel: [6, 7, 8, 9, 10]
laravel: [6, 7, 8, 9, 10, 11]
exclude:
- php: 7.2
laravel: 8
- php: 7.2
laravel: 9
- php: 7.2
laravel: 10
- php: 7.2
laravel: 11
- php: 7.3
laravel: 9
- php: 7.3
laravel: 10
- php: 7.3
laravel: 11
- php: 7.4
laravel: 9
- php: 7.4
laravel: 10
- php: 7.4
laravel: 11
- php: '8.0'
laravel: 10
- php: '8.0'
laravel: 11
- php: 8.1
laravel: 6
- php: 8.1
laravel: 7
- php: 8.1
laravel: 11
- php: 8.2
laravel: 6
- php: 8.2
Expand Down
15 changes: 6 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
],
"require": {
"php": "^7.2.5|^8.0",
"illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0",
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0",
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
"psy/psysh": "^0.10.4|^0.11.1|^0.12.0",
"symfony/var-dumper": "^4.3.4|^5.0|^6.0"
"illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"psy/psysh": "^0.11.1|^0.12.0",
"symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0"
},
"require-dev": {
"mockery/mockery": "~1.3.3|^1.4.2",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^8.5.8|^9.3.3"
},
"suggest": {
"illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0)."
"illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0)."
},
"autoload": {
"psr-4": {
Expand All @@ -38,9 +38,6 @@
}
},
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
},
"laravel": {
"providers": [
"Laravel\\Tinker\\TinkerServiceProvider"
Expand Down

0 comments on commit 502e0fe

Please sign in to comment.