Skip to content

Commit 3fad1a5

Browse files
committed
2025-07-21までの原文変更点反映。
1 parent 72c0652 commit 3fad1a5

25 files changed

+118
-48
lines changed

original-en/billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1755,7 +1755,7 @@ This method will set the trial period ending date on the subscription record wit
17551755
The `trialUntil` method allows you to provide a `DateTime` instance that specifies when the trial period should end:
17561756

17571757
```php
1758-
use Carbon\Carbon;
1758+
use Illuminate\Support\Carbon;
17591759

17601760
$user->newSubscription('default', 'price_monthly')
17611761
->trialUntil(Carbon::now()->addDays(10))

original-en/collections.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2341,6 +2341,18 @@ $collection->all();
23412341
// [1, 2, 3, 4, 5]
23422342
```
23432343

2344+
You may also provide multiple items to append to the end of the collection:
2345+
2346+
```php
2347+
$collection = collect([1, 2, 3, 4]);
2348+
2349+
$collection->push(5, 6, 7);
2350+
2351+
$collection->all();
2352+
2353+
// [1, 2, 3, 4, 5, 6, 7]
2354+
```
2355+
23442356
<a name="method-put"></a>
23452357
#### `put()` {.collection-method}
23462358

original-en/helpers.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ $isList = Arr::isList(['product' => ['name' => 'Desk', 'price' => 100]]);
655655
<a name="method-array-join"></a>
656656
#### `Arr::join()` {.collection-method}
657657

658-
The `Arr::join` method joins array elements with a string. Using this method's second argument, you may also specify the joining string for the final element of the array:
658+
The `Arr::join` method joins array elements with a string. Using this method's third argument, you may also specify the joining string for the final element of the array:
659659

660660
```php
661661
use Illuminate\Support\Arr;
@@ -1502,7 +1502,7 @@ data_forget($data, 'products.*.price');
15021502
<a name="method-head"></a>
15031503
#### `head()` {.collection-method}
15041504

1505-
The `head` function returns the first element in the given array:
1505+
The `head` function returns the first element in the given array. If the array is empty, `false` will be returned:
15061506

15071507
```php
15081508
$array = [100, 200, 300];
@@ -1515,7 +1515,7 @@ $first = head($array);
15151515
<a name="method-last"></a>
15161516
#### `last()` {.collection-method}
15171517

1518-
The `last` function returns the last element in the given array:
1518+
The `last` function returns the last element in the given array. If the array is empty, `false` will be returned:
15191519

15201520
```php
15211521
$array = [100, 200, 300];
@@ -2511,7 +2511,7 @@ event(new UserRegistered($user));
25112511
The `fake` function resolves a [Faker](https://github.com/FakerPHP/Faker) singleton from the container, which can be useful when creating fake data in model factories, database seeding, tests, and prototyping views:
25122512

25132513
```blade
2514-
@for($i = 0; $i < 10; $i++)
2514+
@for ($i = 0; $i < 10; $i++)
25152515
<dl>
25162516
<dt>Name</dt>
25172517
<dd>{{ fake()->name() }}</dd>

original-en/http-client.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ $response = Http::post(/* ... */);
600600
<a name="faking-specific-urls"></a>
601601
#### Faking Specific URLs
602602

603-
Alternatively, you may pass an array to the `fake` method. The array's keys should represent URL patterns that you wish to fake and their associated responses. The `*` character may be used as a wildcard character. Any requests made to URLs that have not been faked will actually be executed. You may use the `Http` facade's `response` method to construct stub / fake responses for these endpoints:
603+
Alternatively, you may pass an array to the `fake` method. The array's keys should represent URL patterns that you wish to fake and their associated responses. The `*` character may be used as a wildcard character. You may use the `Http` facade's `response` method to construct stub / fake responses for these endpoints:
604604

605605
```php
606606
Http::fake([
@@ -612,7 +612,7 @@ Http::fake([
612612
]);
613613
```
614614

615-
If you would like to specify a fallback URL pattern that will stub all unmatched URLs, you may use a single `*` character:
615+
Any requests made to URLs that have not been faked will actually be executed. If you would like to specify a fallback URL pattern that will stub all unmatched URLs, you may use a single `*` character:
616616

