Skip to content

Commit 3798de1

Browse files
committed
2025-08-04までの原文変更点反映。
1 parent 4cf5d1f commit 3798de1

23 files changed

+117
-31
lines changed

original-en/artisan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ $name = $this->choice(
659659
<a name="writing-output"></a>
660660
### Writing Output
661661

662-
To send output to the console, you may use the `line`, `info`, `comment`, `question`, `warn`, and `error` methods. Each of these methods will use appropriate ANSI colors for their purpose. For example, let's display some general information to the user. Typically, the `info` method will display in the console as green colored text:
662+
To send output to the console, you may use the `line`, `newLine`, `info`, `comment`, `question`, `warn`, `alert`, and `error` methods. Each of these methods will use appropriate ANSI colors for their purpose. For example, let's display some general information to the user. Typically, the `info` method will display in the console as green colored text:
663663

664664
```php
665665
/**

original-en/controllers.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,15 @@ Route::resources([
196196
]);
197197
```
198198

199+
The `softDeletableResources` method registers many resources controllers that all use the `withTrashed` method:
200+
201+
```php
202+
Route::softDeletableResources([
203+
'photos' => PhotoController::class,
204+
'posts' => PostController::class,
205+
]);
206+
```
207+
199208
<a name="actions-handled-by-resource-controllers"></a>
200209
#### Actions Handled by Resource Controllers
201210

original-en/eloquent.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ $article->id; // "01gd4d3tgrrfqeda94gdbtdk5c"
278278
<a name="timestamps"></a>
279279
### Timestamps
280280

281-
By default, Eloquent expects `created_at` and `updated_at` columns to exist on your model's corresponding database table. Eloquent will automatically set these column's values when models are created or updated. If you do not want these columns to be automatically managed by Eloquent, you should define a `$timestamps` property on your model with a value of `false`:
281+
By default, Eloquent expects `created_at` and `updated_at` columns to exist on your model's corresponding database table. Eloquent will automatically set these column's values when models are created or updated. If you do not want these columns to be automatically managed by Eloquent, you should define a `$timestamps` property on your model with a value of `false`:
282282

283283
```php
284284
<?php
@@ -676,7 +676,7 @@ Route::get('/api/flights/{id}', function (string $id) {
676676
<a name="retrieving-or-creating-models"></a>
677677
### Retrieving or Creating Models
678678

679-
The `firstOrCreate` method will attempt to locate a database record using the given column / value pairs. If the model cannot be found in the database, a record will be inserted with the attributes resulting from merging the first array argument with the optional second array argument:
679+
The `firstOrCreate` method will attempt to locate a database record using the given column / value pairs. If the model cannot be found in the database, a record will be inserted with the attributes resulting from merging the first array argument with the optional second array argument.
680680

681681
The `firstOrNew` method, like `firstOrCreate`, will attempt to locate a record in the database matching the given attributes. However, if a model is not found, a new model instance will be returned. Note that the model returned by `firstOrNew` has not yet been persisted to the database. You will need to manually call the `save` method to persist it:
682682

@@ -1040,7 +1040,7 @@ $flight->delete();
10401040
<a name="deleting-an-existing-model-by-its-primary-key"></a>
10411041
#### Deleting an Existing Model by its Primary Key
10421042

1043-
In the example above, we are retrieving the model from the database before calling the `delete` method. However, if you know the primary key of the model, you may delete the model without explicitly retrieving it by calling the `destroy` method. In addition to accepting the single primary key, the `destroy` method will accept multiple primary keys, an array of primary keys, or a [collection](/docs/{{version}}/collections) of primary keys:
1043+
In the example above, we are retrieving the model from the database before calling the `delete` method. However, if you know the primary key of the model, you may delete the model without explicitly retrieving it by calling the `destroy` method. In addition to accepting the single primary key, the `destroy` method will accept multiple primary keys, an array of primary keys, or a [collection](/docs/{{version}}/collections) of primary keys:
10441044

10451045
```php
10461046
Flight::destroy(1);

original-en/events.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ class SendShipmentNotification implements ShouldQueue
555555

556556
If one of your queued listeners is encountering an error, you likely do not want it to keep retrying indefinitely. Therefore, Laravel provides various ways to specify how many times or for how long a listener may be attempted.
557557

558-
You may define a `$tries` property on your listener class to specify how many times the listener may be attempted before it is considered to have failed:
558+
You may define a `tries` property on your listener class to specify how many times the listener may be attempted before it is considered to have failed:
559559

560560
```php
561561
<?php
@@ -598,7 +598,7 @@ If both `retryUntil` and `tries` are defined, Laravel gives precedence to the `r
598598
<a name="specifying-queued-listener-backoff"></a>
599599
#### Specifying Queued Listener Backoff
600600

601-
If you would like to configure how many seconds Laravel should wait before retrying a listener that has encountered an exception, you may do so by defining a `$backoff` property on your listener class:
601+
If you would like to configure how many seconds Laravel should wait before retrying a listener that has encountered an exception, you may do so by defining a `backoff` property on your listener class:
602602

603603
```php
604604
/**
@@ -638,7 +638,7 @@ public function backoff(OrderShipped $event): array
638638
<a name="specifying-queued-listener-max-exceptions"></a>
639639
#### Specifying Queued Listener Max Exceptions
640640

641-
Sometimes you may wish to specify that a queued listener may be attempted many times, but should fail if the retries are triggered by a given number of unhandled exceptions (as opposed to being released by the `release` method directly). To accomplish this, you may define a `$maxExceptions` property on your listener class:
641+
Sometimes you may wish to specify that a queued listener may be attempted many times, but should fail if the retries are triggered by a given number of unhandled exceptions (as opposed to being released by the `release` method directly). To accomplish this, you may define a `maxExceptions` property on your listener class:
642642

643643
```php
644644
<?php
@@ -682,7 +682,7 @@ In this example, the listener will be retried up to 25 times. However, the liste
682682
<a name="specifying-queued-listener-timeout"></a>
683683
#### Specifying Queued Listener Timeout
684684

685-
Often, you know roughly how long you expect your queued listeners to take. For this reason, Laravel allows you to specify a "timeout" value. If a listener is processing for longer than the number of seconds specified by the timeout value, the worker processing the listener will exit with an error. You may define the maximum number of seconds a listener should be allowed to run by defining a `$timeout` property on your listener class:
685+
Often, you know roughly how long you expect your queued listeners to take. For this reason, Laravel allows you to specify a "timeout" value. If a listener is processing for longer than the number of seconds specified by the timeout value, the worker processing the listener will exit with an error. You may define the maximum number of seconds a listener should be allowed to run by defining a `timeout` property on your listener class:
686686

687687
```php
688688
<?php
@@ -703,7 +703,7 @@ class SendShipmentNotification implements ShouldQueue
703703
}
704704
```
705705

706-
If you would like to indicate that a listener should be marked as failed on timeout, you may define the `$failOnTimeout` property on the listener class:
706+
If you would like to indicate that a listener should be marked as failed on timeout, you may define the `failOnTimeout` property on the listener class:
707707

708708
```php
709709
<?php

original-en/localization.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,18 @@ if (App::isLocale('en')) {
9090
<a name="pluralization-language"></a>
9191
### Pluralization Language
9292

93+
<style>
94+
.code-list-no-flex-break code {
95+
display: contents !important;
96+
}
97+
</style>
98+
99+
<div class="code-list-no-flex-break">
100+
93101
You may instruct Laravel's "pluralizer", which is used by Eloquent and other portions of the framework to convert singular strings to plural strings, to use a language other than English. This may be accomplished by invoking the `useLanguage` method within the `boot` method of one of your application's service providers. The pluralizer's currently supported languages are: `french`, `norwegian-bokmal`, `portuguese`, `spanish`, and `turkish`:
94102

103+
</div>
104+
95105
```php
96106
use Illuminate\Support\Pluralizer;
97107

original-en/logging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ class CustomizeFormatter
413413
<a name="creating-monolog-handler-channels"></a>
414414
### Creating Monolog Handler Channels
415415

416-
Monolog has a variety of [available handlers](https://github.com/Seldaek/monolog/tree/main/src/Monolog/Handler) and Laravel does not include a built-in channel for each one. In some cases, you may wish to create a custom channel that is merely an instance of a specific Monolog handler that does not have a corresponding Laravel log driver. These channels can be easily created using the `monolog` driver.
416+
Monolog has a variety of [available handlers](https://github.com/Seldaek/monolog/tree/main/src/Monolog/Handler) and Laravel does not include a built-in channel for each one. In some cases, you may wish to create a custom channel that is merely an instance of a specific Monolog handler that does not have a corresponding Laravel log driver. These channels can be easily created using the `monolog` driver.
417417

418418
When using the `monolog` driver, the `handler` configuration option is used to specify which handler will be instantiated. Optionally, any constructor parameters the handler needs may be specified using the `handler_with` configuration option:
419419

original-en/mail.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1363,7 +1363,8 @@ Mail::assertSent(OrderShipped::class, function (OrderShipped $mail) use ($user)
13631363
$mail->hasBcc('...') &&
13641364
$mail->hasReplyTo('...') &&
13651365
$mail->hasFrom('...') &&
1366-
$mail->hasSubject('...');
1366+
$mail->hasSubject('...') &&
1367+
$mail->usesMailer('ses');
13671368
});
13681369
```
13691370

original-en/packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ Laravel's built-in `about` Artisan command provides a synopsis of the applicatio
339339
use Illuminate\Foundation\Console\AboutCommand;
340340

341341
/**
342-
* Bootstrap any application services.
342+
* Bootstrap any package services.
343343
*/
344344
public function boot(): void
345345
{

original-en/passport.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ To restrict access to the route to specific scopes, you may provide a list of th
969969
```php
970970
Route::get('/orders', function (Request $request) {
971971
// Access token is valid, the client is resource owner, and has both "servers:read" and "servers:create" scopes...
972-
})->middleware(EnsureClientIsResourceOwner::using('servers:read', 'servers:create');
972+
})->middleware(EnsureClientIsResourceOwner::using('servers:read', 'servers:create'));
973973
```
974974

975975
<a name="retrieving-tokens"></a>
@@ -1194,7 +1194,7 @@ use Laravel\Passport\Http\Middleware\CheckToken;
11941194

11951195
Route::get('/orders', function () {
11961196
// Access token has both "orders:read" and "orders:create" scopes...
1197-
})->middleware(['auth:api', CheckToken::using('orders:read', 'orders:create');
1197+
})->middleware(['auth:api', CheckToken::using('orders:read', 'orders:create')]);
11981198
```
11991199

12001200
<a name="check-for-any-scopes"></a>
@@ -1207,7 +1207,7 @@ use Laravel\Passport\Http\Middleware\CheckTokenForAnyScope;
12071207

12081208
Route::get('/orders', function () {
12091209
// Access token has either "orders:read" or "orders:create" scope...
1210-
})->middleware(['auth:api', CheckTokenForAnyScope::using('orders:read', 'orders:create');
1210+
})->middleware(['auth:api', CheckTokenForAnyScope::using('orders:read', 'orders:create')]);
12111211
```
12121212

12131213
<a name="checking-scopes-on-a-token-instance"></a>

original-en/queries.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,10 @@ Laravel also supports querying JSON column types on databases that provide suppo
696696
$users = DB::table('users')
697697
->where('preferences->dining->meal', 'salad')
698698
->get();
699+
700+
$users = DB::table('users')
701+
->whereIn('preferences->dining->meal', ['pasta', 'salad', 'sandwiches'])
702+
->get();
699703
```
700704

701705
You may use the `whereJsonContains` and `whereJsonDoesntContain` methods to query JSON arrays:

0 commit comments

Comments
 (0)