Skip to content

Commit 60269b2

Browse files
committed
Merge branch '11.x'
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
2 parents 1f12f83 + 4760fcd commit 60269b2

File tree

7 files changed

+14
-7
lines changed

7 files changed

+14
-7
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: true
2121
matrix:
22-
php: [8.2, 8.3]
22+
php: [8.2, 8.3, 8.4]
2323

2424
name: PHP ${{ matrix.php }}
2525

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
.phpunit.result.cache
1414
Homestead.json
1515
Homestead.yaml
16-
auth.json
1716
npm-debug.log
1817
yarn-error.log
18+
/auth.json
1919
/.fleet
2020
/.idea
2121
/.nova

config/filesystems.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
'root' => storage_path('app/private'),
3636
'serve' => true,
3737
'throw' => false,
38+
'report' => false,
3839
],
3940

4041
'public' => [
@@ -43,6 +44,7 @@
4344
'url' => env('APP_URL').'/storage',
4445
'visibility' => 'public',
4546
'throw' => false,
47+
'report' => false,
4648
],
4749

4850
's3' => [
@@ -55,6 +57,7 @@
5557
'endpoint' => env('AWS_ENDPOINT'),
5658
'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
5759
'throw' => false,
60+
'report' => false,
5861
],
5962

6063
],

config/session.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
|
3333
*/
3434

35-
'lifetime' => env('SESSION_LIFETIME', 120),
35+
'lifetime' => (int) env('SESSION_LIFETIME', 120),
3636

3737
'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),
3838

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"autoprefixer": "^10.4.20",
1010
"axios": "^1.7.4",
1111
"concurrently": "^9.0.1",
12-
"laravel-vite-plugin": "^1.0",
12+
"laravel-vite-plugin": "^1.2.0",
1313
"postcss": "^8.4.47",
1414
"tailwindcss": "^3.4.13",
15-
"vite": "^6.0"
15+
"vite": "^6.0.11"
1616
}
1717
}

public/.htaccess

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
RewriteCond %{HTTP:Authorization} .
1010
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
1111

12+
# Handle X-XSRF-Token Header
13+
RewriteCond %{HTTP:x-xsrf-token} .
14+
RewriteRule .* - [E=HTTP_X_XSRF_TOKEN:%{HTTP:X-XSRF-Token}]
15+
1216
# Redirect Trailing Slashes If Not A Folder...
1317
RewriteCond %{REQUEST_FILENAME} !-d
1418
RewriteCond %{REQUEST_URI} (.+)/$

resources/views/welcome.blade.php

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)