Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1aebcdc

Browse files
author
dmitriy
committed
updated to Laravel 5.8
1 parent85dafae commit1aebcdc

File tree

42 files changed

+632
-1021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+632
-1021
lines changed

‎.env.dev‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ MAIL_USERNAME=null
3030
MAIL_PASSWORD=null
3131
MAIL_ENCRYPTION=null
3232

33+
AWS_ACCESS_KEY_ID=
34+
AWS_SECRET_ACCESS_KEY=
35+
AWS_DEFAULT_REGION=us-east-1
36+
AWS_BUCKET=
37+
3338
PUSHER_APP_ID=
3439
PUSHER_APP_KEY=
3540
PUSHER_APP_SECRET=

‎.env.prod‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ MAIL_USERNAME=null
3030
MAIL_PASSWORD=null
3131
MAIL_ENCRYPTION=null
3232

33+
AWS_ACCESS_KEY_ID=
34+
AWS_SECRET_ACCESS_KEY=
35+
AWS_DEFAULT_REGION=us-east-1
36+
AWS_BUCKET=
37+
3338
PUSHER_APP_ID=
3439
PUSHER_APP_KEY=
3540
PUSHER_APP_SECRET=

‎.env.test‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ MAIL_USERNAME=null
3030
MAIL_PASSWORD=null
3131
MAIL_ENCRYPTION=null
3232

33+
AWS_ACCESS_KEY_ID=
34+
AWS_SECRET_ACCESS_KEY=
35+
AWS_DEFAULT_REGION=us-east-1
36+
AWS_BUCKET=
37+
3338
PUSHER_APP_ID=
3439
PUSHER_APP_KEY=
3540
PUSHER_APP_SECRET=

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ info:
5858
@makeexec cmd="php artisan --version"
5959
@makeexec cmd="php --version"
6060

61+
logs-supervisord:
62+
@docker logs supervisord
63+
6164
drop-migrate:
6265
@makeexec cmd="php artisan migrate:fresh"
6366
@makeexec cmd="php artisan migrate:fresh --env=test"

‎app/Http/Controllers/Auth/RegisterController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public function __construct()
4949
protectedfunctionvalidator(array$data)
5050
{
5151
return Validator::make($data, [
52-
'name' =>'required|string|max:255',
53-
'email' =>'required|string|email|max:255|unique:users',
54-
'password' =>'required|string|min:6|confirmed',
52+
'name' =>['required','string','max:255'],
53+
'email' =>['required','string','email','max:255','unique:users'],
54+
'password' =>['required','string','min:8','confirmed'],
5555
]);
5656
}
5757

‎app/Http/Controllers/Auth/VerificationController.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
namespaceApp\Http\Controllers\Auth;
44

5-
useIlluminate\Http\Request;
6-
useIlluminate\Routing\Controller;
5+
useApp\Http\Controllers\Controller;
76
useIlluminate\Foundation\Auth\VerifiesEmails;
87

98
class VerificationControllerextends Controller
@@ -15,7 +14,7 @@ class VerificationController extends Controller
1514
|
1615
| This controller is responsible for handling email verification for any
1716
| user that recently registered with the application. Emails may also
18-
| beresent if the userdid not receive the original email message.
17+
| bere-sent if the userdidn't receive the original email message.
1918
|
2019
*/
2120

‎app/Http/Kernel.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,20 @@ class Kernel extends HttpKernel
6161
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
6262
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
6363
];
64+
65+
/**
66+
* The priority-sorted list of middleware.
67+
*
68+
* This forces non-global middleware to always be in the given order.
69+
*
70+
* @var array
71+
*/
72+
protected$middlewarePriority = [
73+
\Illuminate\Session\Middleware\StartSession::class,
74+
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
75+
\App\Http\Middleware\Authenticate::class,
76+
\Illuminate\Session\Middleware\AuthenticateSession::class,
77+
\Illuminate\Routing\Middleware\SubstituteBindings::class,
78+
\Illuminate\Auth\Middleware\Authorize::class,
79+
];
6480
}

‎app/Http/Middleware/Authenticate.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ class Authenticate extends Middleware
1414
*/
1515
protectedfunctionredirectTo($request)
1616
{
17-
returnroute('login');
17+
if (!$request->expectsJson()) {
18+
returnroute('login');
19+
}
1820
}
1921
}

‎app/Providers/AppServiceProvider.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
class AppServiceProviderextends ServiceProvider
88
{
99
/**
10-
*Bootstrap any application services.
10+
*Register any application services.
1111
*
1212
* @return void
1313
*/
14-
publicfunctionboot()
14+
publicfunctionregister()
1515
{
1616
//
1717
}
1818

1919
/**
20-
*Register any application services.
20+
*Bootstrap any application services.
2121
*
2222
* @return void
2323
*/
24-
publicfunctionregister()
24+
publicfunctionboot()
2525
{
2626
//
2727
}

‎app/Providers/AuthServiceProvider.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AuthServiceProvider extends ServiceProvider
1313
* @var array
1414
*/
1515
protected$policies = [
16-
'App\Model' =>'App\Policies\ModelPolicy',
16+
//'App\Model' => 'App\Policies\ModelPolicy',
1717
];
1818

1919
/**

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp