Skip to content

Commit 502e0fe

Browse files
[2.x] Merging develop (#171)
* 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 <[email protected]>
1 parent ac2f6d0 commit 502e0fe

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

.github/workflows/tests.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,38 @@ jobs:
1717
fail-fast: true
1818
matrix:
1919
php: [7.2, 7.3, 7.4, '8.0', 8.1, 8.2, 8.3]
20-
laravel: [6, 7, 8, 9, 10]
20+
laravel: [6, 7, 8, 9, 10, 11]
2121
exclude:
2222
- php: 7.2
2323
laravel: 8
2424
- php: 7.2
2525
laravel: 9
2626
- php: 7.2
2727
laravel: 10
28+
- php: 7.2
29+
laravel: 11
2830
- php: 7.3
2931
laravel: 9
3032
- php: 7.3
3133
laravel: 10
34+
- php: 7.3
35+
laravel: 11
3236
- php: 7.4
3337
laravel: 9
3438
- php: 7.4
3539
laravel: 10
40+
- php: 7.4
41+
laravel: 11
3642
- php: '8.0'
3743
laravel: 10
44+
- php: '8.0'
45+
laravel: 11
3846
- php: 8.1
3947
laravel: 6
4048
- php: 8.1
4149
laravel: 7
50+
- php: 8.1
51+
laravel: 11
4252
- php: 8.2
4353
laravel: 6
4454
- php: 8.2

composer.json

+6-9
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
],
1212
"require": {
1313
"php": "^7.2.5|^8.0",
14-
"illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0",
15-
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0",
16-
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
17-
"psy/psysh": "^0.10.4|^0.11.1|^0.12.0",
18-
"symfony/var-dumper": "^4.3.4|^5.0|^6.0"
14+
"illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
15+
"illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
16+
"illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
17+
"psy/psysh": "^0.11.1|^0.12.0",
18+
"symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0"
1919
},
2020
"require-dev": {
2121
"mockery/mockery": "~1.3.3|^1.4.2",
2222
"phpstan/phpstan": "^1.10",
2323
"phpunit/phpunit": "^8.5.8|^9.3.3"
2424
},
2525
"suggest": {
26-
"illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0)."
26+
"illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0)."
2727
},
2828
"autoload": {
2929
"psr-4": {
@@ -38,9 +38,6 @@
3838
}
3939
},
4040
"extra": {
41-
"branch-alias": {
42-
"dev-master": "2.x-dev"
43-
},
4441
"laravel": {
4542
"providers": [
4643
"Laravel\\Tinker\\TinkerServiceProvider"

0 commit comments

Comments
 (0)