Merge branch 'develop' of github.com:laravel/laravel into develop

taylorotwell · taylorotwell · commit 0ee4cec52398 · 2019-02-25T14:32:57.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Release Notes
 
+## [Unreleased](https://github.com/laravel/laravel/compare/v5.7.19...master)
+
+### Added
+- Hint for lenient log stacks ([#4918](https://github.com/laravel/laravel/pull/4918))
+- Attribute casting for `email_verified_at` on `User` model stub ([#4930](https://github.com/laravel/laravel/pull/4930))
+
+### Changed
+- Remove unused Bootstrap class ([#4917](https://github.com/laravel/laravel/pull/4917))
+- Change order of boot and register methods in service providers ([#4921](https://github.com/laravel/laravel/pull/4921))
+- `web.config` comment to help debug issues ([#4924](https://github.com/laravel/laravel/pull/4924))
+- Use `Str::random()` instead of `str_random()` ([#4926](https://github.com/laravel/laravel/pull/4926))
+- Remove unnecessary link type on "welcome" view ([#4935](https://github.com/laravel/laravel/pull/4935))
+
+
 ## [v5.7.19 (2018-12-15)](https://github.com/laravel/laravel/compare/v5.7.15...v5.7.19)
 
 ### Added
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -12,15 +12,13 @@ class RedirectIfAuthenticated
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
-     * @param  string[]  ...$guards
+     * @param  string|null  $guard
      * @return mixed
      */
-    public function handle($request, Closure $next, ...$guards)
+    public function handle($request, Closure $next, $guard = null)
     {
-        foreach ($guards as $guard) {
-            if (Auth::guard($guard)->check()) {
-                return redirect('/home');
-            }
+        if (Auth::guard($guard)->check()) {
+            return redirect('/home');
         }
 
         return $next($request);
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -7,21 +7,21 @@
 class AppServiceProvider extends ServiceProvider
 {
     /**
-     * Bootstrap any application services.
+     * Register any application services.
      *
      * @return void
      */
-    public function boot()
+    public function register()
     {
         //
     }
 
     /**
-     * Register any application services.
+     * Bootstrap any application services.
      *
      * @return void
      */
-    public function register()
+    public function boot()
     {
         //
     }
diff --git a/app/User.php b/app/User.php
@@ -27,4 +27,13 @@ class User extends Authenticatable
     protected $hidden = [
         'password', 'remember_token',
     ];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'email_verified_at' => 'datetime',
+    ];
 }
diff --git a/config/auth.php b/config/auth.php
@@ -44,6 +44,7 @@
         'api' => [
             'driver' => 'token',
             'provider' => 'users',
+            'hash' => false,
         ],
     ],
 
diff --git a/config/logging.php b/config/logging.php
@@ -37,6 +37,7 @@
         'stack' => [
             'driver' => 'stack',
             'channels' => ['daily'],
+            'ignore_exceptions' => false,
         ],
 
         'single' => [
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -14,7 +14,7 @@ class CreateUsersTable extends Migration
     public function up()
     {
         Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
+            $table->bigIncrements('id');
             $table->string('name');
             $table->string('email')->unique();
             $table->timestamp('email_verified_at')->nullable();
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/web.config b/public/web.config
@@ -1,3 +1,8 @@
+<!--
+    Rewrites requires Microsoft URL Rewrite Module for IIS
+    Download: https://www.microsoft.com/en-us/download/details.aspx?id=47337
+    Debug Help: https://docs.microsoft.com/en-us/iis/extensions/url-rewrite-module/using-failed-request-tracing-to-trace-rewrite-rules
+-->
 <configuration>
   <system.webServer>
     <rewrite>
diff --git a/readme.md b/readme.md
@@ -9,7 +9,7 @@
 
 ## About Laravel
 
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as:
+Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
 
 - [Simple, fast routing engine](https://laravel.com/docs/routing).
 - [Powerful dependency injection container](https://laravel.com/docs/container).
@@ -19,17 +19,17 @@ Laravel is a web application framework with expressive, elegant syntax. We belie
 - [Robust background job processing](https://laravel.com/docs/queues).
 - [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
 
-Laravel is accessible, yet powerful, providing tools needed for large, robust applications.
+Laravel is accessible, powerful, and provides tools required for large, robust applications.
 
 ## Learning Laravel
 
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of any modern web application framework, making it a breeze to get started learning the framework.
+Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
 
-If you're not in the mood to read, [Laracasts](https://laracasts.com) contains over 1100 video tutorials on a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library.
+If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1100 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost you and your team's skills by digging into our comprehensive video library.
 
 ## Laravel Sponsors
 
-We would like to extend our thanks to the following sponsors for helping fund on-going Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell):
+We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
 
 - **[Vehikl](https://vehikl.com/)**
 - **[Tighten Co.](https://tighten.co)**
@@ -56,6 +56,7 @@ We would like to extend our thanks to the following sponsors for helping fund on
 - [Steadfast Collective](https://steadfastcollective.com/)
 - [We Are The Robots Inc.](https://watr.mx/)
 - [Understand.io](https://www.understand.io/)
+- [Abdel Elrafa](https://abdelelrafa.com)
 
 ## Contributing
 
@@ -67,4 +68,4 @@ If you discover a security vulnerability within Laravel, please send an e-mail t
 
 ## License
 
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+The Laravel framework is open-source software licensed under the [MIT license](https://opensource.org/licenses/MIT).
diff --git a/resources/js/components/ExampleComponent.vue b/resources/js/components/ExampleComponent.vue
@@ -2,7 +2,7 @@
     <div class="container">
         <div class="row justify-content-center">
             <div class="col-md-8">
-                <div class="card card-default">
+                <div class="card">
                     <div class="card-header">Example Component</div>
 
                     <div class="card-body">
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -7,7 +7,7 @@
         <title>Laravel</title>
 
         <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css">
+        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">
 
         <!-- Styles -->
         <style>

Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,13 @@ class RedirectIfAuthenticated`
`12`	`12`	`*`
`13`	`13`	`* @param \Illuminate\Http\Request $request`
`14`	`14`	`* @param \Closure $next`
`15`		`- * @param string[] ...$guards`
	`15`	`+ * @param string\|null $guard`
`16`	`16`	`* @return mixed`
`17`	`17`	`*/`
`18`		`- public function handle($request, Closure $next, ...$guards)`
	`18`	`+ public function handle($request, Closure $next, $guard = null)`
`19`	`19`	`{`
`20`		`- foreach ($guards as $guard) {`
`21`		`- if (Auth::guard($guard)->check()) {`
`22`		`- return redirect('/home');`
`23`		`- }`
	`20`	`+ if (Auth::guard($guard)->check()) {`
	`21`	`+ return redirect('/home');`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`return $next($request);`
Original file line number	Diff line number	Diff line change
`@@ -7,21 +7,21 @@`
`7`	`7`	`class AppServiceProvider extends ServiceProvider`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`		`- * Bootstrap any application services.`
	`10`	`+ * Register any application services.`
`11`	`11`	`*`
`12`	`12`	`* @return void`
`13`	`13`	`*/`
`14`		`- public function boot()`
	`14`	`+ public function register()`
`15`	`15`	`{`
`16`	`16`	`//`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/**`
`20`		`- * Register any application services.`
	`20`	`+ * Bootstrap any application services.`
`21`	`21`	`*`
`22`	`22`	`* @return void`
`23`	`23`	`*/`
`24`		`- public function register()`
	`24`	`+ public function boot()`
`25`	`25`	`{`
`26`	`26`	`//`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class CreateUsersTable extends Migration`
`14`	`14`	`public function up()`
`15`	`15`	`{`
`16`	`16`	`Schema::create('users', function (Blueprint $table) {`
`17`		`- $table->increments('id');`
	`17`	`+ $table->bigIncrements('id');`
`18`	`18`	`$table->string('name');`
`19`	`19`	`$table->string('email')->unique();`
`20`	`20`	`$table->timestamp('email_verified_at')->nullable();`