Skip to content

Commit 6bdbb68

Browse files
Laravel 12 support (#62)
* Laravel 12 support in composer * Further updates * Re-include all versions for support * format of composer * support php 8.1 for now (laravel 10) * On second thought, better remove php 8.1 from support matrix
1 parent c0c73cb commit 6bdbb68

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
stability: [prefer-stable]
18-
versions: [ { php: 8.1, laravel: 10 }, { php: 8.2, laravel: 10 }, { php: 8.3, laravel: 10 }, { php: 8.4, laravel: 10 }, { php: 8.2, laravel: 11 }, { php: 8.3, laravel: 11 }, { php: 8.4, laravel: 11 } ]
18+
versions: [ { php: 8.2, laravel: 10 }, { php: 8.3, laravel: 10 }, { php: 8.4, laravel: 10 }, { php: 8.2, laravel: 11 }, { php: 8.3, laravel: 11 }, { php: 8.4, laravel: 11 }, { php: 8.2, laravel: 12 }, { php: 8.3, laravel: 12 }, { php: 8.4, laravel: 12 } ]
1919

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

composer.json

+23-21
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,37 @@
88
"restful"
99
],
1010
"license": "BSD-3-Clause",
11-
"authors": [{
11+
"authors": [
12+
{
1213
"name": "Jason Lewis",
1314
"email": "[email protected]"
14-
}],
15+
},
16+
{
17+
"name": "Max Snow",
18+
"email": "[email protected]"
19+
}
20+
],
1521
"require": {
16-
"php": "^8.0",
17-
"illuminate/routing": "^9.0|^10.0|^11.0",
18-
"illuminate/support": "^9.0|^10.0|^11.0",
22+
"php": "^8.2",
23+
"illuminate/routing": "^9.0|^10.0|^11.0|^12.0",
24+
"illuminate/support": "^9.0|^10.0|^11.0|^12.0",
1925
"php-open-source-saver/fractal": "^1.0"
2026
},
2127
"require-dev": {
22-
"dingo/blueprint": "~0.4",
2328
"friendsofphp/php-cs-fixer": "~3",
24-
"illuminate/auth": "^9.0|^10.0|^11.0",
25-
"illuminate/cache": "^9.0|^10.0|^11.0",
26-
"illuminate/console": "^9.0|^10.0|^11.0",
27-
"illuminate/database": "^9.0|^10.0|^11.0",
28-
"illuminate/events": "^9.0|^10.0|^11.0",
29-
"illuminate/filesystem": "^9.0|^10.0|^11.0",
30-
"illuminate/log": "^9.0|^10.0|^11.0",
31-
"illuminate/pagination": "^9.0|^10.0|^11.0",
32-
"laravel/framework": "^9.0|^10.0|^11.0",
33-
"illuminate/translation": "^9.0|^10.0|^11.0",
29+
"illuminate/auth": "^9.0|^10.0|^11.0|^12.0",
30+
"illuminate/cache": "^9.0|^10.0|^11.0|^12.0",
31+
"illuminate/console": "^9.0|^10.0|^11.0|^12.0",
32+
"illuminate/database": "^9.0|^10.0|^11.0|^12.0",
33+
"illuminate/events": "^9.0|^10.0|^11.0|^12.0",
34+
"illuminate/filesystem": "^9.0|^10.0|^11.0|^12.0",
35+
"illuminate/log": "^9.0|^10.0|^11.0|^12.0",
36+
"illuminate/pagination": "^9.0|^10.0|^11.0|^12.0",
37+
"laravel/framework": "^9.0|^10.0|^11.0|^12.0",
38+
"illuminate/translation": "^9.0|^10.0|^11.0|^12.0",
3439
"mockery/mockery": "~1.0",
35-
"php-open-source-saver/jwt-auth": "^1.4 | ^2.2",
36-
"phpunit/phpunit": "^9.0|^10.0",
40+
"php-open-source-saver/jwt-auth": "^1.4 | ^2.8",
41+
"phpunit/phpunit": "^9.5|^10.5",
3742
"squizlabs/php_codesniffer": "~2.0"
3843
},
3944
"suggest": {
@@ -55,9 +60,6 @@
5560
}
5661
},
5762
"extra": {
58-
"branch-alias": {
59-
"dev-master": "2.0-dev"
60-
},
6163
"laravel": {
6264
"providers": [
6365
"Dingo\\Api\\Provider\\LaravelServiceProvider"

tests/ChecksLaravelVersionTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
trait ChecksLaravelVersionTrait
1414
{
1515
public $installed_file_path = __DIR__.'/../vendor/composer/installed.json';
16-
public $current_release = '8.0';
16+
public $current_release = '12.0';
1717

1818
private function getFrameworkVersion()
1919
{

0 commit comments

Comments
 (0)