Skip to content

Commit 6858589

Browse files
committed
2025-11-07までの原文変更点反映。
1 parent e5ad0d4 commit 6858589

28 files changed

+425
-41
lines changed

original-en/artisan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ You may assign default values to options by specifying the default value after t
370370
To assign a shortcut when defining an option, you may specify it before the option name and use the `|` character as a delimiter to separate the shortcut from the full option name:
371371

372372
```php
373-
'mail:send {user} {--Q|queue}'
373+
'mail:send {user} {--Q|queue=}'
374374
```
375375

376376
When invoking the command on your terminal, option shortcuts should be prefixed with a single hyphen and no `=` character should be included when specifying a value for the option:

original-en/billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
When upgrading to a new version of Cashier, it's important that you carefully review [the upgrade guide](https://github.com/laravel/cashier-stripe/blob/master/UPGRADE.md).
8383

8484
> [!WARNING]
85-
> To prevent breaking changes, Cashier uses a fixed Stripe API version. Cashier 16 utilizes Stripe API version `2025-07-30.basil`. The Stripe API version will be updated on minor releases in order to make use of new Stripe features and improvements.
85+
> To prevent breaking changes, Cashier uses a fixed Stripe API version. Cashier 16 utilizes Stripe API version `2025-06-30.basil`. The Stripe API version will be updated on minor releases in order to make use of new Stripe features and improvements.
8686
8787
<a name="installation"></a>
8888
## Installation

original-en/contributions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ The Laravel source code is managed on GitHub, and there are repositories for eac
2828