617617
```php
618618
Http::fake([

original-en/mail.md

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<a name="introduction"></a>
3737
## Introduction
3838

39-
Sending email doesn't have to be complicated. Laravel provides a clean, simple email API powered by the popular [Symfony Mailer](https://symfony.com/doc/current/mailer.html) component. Laravel and Symfony Mailer provide drivers for sending email via SMTP, Mailgun, Postmark, Resend, Amazon SES, and `sendmail`, allowing you to quickly get started sending mail through a local or cloud based service of your choice.
39+
Sending email doesn't have to be complicated. Laravel provides a clean, simple email API powered by the popular [Symfony Mailer](https://symfony.com/doc/current/mailer.html) component. Laravel and Symfony Mailer provide drivers for sending email via SMTP, Mailgun, Postmark, Resend, Amazon SES, and `sendmail`, allowing you to quickly get started sending mail through a local or cloud-based service of your choice.
4040

4141
<a name="configuration"></a>
4242
### Configuration
@@ -87,7 +87,7 @@ After configuring your application's default mailer, add the following options t
8787
],
8888
```
8989

90-
If you are not using the United States [Mailgun region](https://documentation.mailgun.com/en/latest/api-intro.html#mailgun-regions), you may define your region's endpoint in the `services` configuration file:
90+
If you are not using the United States [Mailgun region](https://documentation.mailgun.com/docs/mailgun/api-reference/#mailgun-regions), you may define your region's endpoint in the `services` configuration file:
9191

9292
```php
9393
'mailgun' => [
@@ -253,6 +253,7 @@ To accomplish this, you should define a mailer within your application's `mail`
253253
'mailgun',
254254
'sendmail',
255255
],
256+
'retry_after' => 60,
256257
],
257258

258259
// ...
@@ -278,6 +279,7 @@ The `roundrobin` transport allows you to distribute your mailing workload across
278279
'ses',
279280
'postmark',
280281
],
282+
'retry_after' => 60,
281283
],
282284

283285
// ...
@@ -1180,9 +1182,7 @@ Mail::to($request->user())->send(new OrderShipped($order));
11801182
<a name="testing-mailable-content"></a>
11811183
### Testing Mailable Content
11821184

1183-
Laravel provides a variety of methods for inspecting your mailable's structure. In addition, Laravel provides several convenient methods for testing that your mailable contains the content that you expect. These methods are: `assertSeeInHtml`, `assertDontSeeInHtml`, `assertSeeInOrderInHtml`, `assertSeeInText`, `assertDontSeeInText`, `assertSeeInOrderInText`, `assertHasAttachment`, `assertHasAttachedData`, `assertHasAttachmentFromStorage`, and `assertHasAttachmentFromStorageDisk`.
1184-
1185-
As you might expect, the "HTML" assertions assert that the HTML version of your mailable contains a given string, while the "text" assertions assert that the plain-text version of your mailable contains a given string:
1185+
Laravel provides a variety of methods for inspecting your mailable's structure. In addition, Laravel provides several convenient methods for testing that your mailable contains the content that you expect:
11861186

11871187
```php tab=Pest
11881188
use App\Mail\InvoicePaid;
@@ -1203,10 +1203,11 @@ test('mailable content', function () {
12031203
$mailable->assertHasMetadata('key', 'value');
12041204

12051205
$mailable->assertSeeInHtml($user->email);
1206-
$mailable->assertSeeInHtml('Invoice Paid');
1206+
$mailable->assertDontSeeInHtml('Invoice Not Paid');
12071207
$mailable->assertSeeInOrderInHtml(['Invoice Paid', 'Thanks']);
12081208

12091209
$mailable->assertSeeInText($user->email);
1210+
$mailable->assertDontSeeInText('Invoice Not Paid');
12101211
$mailable->assertSeeInOrderInText(['Invoice Paid', 'Thanks']);
12111212

12121213
$mailable->assertHasAttachment('/path/to/file');
@@ -1237,10 +1238,11 @@ public function test_mailable_content(): void
12371238
$mailable->assertHasMetadata('key', 'value');
12381239

12391240
$mailable->assertSeeInHtml($user->email);
1240-
$mailable->assertSeeInHtml('Invoice Paid');
1241+
$mailable->assertDontSeeInHtml('Invoice Not Paid');
12411242
$mailable->assertSeeInOrderInHtml(['Invoice Paid', 'Thanks']);
12421243

12431244
$mailable->assertSeeInText($user->email);
1245+
$mailable->assertDontSeeInText('Invoice Not Paid');
12441246
$mailable->assertSeeInOrderInText(['Invoice Paid', 'Thanks']);
12451247

12461248
$mailable->assertHasAttachment('/path/to/file');
@@ -1251,6 +1253,8 @@ public function test_mailable_content(): void
12511253
}
12521254
```
12531255

1256+
As you might expect, the "HTML" assertions assert that the HTML version of your mailable contains a given string, while the "text" assertions assert that the plain-text version of your mailable contains a given string.
1257+
12541258
<a name="testing-mailable-sending"></a>
12551259
### Testing Mailable Sending
12561260

@@ -1462,6 +1466,10 @@ class LogMessage
14621466
Laravel includes a variety of mail transports; however, you may wish to write your own transports to deliver email via other services that Laravel does not support out of the box. To get started, define a class that extends the `Symfony\Component\Mailer\Transport\AbstractTransport` class. Then, implement the `doSend` and `__toString` methods on your transport:
14631467

14641468
```php
1469+
<?php
1470+
1471+
namespace App\Mail;
1472+
14651473
use MailchimpTransactional\ApiClient;
14661474
use Symfony\Component\Mailer\SentMessage;
14671475
use Symfony\Component\Mailer\Transport\AbstractTransport;
@@ -1506,7 +1514,7 @@ class MailchimpTransport extends AbstractTransport
15061514
}
15071515
```
15081516

1509-
Once you've defined your custom transport, you may register it via the `extend` method provided by the `Mail` facade. Typically, this should be done within the `boot` method of your application's `AppServiceProvider` service provider. A `$config` argument will be passed to the closure provided to the `extend` method. This argument will contain the configuration array defined for the mailer in the application's `config/mail.php` configuration file:
1517+
Once you've defined your custom transport, you may register it via the `extend` method provided by the `Mail` facade. Typically, this should be done within the `boot` method of your application's `AppServiceProvider`. A `$config` argument will be passed to the closure provided to the `extend` method. This argument will contain the configuration array defined for the mailer in the application's `config/mail.php` configuration file:
15101518

15111519
```php
15121520
use App\Mail\MailchimpTransport;
@@ -1551,7 +1559,7 @@ Once the Brevo mailer package has been installed, you may add an entry for your
15511559

15521560
```php
15531561
'brevo' => [
1554-
'key' => 'your-api-key',
1562+
'key' => env('BREVO_API_KEY'),
15551563
],
15561564
```
15571565

original-en/mocking.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ If you would like to [spy](http://docs.mockery.io/en/latest/reference/spies.html
165165

166166
use Illuminate\Support\Facades\Cache;
167167

168-
test('values are be stored in cache', function () {
168+
test('values are stored in cache', function () {
169169
Cache::spy();
170170

171171
$response = $this->get('/');
@@ -179,7 +179,7 @@ test('values are be stored in cache', function () {
179179
```php tab=PHPUnit
180180
use Illuminate\Support\Facades\Cache;
181181

182-
public function test_values_are_be_stored_in_cache(): void
182+
public function test_values_are_stored_in_cache(): void
183183
{
184184
Cache::spy();
185185

original-en/notifications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function via(object $notifiable): array
145145
### Queueing Notifications
146146

147147
> [!WARNING]
148-
> Before queueing notifications you should configure your queue and [start a worker](/docs/{{version}}/queues#running-the-queue-worker).
148+
> Before queueing notifications, you should configure your queue and [start a worker](/docs/{{version}}/queues#running-the-queue-worker).
149149
150150
Sending notifications can take time, especially if the channel needs to make an external API call to deliver the notification. To speed up your application's response time, let your notification be queued by adding the `ShouldQueue` interface and `Queueable` trait to your class. The interface and trait are already imported for all notifications generated using the `make:notification` command, so you may immediately add them to your notification class:
151151

original-en/pennant.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ Of course, feature scopes are not limited to "users". Imagine you have built a n
523523

524524
```php
525525
use App\Models\Team;
526-
use Carbon\Carbon;
526+
use Illuminate\Support\Carbon;
527527
use Illuminate\Support\Lottery;
528528
use Laravel\Pennant\Feature;
529529

original-en/prompts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -858,8 +858,8 @@ The `spin` function displays a spinner along with an optional message while exec
858858
use function Laravel\Prompts\spin;
859859

860860
$response = spin(
861-
message: 'Fetching response...',
862-
callback: fn () => Http::get('http://example.com')
861+
callback: fn () => Http::get('http://example.com'),
862+
message: 'Fetching response...'
863863
);
864864
```
865865

original-en/pulse.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,9 @@ Pulse will use your default [Redis connection](/docs/{{version}}/redis#configura
486486
PULSE_REDIS_CONNECTION=pulse
487487
```
488488

489+
> [!WARNING]
490+
> When using the Redis ingest driver, your Pulse installation should always use a different Redis connection than your Redis powered queue, if applicable.
491+
489492
When using the Redis ingest, you will need to run the `pulse:work` command to monitor the stream and move entries from Redis into Pulse's database tables.
490493

491494
```php

0 commit comments

Comments
 (0)