Merge branch '5.7' of github.com:laravel/framework into 5.7

laravel · Sep 6, 2018 · 814334c · 814334c
2 parents 055fe52 + b8d3665
commit 814334c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/src/Illuminate/Auth/Console/stubs/make/views/auth/verify.stub b/src/Illuminate/Auth/Console/stubs/make/views/auth/verify.stub
@@ -5,17 +5,17 @@
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">
-                <div class="card-header">Verify Your Email Address</div>
+                <div class="card-header">{{ __('Verify Your Email Address') }}</div>
 
                 <div class="card-body">
                     @if (session('resent'))
                         <div class="alert alert-success" role="alert">
-                            A fresh verification link has been sent to your email address.
+                            {{ __('A fresh verification link has been sent to your email address.') }}
                         </div>
                     @endif
 
-                    Before proceeding, please check your email for a verification link.
-                    If you did not receive the email, <a href="{{ route('verification.resend') }}">click here to request another</a>.
+                    {{ __('Before proceeding, please check your email for a verification link.') }}
+                    {{ __('If you did not receive the email') }}, <a href="{{ route('verification.resend') }}">{{ __('click here to request another') }}</a>.
                 </div>
             </div>
         </div>

diff --git a/src/Illuminate/Contracts/Auth/MustVerifyEmail.php b/src/Illuminate/Contracts/Auth/MustVerifyEmail.php
@@ -14,7 +14,7 @@ public function hasVerifiedEmail();
     /**
      * Mark the given user's email as verified.
      *
-     * @return void
+     * @return bool
      */
     public function markEmailAsVerified();
 

diff --git a/src/Illuminate/Mail/Transport/MailgunTransport.php b/src/Illuminate/Mail/Transport/MailgunTransport.php
@@ -41,6 +41,7 @@ class MailgunTransport extends Transport
      * @param  \GuzzleHttp\ClientInterface  $client
      * @param  string  $key
      * @param  string  $domain
+     * @param  string|null  $endpoint
      * @return void
      */
     public function __construct(ClientInterface $client, $key, $domain, $endpoint = null)

diff --git a/src/Illuminate/Routing/Console/ControllerMakeCommand.php b/src/Illuminate/Routing/Console/ControllerMakeCommand.php
@@ -150,6 +150,8 @@ protected function buildModelReplacements(array $replace)
      *
      * @param  string  $model
      * @return string
+     *
+     * @throws \InvalidArgumentException
      */
     protected function parseModel($model)
     {

diff --git a/...e/DatabaseEloquentCastsDatabaseString.php → ...tabaseEloquentCastsDatabaseStringTest.php b/...e/DatabaseEloquentCastsDatabaseString.php → ...tabaseEloquentCastsDatabaseStringTest.php
@@ -6,7 +6,7 @@
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 
-class DatabaseEloquentCastsDatabaseString extends TestCase
+class DatabaseEloquentCastsDatabaseStringTest extends TestCase
 {
     public function setUp()
     {

diff --git a/...s/Database/DatabaseEloquentTimestamps.php → ...tabase/DatabaseEloquentTimestampsTest.php b/...s/Database/DatabaseEloquentTimestamps.php → ...tabase/DatabaseEloquentTimestampsTest.php
@@ -7,7 +7,7 @@
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 
-class DatabaseEloquentTimestamps extends TestCase
+class DatabaseEloquentTimestampsTest extends TestCase
 {
     public function setUp()
     {