Skip to content
This repository was archived by the owner on Jun 27, 2024. It is now read-only.

Commit 21086aa

Browse files
Laravel 10.x Compatibility (#120)
Co-authored-by: Pascal Baljet <[email protected]>
1 parent 656479c commit 21086aa

22 files changed

+1737
-1727
lines changed

Diff for: .github/workflows/coding-standards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
php-version:
10-
- "8.0"
10+
- "8.1"
1111
node-version:
1212
- 16
1313

Diff for: .github/workflows/php.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
strategy:
99
fail-fast: true
1010
matrix:
11-
php: [8.1, 8.0]
12-
laravel: [9.*]
11+
php: [8.2, 8.1]
12+
laravel: ["9", "10"]
1313
dependency-version: [prefer-lowest, prefer-stable]
1414

15-
name: P${{ matrix.php }} - ${{ matrix.dependency-version }}
15+
name: L${{ matrix.laravel}} - P${{ matrix.php }} - ${{ matrix.dependency-version }}
1616

1717
steps:
1818
- name: Checkout code
@@ -53,6 +53,13 @@ jobs:
5353
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, mysql, mysqli, pdo_mysql
5454
coverage: none
5555

56+
- name: Downgrade to Laravel 9
57+
run: |
58+
cd app
59+
rm composer.json
60+
mv composer-l9.json composer.json
61+
if: "matrix.laravel == '9'"
62+
5663
- name: Prepare demo app
5764
run: |
5865
cd app

Diff for: app/composer-l9.json

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
{
2+
"name": "laravel/laravel",
3+
"type": "project",
4+
"description": "The Laravel Framework.",
5+
"keywords": [
6+
"framework",
7+
"laravel"
8+
],
9+
"license": "MIT",
10+
"require": {
11+
"php": "^8.1|^8.2",
12+
"guzzlehttp/guzzle": "^7.2",
13+
"inertiajs/inertia-laravel": "^0.6.9",
14+
"laravel/breeze": "^1.9",
15+
"laravel/dusk": "^6.24",
16+
"laravel/framework": "^9.37",
17+
"laravel/sanctum": "^2.8",
18+
"laravel/tinker": "^2.7",
19+
"protonemedia/inertiajs-tables-laravel-query-builder": "@dev",
20+
"spatie/laravel-query-builder": "^5.0",
21+
"tightenco/ziggy": "^1.0"
22+
},
23+
"require-dev": {
24+
"fakerphp/faker": "^1.9.1",
25+
"friendsofphp/php-cs-fixer": "^3.8",
26+
"mockery/mockery": "^1.4.4",
27+
"nunomaduro/collision": "^6.1",
28+
"phpunit/phpunit": "^9.5.10",
29+
"spatie/laravel-ignition": "^1.0"
30+
},
31+
"repositories": [
32+
{
33+
"type": "path",
34+
"url": "../"
35+
}
36+
],
37+
"autoload": {
38+
"psr-4": {
39+
"App\\": "app/",
40+
"Database\\Factories\\": "database/factories/",
41+
"Database\\Seeders\\": "database/seeders/"
42+
}
43+
},
44+
"autoload-dev": {
45+
"psr-4": {
46+
"Tests\\": "tests/"
47+
}
48+
},
49+
"scripts": {
50+
"post-autoload-dump": [
51+
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
52+
"@php artisan package:discover --ansi"
53+
],
54+
"post-update-cmd": [
55+
"@php artisan vendor:publish --tag=laravel-assets --ansi --force"
56+
],
57+
"post-root-package-install": [
58+
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
59+
],
60+
"post-create-project-cmd": [
61+
"@php artisan key:generate --ansi"
62+
]
63+
},
64+
"extra": {
65+
"laravel": {
66+
"dont-discover": []
67+
}
68+
},
69+
"config": {
70+
"optimize-autoloader": true,
71+
"preferred-install": "dist",
72+
"sort-packages": true
73+
},
74+
"minimum-stability": "dev",
75+
"prefer-stable": true
76+
}

Diff for: app/composer.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
],
99
"license": "MIT",
1010
"require": {
11-
"php": "^8.0.2",
11+
"php": "^8.1|^8.2",
1212
"guzzlehttp/guzzle": "^7.2",
13-
"inertiajs/inertia-laravel": "^0.6.3",
13+
"inertiajs/inertia-laravel": "^0.6.9",
1414
"laravel/breeze": "^1.9",
15-
"laravel/dusk": "^6.24",
16-
"laravel/framework": "^9.19.0",
17-
"laravel/sanctum": "^2.8",
15+
"laravel/dusk": "^7.0",
16+
"laravel/framework": "^10.0",
17+
"laravel/sanctum": "^2.8|^3.0",
1818
"laravel/tinker": "^2.7",
1919
"protonemedia/inertiajs-tables-laravel-query-builder": "@dev",
2020
"spatie/laravel-query-builder": "^5.0",
@@ -26,7 +26,7 @@
2626
"mockery/mockery": "^1.4.4",
2727
"nunomaduro/collision": "^6.1",
2828
"phpunit/phpunit": "^9.5.10",
29-
"spatie/laravel-ignition": "^1.0"
29+
"spatie/laravel-ignition": "^1.0|^2.0"
3030
},
3131
"repositories": [
3232
{
@@ -73,4 +73,4 @@
7373
},
7474
"minimum-stability": "dev",
7575
"prefer-stable": true
76-
}
76+
}

0 commit comments

Comments
 (0)