From 6b207dfe4ce5e66be9638e02b8d2be9f190e823c Mon Sep 17 00:00:00 2001 From: Aken Roberts Date: Wed, 5 Sep 2018 16:53:46 -0500 Subject: [PATCH 1/5] Add Test suffix to misnamed tests (#25471) --- ...seString.php => DatabaseEloquentCastsDatabaseStringTest.php} | 2 +- ...loquentTimestamps.php => DatabaseEloquentTimestampsTest.php} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename tests/Database/{DatabaseEloquentCastsDatabaseString.php => DatabaseEloquentCastsDatabaseStringTest.php} (98%) rename tests/Database/{DatabaseEloquentTimestamps.php => DatabaseEloquentTimestampsTest.php} (98%) diff --git a/tests/Database/DatabaseEloquentCastsDatabaseString.php b/tests/Database/DatabaseEloquentCastsDatabaseStringTest.php similarity index 98% rename from tests/Database/DatabaseEloquentCastsDatabaseString.php rename to tests/Database/DatabaseEloquentCastsDatabaseStringTest.php index a161c5f30113..aa9936c91533 100644 --- a/tests/Database/DatabaseEloquentCastsDatabaseString.php +++ b/tests/Database/DatabaseEloquentCastsDatabaseStringTest.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/tests/Database/DatabaseEloquentTimestamps.php b/tests/Database/DatabaseEloquentTimestampsTest.php similarity index 98% rename from tests/Database/DatabaseEloquentTimestamps.php rename to tests/Database/DatabaseEloquentTimestampsTest.php index 9cd86c7ee8d7..acab463b05f8 100644 --- a/tests/Database/DatabaseEloquentTimestamps.php +++ b/tests/Database/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() { From 9c844aa37617d8694ba364e16a5f26ecc470c18e Mon Sep 17 00:00:00 2001 From: Thom Hurks Date: Wed, 5 Sep 2018 23:56:43 +0200 Subject: [PATCH 2/5] Adjust PHPDoc in the MustVerifyEmail contract (#25463) --- src/Illuminate/Contracts/Auth/MustVerifyEmail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Contracts/Auth/MustVerifyEmail.php b/src/Illuminate/Contracts/Auth/MustVerifyEmail.php index 355217097375..816980665676 100644 --- 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(); From 327d5d6410b1c9c392393808428da003710f45f1 Mon Sep 17 00:00:00 2001 From: Lucas Michot Date: Thu, 6 Sep 2018 15:05:28 +0200 Subject: [PATCH 3/5] Add missing docblock. (#25486) --- src/Illuminate/Mail/Transport/MailgunTransport.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Illuminate/Mail/Transport/MailgunTransport.php b/src/Illuminate/Mail/Transport/MailgunTransport.php index 599b4ef6ddea..5dacdca4aac3 100644 --- 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) From 97b6deec70ed6592b529b29f13c1b10a05c2be5c Mon Sep 17 00:00:00 2001 From: Rod Elias Date: Thu, 6 Sep 2018 10:09:41 -0300 Subject: [PATCH 4/5] add missing docblock (#25477) --- src/Illuminate/Routing/Console/ControllerMakeCommand.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Illuminate/Routing/Console/ControllerMakeCommand.php b/src/Illuminate/Routing/Console/ControllerMakeCommand.php index 17aab4723f06..85ee7d396a38 100755 --- 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) { From b8d3665de081bc374816592d9055a98b617db223 Mon Sep 17 00:00:00 2001 From: Cesar Garcia Date: Thu, 6 Sep 2018 15:14:20 +0200 Subject: [PATCH 5/5] Make verify scaffolding translatable (#25473) --- .../Auth/Console/stubs/make/views/auth/verify.stub | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 index 75ed8115efa0..c742cb4bdcd6 100644 --- 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 @@
-
Verify Your Email Address
+
{{ __('Verify Your Email Address') }}
@if (session('resent')) @endif - Before proceeding, please check your email for a verification link. - If you did not receive the email, click here to request another. + {{ __('Before proceeding, please check your email for a verification link.') }} + {{ __('If you did not receive the email') }}, {{ __('click here to request another') }}.