2929
- [Laravel Application](https://github.com/laravel/laravel)
3030
- [Laravel Art](https://github.com/laravel/art)
31+
- [Laravel Boost](https://github.com/laravel/boost)
3132
- [Laravel Documentation](https://github.com/laravel/docs)
3233
- [Laravel Dusk](https://github.com/laravel/dusk)
3334
- [Laravel Cashier Stripe](https://github.com/laravel/cashier)

original-en/eloquent-collections.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,12 @@ In addition, the `Illuminate\Database\Eloquent\Collection` class provides a supe
8181
[makeHidden](#method-makeHidden)
8282
[only](#method-only)
8383
[partition](#method-partition)
84+
[setAppends](#method-setAppends)
8485
[setVisible](#method-setVisible)
8586
[setHidden](#method-setHidden)
8687
[toQuery](#method-toquery)
8788
[unique](#method-unique)
89+
[withoutAppends](#method-withoutAppends)
8890

8991
</div>
9092

@@ -251,6 +253,15 @@ dump($partition[0]::class); // Illuminate\Database\Eloquent\Collection
251253
dump($partition[1]::class); // Illuminate\Database\Eloquent\Collection
252254
```
253255

256+
<a name="method-setAppends"></a>
257+
#### `setAppends($attributes)` {.collection-method}
258+
259+
The `setAppends` method temporarily overrides all of the [appended attributes](/docs/{{version}}/eloquent-serialization#appending-values-to-json) on each model in the collection:
260+
261+
```php
262+
$users = $users->setAppends(['is_admin']);
263+
```
264+
254265
<a name="method-setVisible"></a>
255266
#### `setVisible($attributes)` {.collection-method}
256267

@@ -293,6 +304,15 @@ The `unique` method returns all of the unique models in the collection. Any mode
293304
$users = $users->unique();
294305
```
295306

307+
<a name="method-withoutAppends"></a>
308+
#### `withoutAppends($attributes)` {.collection-method}
309+
310+
The `withoutAppends` method temporarily removes all of the [appended attributes](/docs/{{version}}/eloquent-serialization#appending-values-to-json) on each model in the collection:
311+
312+
```php
313+
$users = $users->withoutAppends();
314+
```
315+
296316
<a name="custom-collections"></a>
297317
## Custom Collections
298318

original-en/eloquent-resources.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,30 @@ return User::findOrFail($id)->toResource();
9898

9999
When invoking the `toResource` method, Laravel will attempt to locate a resource that matches the model's name and is optionally suffixed with `Resource` within the `Http\Resources` namespace closest to the model's namespace.
100100

101+
If your resource class doesn't follow this naming convention or is located in a different namespace, you may specify the default resource for the model using the `UseResource` attribute:
102+
103+
```php
104+
<?php
105+
106+
namespace App\Models;
107+
108+
use App\Http\Resources\CustomUserResource;
109+
use Illuminate\Database\Eloquent\Model;
110+
use Illuminate\Database\Eloquent\Attributes\UseResource;
111+
112+
#[UseResource(CustomUserResource::class)]
113+
class User extends Model
114+
{
115+
// ...
116+
}
117+
```
118+
119+
Alternatively, you may specify resource class by passing it to the `toResource` method:
120+
121+
```php
122+
return User::findOrFail($id)->toResource(CustomUserResource::class);
123+
```
124+
101125
<a name="resource-collections"></a>
102126
### Resource Collections
103127

@@ -120,6 +144,30 @@ return User::all()->toResourceCollection();
120144

121145
When invoking the `toResourceCollection` method, Laravel will attempt to locate a resource collection that matches the model's name and is suffixed with `Collection` within the `Http\Resources` namespace closest to the model's namespace.
122146

147+
If your resource collection class doesn't follow this naming convention or is located in a different namespace, you may specify the default resource collection for the model using the `UseResourceCollection` attribute:
148+
149+
```php
150+
<?php
151+
152+
namespace App\Models;
153+
154+
use App\Http\Resources\CustomUserCollection;
155+
use Illuminate\Database\Eloquent\Model;
156+
use Illuminate\Database\Eloquent\Attributes\UseResourceCollection;
157+
158+
#[UseResourceCollection(CustomUserCollection::class)]
159+
class User extends Model
160+
{
161+
// ...
162+
}
163+
```
164+
165+
Alternatively, you may specify the resource collection class by passing it to the `toResourceCollection` method:
166+
167+
```php
168+
return User::all()->toResourceCollection(CustomUserCollection::class);
169+
```
170+
123171
<a name="custom-resource-collections"></a>
124172
#### Custom Resource Collections
125173

original-en/http-client.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,14 @@ $responses = Http::pool(fn (Pool $pool) => [
537537
return $responses['first']->ok();
538538
```
539539

540+
The maximum concurrency of the request pool may be controlled by providing the `concurrency` argument to the `pool` method. This value determines the maximum number of HTTP requests that may be concurrently in-flight while processing the request pool:
541+
542+
```php
543+
$responses = Http::pool(fn (Pool $pool) => [
544+
// ...
545+
], concurrency: 5);
546+
```
547+
540548
<a name="customizing-concurrent-requests"></a>
541549
#### Customizing Concurrent Requests
542550

@@ -598,6 +606,14 @@ $responses = Http::batch(fn (Batch $batch) => [
598606

599607
After a `batch` is started by calling the `send` method, you can't add new requests to it. Trying to do so will result in a `Illuminate\Http\Client\BatchInProgressException` exception being thrown.
600608

609+
The maximum concurrency of the request batch may be controlled via the `concurrency` method. This value determines the maximum number of HTTP requests that may be concurrently in-flight while processing the request batch:
610+
611+
```php
612+
$responses = Http::batch(fn (Batch $batch) => [
613+
// ...
614+
])->concurrency(5)->send();
615+
```
616+
601617
<a name="inspecting-batches"></a>
602618
#### Inspecting Batches
603619

original-en/mail.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Next, set the `default` option in your application's `config/mail.php` configura
111111

112112
```php
113113
'postmark' => [
114-
'token' => env('POSTMARK_TOKEN'),
114+
'key' => env('POSTMARK_API_TOKEN'),
115115
],
116116
```
117117

@@ -142,7 +142,7 @@ Next, set the `default` option in your application's `config/mail.php` configura
142142

143143
```php
144144
'resend' => [
145-
'key' => env('RESEND_KEY'),
145+
'key' => env('RESEND_API_KEY'),
146146
],
147147
```
148148

original-en/passport.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,7 @@ namespace App\Models;
848848

849849
use Illuminate\Foundation\Auth\User as Authenticatable;
850850
use Illuminate\Notifications\Notifiable;
851+
use Laravel\Passport\Bridge\Client;
851852
use Laravel\Passport\Contracts\OAuthenticatable;
852853
use Laravel\Passport\HasApiTokens;
853854

@@ -858,7 +859,7 @@ class User extends Authenticatable implements OAuthenticatable
858859
/**
859860
* Find the user instance for the given username.
860861
*/
861-
public function findForPassport(string $username): User
862+
public function findForPassport(string $username, Client $client): User
862863
{
863864
return $this->where('username', $username)->first();
864865
}

original-en/queues.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,12 @@ RecordDelivery::dispatch($order)->onConnection('deferred');
979979

980980
The `deferred` connection also serves as the default [failover queue](#queue-failover).
981981

982+
Similarly, the `background` connection processes jobs after the HTTP response has been sent to the user; however, the job is processed in a separately spawned PHP process, allowing the PHP-FPM / application worker to be available to handle another incoming HTTP request:
983+
984+
```php
985+
RecordDelivery::dispatch($order)->onConnection('background');
986+
```
987+
982988
<a name="jobs-and-database-transactions"></a>
983989
### Jobs & Database Transactions
984990

@@ -1551,7 +1557,7 @@ php artisan queue:work database
15511557
```
15521558

15531559
> [!NOTE]
1554-
> You do not need to run a worker for connections using the `sync` or `deferred` queue drivers since those drivers process jobs within the current PHP process.
1560+
> You do not need to run a worker for connections using the `sync`, `background`, or `deferred` queue drivers since those drivers process jobs within the current PHP process.
15551561
15561562
When a queue connection operation fails and failover is activated, Laravel will dispatch the `Illuminate\Queue\Events\QueueFailedOver` event, allowing you to report or log that a queue connection has failed.
15571563

original-en/routing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ use Illuminate\Support\Facades\RateLimiter;
851851
/**
852852
* Bootstrap any application services.
853853
*/
854-
protected function boot(): void
854+
public function boot(): void
855855
{
856856
RateLimiter::for('api', function (Request $request) {
857857
return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
@@ -869,7 +869,7 @@ use Illuminate\Support\Facades\RateLimiter;
869869
/**
870870
* Bootstrap any application services.
871871
*/
872-
protected function boot(): void
872+
public function boot(): void
873873
{
874874
RateLimiter::for('global', function (Request $request) {
875875
return Limit::perMinute(1000);

0 commit comments

Comments
 (0)