Skip to content

Commit 3848c9b

Browse files
authored
Sync with laravel/laravel (#14)
1 parent 8e54da0 commit 3848c9b

File tree

10 files changed

+23
-11
lines changed

10 files changed

+23
-11
lines changed

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ FILESYSTEM_DISK=local
3838
QUEUE_CONNECTION=database
3939

4040
CACHE_STORE=database
41-
CACHE_PREFIX=
41+
# CACHE_PREFIX=
4242

4343
MEMCACHED_HOST=127.0.0.1
4444

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
/storage/*.key
77
/storage/pail
88
/vendor
9-
.DS_Store
109
.env
1110
.env.backup
1211
.env.production
1312
.phpactor.json
1413
.phpunit.result.cache
1514
Homestead.json
1615
Homestead.yaml
17-
auth.json
1816
npm-debug.log
1917
yarn-error.log
18+
/auth.json
2019
/.fleet
2120
/.idea
2221
/.nova

app/Models/User.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Illuminate\Notifications\Notifiable;
99
use Illuminate\Support\Str;
1010

11-
class User extends Authenticatable // implements MustVerifyEmail
11+
class User extends Authenticatable
1212
{
1313
/** @use HasFactory<\Database\Factories\UserFactory> */
1414
use HasFactory, Notifiable;

artisan

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env php
22
<?php
33

4+
use Illuminate\Foundation\Application;
45
use Symfony\Component\Console\Input\ArgvInput;
56

67
define('LARAVEL_START', microtime(true));
@@ -9,7 +10,9 @@ define('LARAVEL_START', microtime(true));
910
require __DIR__.'/vendor/autoload.php';
1011

1112
// Bootstrap Laravel and handle the command...
12-
$status = (require_once __DIR__.'/bootstrap/app.php')
13-
->handleCommand(new ArgvInput);
13+
/** @var Application $app */
14+
$app = require_once __DIR__.'/bootstrap/app.php';
15+
16+
$status = $app->handleCommand(new ArgvInput);
1417

1518
exit($status);

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@
7171
"php-http/discovery": true
7272
}
7373
},
74-
"minimum-stability": "dev",
74+
"minimum-stability": "stable",
7575
"prefer-stable": true
7676
}

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

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} (.+)/$

public/index.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
22

3+
use Illuminate\Foundation\Application;
34
use Illuminate\Http\Request;
45

56
define('LARAVEL_START', microtime(true));
@@ -13,5 +14,7 @@
1314
require __DIR__.'/../vendor/autoload.php';
1415

1516
// Bootstrap Laravel and handle the request...
16-
(require_once __DIR__.'/../bootstrap/app.php')
17-
->handleRequest(Request::capture());
17+
/** @var Application $app */
18+
$app = require_once __DIR__.'/../bootstrap/app.php';
19+
20+
$app->handleRequest(Request::capture());

routes/console.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55

66
Artisan::command('inspire', function () {
77
$this->comment(Inspiring::quote());
8-
})->purpose('Display an inspiring quote')->hourly();
8+
})->purpose('Display an inspiring quote');

0 commit comments

Comments
 (0)