upgrade to Laravel v5.7

Author: harris21

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+ [*]
+ charset = utf-8
+ end_of_line = lf
+ insert_final_newline = true
+ indent_style = space
+ indent_size = 4
+ trim_trailing_whitespace = true
+
+ [*.md]
+ trim_trailing_whitespace = false
+
+ [*.yml]
+ indent_size = 2

.env.example

@@ -16,7 +16,7 @@ DB_PASSWORD=secret
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 SESSION_DRIVER=file
-QUEUE_DRIVER=sync
+QUEUE_CONNECTION=sync
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null

app/Data/Models/User.php

@@ -3,9 +3,10 @@
 namespace App\Data\Models;
 
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 
-class User extends Authenticatable
+class User extends Authenticatable implements MustVerifyEmail
 {
     use Notifiable;
 

app/Http/Controllers/Auth/RegisterController.php

@@ -49,9 +49,9 @@ public function __construct()
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'name' => 'required|max:255',
-            'email' => 'required|email|max:255|unique:users',
-            'password' => 'required|min:6|confirmed',
+            'name' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
+            'password' => ['required', 'string', 'min:6', 'confirmed'],
         ]);
     }
 

app/Http/Controllers/Auth/VerificationController.php

@@ -0,0 +1,41 @@
+<?php
+
+ namespace App\Http\Controllers\Auth;
+
+ use App\Http\Controllers\Controller;
+ use Illuminate\Foundation\Auth\VerifiesEmails;
+
+ class VerificationController extends Controller
+ {
+     /*
+     |--------------------------------------------------------------------------
+     | Email Verification Controller
+     |--------------------------------------------------------------------------
+     |
+     | This controller is responsible for handling email verification for any
+     | user that recently registered with the application. Emails may also
+     | be re-sent if the user didn't receive the original email message.
+     |
+     */
+
+     use VerifiesEmails;
+
+     /**
+      * Where to redirect users after verification.
+      *
+      * @var string
+      */
+     protected $redirectTo = '/home';
+
+     /**
+      * Create a new controller instance.
+      *
+      * @return void
+      */
+     public function __construct()
+     {
+         $this->middleware('auth');
+         $this->middleware('signed')->only('verify');
+         $this->middleware('throttle:6,1')->only('verify', 'resend');
+     }
+ }

app/Http/Kernel.php

@@ -50,13 +50,30 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
+        'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+     ];
+
+     /**
+      * The priority-sorted list of middleware.
+      *
+      * This forces the listed middleware to always be in the given order.
+      *
+      * @var array
+      */
+     protected $middlewarePriority = [
+        \Illuminate\Session\Middleware\StartSession::class,
+        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+        \Framework\Http\Middleware\Authenticate::class,
+        \Illuminate\Session\Middleware\AuthenticateSession::class,
+        \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        \Illuminate\Auth\Middleware\Authorize::class,
     ];
 }

app/Http/Middleware/Authenticate.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Auth\Middleware\Authenticate as Middleware;
+
+class Authenticate extends Middleware
+{
+    /**
+     * Get the path the user should be redirected to when they are not authenticated.
+    *
+    * @param  \Illuminate\Http\Request  $request
+    * @return string
+    */
+    protected function redirectTo($request)
+    {
+        if (!$request->expectsJson()) {
+            return route('login');
+        }
+    }
+}

app/Http/Middleware/VerifyCsrfToken.php

@@ -6,6 +6,13 @@
 
 class VerifyCsrfToken extends BaseVerifier
 {
+    /**
+    * Indicates whether the XSRF-TOKEN cookie should be set on the response.
+    *
+    * @var bool
+    */
+    protected $addHttpCookie = true;
+
     /**
      * The URIs that should be excluded from CSRF verification.
      *

app/Providers/EventServiceProvider.php

@@ -3,6 +3,8 @@
 namespace App\Providers;
 
 use Illuminate\Support\Facades\Event;
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 
 class EventServiceProvider extends ServiceProvider
@@ -13,8 +15,8 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'App\Events\SomeEvent' => [
-            'App\Listeners\EventListener',
+        Registered::class => [
+            SendEmailVerificationNotification::class,
         ],
     ];
 

bootstrap/app.php

@@ -12,7 +12,7 @@
 */
 
 $app = new Illuminate\Foundation\Application(
-    realpath(__DIR__.'/../')
+    dirname(__DIR__)
 );
 
 /*