2024-12-16までの原文変更点反映。

Author: HiroKws

original-en/billing.md

@@ -35,7 +35,7 @@
     - [Subscription Quantity](#subscription-quantity)
     - [Subscriptions With Multiple Products](#subscriptions-with-multiple-products)
     - [Multiple Subscriptions](#multiple-subscriptions)
-    - [Metered Billing](#metered-billing)
+    - [Usage Based Billing](#usage-based-billing)
     - [Subscription Taxes](#subscription-taxes)
     - [Subscription Anchor Date](#subscription-anchor-date)
     - [Canceling Subscriptions](#cancelling-subscriptions)
@@ -1309,12 +1309,12 @@ Of course, you may also cancel the subscription entirely:
 
     $user->subscription('swimming')->cancel();
 
-<a name="metered-billing"></a>
-### Metered Billing
+<a name="usage-based-billing"></a>
+### Usage Based Billing
 
-[Metered billing](https://stripe.com/docs/billing/subscriptions/metered-billing) allows you to charge customers based on their product usage during a billing cycle. For example, you may charge customers based on the number of text messages or emails they send per month.
+[Usage based billing](https://stripe.com/docs/billing/subscriptions/metered-billing) allows you to charge customers based on their product usage during a billing cycle. For example, you may charge customers based on the number of text messages or emails they send per month.
 
-To start using metered billing, you will first need to create a new product in your Stripe dashboard with a metered price. Then, use the `meteredPrice` to add the metered price ID to a customer subscription:
+To start using usage billing, you will first need to create a new product in your Stripe dashboard with a [usage based billing model](https://docs.stripe.com/billing/subscriptions/usage-based/implementation-guide) and a [meter](https://docs.stripe.com/billing/subscriptions/usage-based/recording-usage#configure-meter). After creating the meter, store the associated event name and meter ID, which you will need to report and retrieve usage. Then, use the `meteredPrice` method to add the metered price ID to a customer subscription:
 
     use Illuminate\Http\Request;
 
@@ -1340,54 +1340,33 @@ You may also start a metered subscription via [Stripe Checkout](#checkout):
 <a name="reporting-usage"></a>
 #### Reporting Usage
 
-As your customer uses your application, you will report their usage to Stripe so that they can be billed accurately. To increment the usage of a metered subscription, you may use the `reportUsage` method:
+As your customer uses your application, you will report their usage to Stripe so that they can be billed accurately. To report the usage of a metered event, you may use the `reportMeterEvent` method on your `Billable` model:
 
     $user = User::find(1);
 
-    $user->subscription('default')->reportUsage();
+    $user->reportMeterEvent('emails-sent');
 
 By default, a "usage quantity" of 1 is added to the billing period. Alternatively, you may pass a specific amount of "usage" to add to the customer's usage for the billing period:
 
     $user = User::find(1);
 
-    $user->subscription('default')->reportUsage(15);
+    $user->reportMeterEvent('emails-sent', quantity: 15);
 
-If your application offers multiple prices on a single subscription, you will need to use the `reportUsageFor` method to specify the metered price you want to report usage for:
+To retrieve a customer's event summary for a meter, you may use a `Billable` instance's `meterEventSummaries` method:
 
     $user = User::find(1);
 
-    $user->subscription('default')->reportUsageFor('price_metered', 15);
+    $meterUsage = $user->meterEventSummaries($meterId);
 
-Sometimes, you may need to update usage which you have previously reported. To accomplish this, you may pass a timestamp or a `DateTimeInterface` instance as the second parameter to `reportUsage`. When doing so, Stripe will update the usage that was reported at that given time. You can continue to update previous usage records as the given date and time is still within the current billing period:
+    $meterUsage->first()->aggregated_value // 10
 
-    $user = User::find(1);
-
-    $user->subscription('default')->reportUsage(5, $timestamp);
-
-<a name="retrieving-usage-records"></a>
-#### Retrieving Usage Records
-
-To retrieve a customer's past usage, you may use a subscription instance's `usageRecords` method:
-
-    $user = User::find(1);
-
-    $usageRecords = $user->subscription('default')->usageRecords();
+Please refer to Stripe's [Meter Event Summary object documentation](https://docs.stripe.com/api/billing/meter-event_summary/object) for more information on meter event summaries.
 
-If your application offers multiple prices on a single subscription, you may use the `usageRecordsFor` method to specify the metered price that you wish to retrieve usage records for:
+To [list all meters](https://docs.stripe.com/api/billing/meter/list), you may use a `Billable` instance's `meters` method:
 
     $user = User::find(1);
 
-    $usageRecords = $user->subscription('default')->usageRecordsFor('price_metered');
-
-The `usageRecords` and `usageRecordsFor` methods return a Collection instance containing an associative array of usage records. You may iterate over this array to display a customer's total usage:
-
-    @foreach ($usageRecords as $usageRecord)
-        - Period Starting: {{ $usageRecord['period']['start'] }}
-        - Period Ending: {{ $usageRecord['period']['end'] }}
-        - Total Usage: {{ $usageRecord['total_usage'] }}
-    @endforeach
-
-For a full reference of all usage data returned and how to use Stripe's cursor based pagination, please consult [the official Stripe API documentation](https://stripe.com/docs/api/usage_records/subscription_item_summary_list).
+    $user->meters();
 
 <a name="subscription-taxes"></a>
 ### Subscription Taxes

original-en/filesystem.md

@@ -54,7 +54,7 @@ When using the `local` driver, all file operations are relative to the `root` di
 
 The `public` disk included in your application's `filesystems` configuration file is intended for files that are going to be publicly accessible. By default, the `public` disk uses the `local` driver and stores its files in `storage/app/public`.
 
-To make these files accessible from the web, you should create a symbolic link from `public/storage` to `storage/app/public`. Utilizing this folder convention will keep your publicly accessible files in one directory that can be easily shared across deployments when using zero down-time deployment systems like [Envoyer](https://envoyer.io).
+To make these files accessible from the web, you should create a symbolic link from source directory `storage/app/public` to target directory `public/storage`. Utilizing this folder convention will keep your publicly accessible files in one directory that can be easily shared across deployments when using zero down-time deployment systems like [Envoyer](https://envoyer.io).
 
 To create the symbolic link, you may use the `storage:link` Artisan command:
 

original-en/http-client.md

@@ -337,6 +337,16 @@ If you would like to perform some additional logic before the exception is throw
         // ...
     })->json();
 
+By default, `RequestException` messages are truncated to 120 characters when logged or reported. To customize or disable this behavior, you may utilize the `truncateRequestExceptionsAt` and `dontTruncateRequestExceptions` methods when configuring your application's exception handling behavior in your `bootstrap/app.php` file:
+
+    ->withExceptions(function (Exceptions $exceptions) {
+        // Truncate request exception messages to 240 characters...
+        $exceptions->truncateRequestExceptionsAt(240);
+
+        // Disable request exception message truncation...
+        $exceptions->dontTruncateRequestExceptions();
+    })
+
 <a name="guzzle-middleware"></a>
 ### Guzzle Middleware
 

original-en/installation.md

@@ -66,16 +66,16 @@ Before creating your first Laravel application, make sure that your local machin
 If you don't have PHP and Composer installed on your local machine, the following commands will install PHP, Composer, and the Laravel installer on macOS, Windows, or Linux:
 
 ```shell tab=macOS
-/bin/bash -c "$(curl -fsSL https://php.new/install/mac/8.3)"
+/bin/bash -c "$(curl -fsSL https://php.new/install/mac/8.4)"
 ```
 
 ```shell tab=Windows PowerShell
 # Run as administrator...
-Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://php.new/install/windows/8.3'))
+Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://php.new/install/windows/8.4'))
 ```
 
 ```shell tab=Linux
-/bin/bash -c "$(curl -fsSL https://php.new/install/linux/8.3)"
+/bin/bash -c "$(curl -fsSL https://php.new/install/linux/8.4)"
 ```
 
 After running one of the commands above, you should restart your terminal session. To update PHP, Composer, and the Laravel installer after installing them via `php.new`, you can re-run the command in your terminal.

original-en/pennant.md

@@ -815,7 +815,7 @@ Feature::for($users)->loadMissing([
 You may load all defined features using the `loadAll` method:
 
 ```php
-Feature::for($user)->loadAll();
+Feature::for($users)->loadAll();
 ```
 
 <a name="updating-values"></a>

original-en/sail.md

@@ -496,12 +496,25 @@ sail share --subdomain=my-sail-site
 <a name="debugging-with-xdebug"></a>
 ## Debugging With Xdebug
 
-Laravel Sail's Docker configuration includes support for [Xdebug](https://xdebug.org/), a popular and powerful debugger for PHP. In order to enable Xdebug, you will need to add a few variables to your application's `.env` file to [configure Xdebug](https://xdebug.org/docs/step_debug#mode). To enable Xdebug you must set the appropriate mode(s) before starting Sail:
+Laravel Sail's Docker configuration includes support for [Xdebug](https://xdebug.org/), a popular and powerful debugger for PHP. To enable Xdebug, ensure you have [published your Sail configuration](#sail-customization). Then, add the following variables to your application's `.env` file to configure Xdebug:
 
 ```ini
 SAIL_XDEBUG_MODE=develop,debug,coverage
 ```
 
+Next, ensure that your published `php.ini` file includes the following configuration so that Xdebug is activated in the specified modes:
+
+```ini
+[xdebug]
+xdebug.mode=${XDEBUG_MODE}
+```
+
+After modifying the `php.ini` file, remember to rebuild your Docker images so that your changes to the `php.ini` file take effect:
+
+```shell
+sail build --no-cache
+```
+
 #### Linux Host IP Configuration
 
 Internally, the `XDEBUG_CONFIG` environment variable is defined as `client_host=host.docker.internal` so that Xdebug will be properly configured for Mac and Windows (WSL2). If your local machine is running Linux and you're using Docker 20.10+, `host.docker.internal` is available, and no manual configuration is required.

original-en/scheduling.md

@@ -519,19 +519,24 @@ Using the `pingBefore` and `thenPing` methods, the scheduler can automatically p
              ->pingBefore($url)
              ->thenPing($url);
 
-The `pingBeforeIf` and `thenPingIf` methods may be used to ping a given URL only if a given condition is `true`:
+The `pingOnSuccess` and `pingOnFailure` methods may be used to ping a given URL only if the task succeeds or fails. A failure indicates that the scheduled Artisan or system command terminated with a non-zero exit code:
 
     Schedule::command('emails:send')
              ->daily()
-             ->pingBeforeIf($condition, $url)
-             ->thenPingIf($condition, $url);
+             ->pingOnSuccess($successUrl)
+             ->pingOnFailure($failureUrl);
 
-The `pingOnSuccess` and `pingOnFailure` methods may be used to ping a given URL only if the task succeeds or fails. A failure indicates that the scheduled Artisan or system command terminated with a non-zero exit code:
+The `pingBeforeIf`,`thenPingIf`,`pingOnSuccessIf`, and `pingOnFailureIf` methods may be used to ping a given URL only if a given condition is `true`:
 
     Schedule::command('emails:send')
              ->daily()
-             ->pingOnSuccess($successUrl)
-             ->pingOnFailure($failureUrl);
+             ->pingBeforeIf($condition, $url)
+             ->thenPingIf($condition, $url);             
+
+    Schedule::command('emails:send')
+             ->daily()
+             ->pingOnSuccessIf($condition, $successUrl)
+             ->pingOnFailureIf($condition, $failureUrl);
 
 <a name="events"></a>
 ## Events

original-en/telescope.md

@@ -78,7 +78,7 @@ After running `telescope:install`, you should remove the `TelescopeServiceProvid
      */
     public function register(): void
     {
-        if ($this->app->environment('local')) {
+        if ($this->app->environment('local') && class_exists(\Laravel\Telescope\TelescopeServiceProvider::class)) {
             $this->app->register(\Laravel\Telescope\TelescopeServiceProvider::class);
             $this->app->register(TelescopeServiceProvider::class);
         }

original-en/urls.md

@@ -238,20 +238,9 @@ Setting URL default values can interfere with Laravel's handling of implicit mod
 
 ```php
 ->withMiddleware(function (Middleware $middleware) {
-    $middleware->priority([
-        \Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests::class,
-        \Illuminate\Cookie\Middleware\EncryptCookies::class,
-        \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-        \Illuminate\Session\Middleware\StartSession::class,
-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-        \Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class,
-        \Illuminate\Contracts\Auth\Middleware\AuthenticatesRequests::class,
-        \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        \Illuminate\Routing\Middleware\ThrottleRequestsWithRedis::class,
-        \Illuminate\Session\Middleware\AuthenticateSession::class,
-        \App\Http\Middleware\SetDefaultLocaleForUrls::class, // [tl! add]
-        \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        \Illuminate\Auth\Middleware\Authorize::class,
-    ]);
+    $middleware->prependToPriorityList(
+        before: \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        prepend: \App\Http\Middleware\SetDefaultLocaleForUrls::class,
+    );
 })
 ```

translation-ja/billing.md

@@ -1314,7 +1314,7 @@ Stripeの顧客は, サブスクリプションを同時に複数利用可能で
 
 [使用量ベースの料金](https://stripe.com/docs/billing/subscriptions/metered-billing)を使用すると、課金サイクル中の製品の利用状況に基づき顧客へ請求できます。たとえば、顧客が１か月に送信するテキストメッセージまたは電子メールの数に基づいて顧客に請求するケースが考えられます。
 
-使用量ベースの料金を使用開始するには、最初にStripeダッシュボードの従量制価格（metered price）で新しい製品を作成する必要があります。次に、`meteredPrice`を使用して、従量制の価格IDを顧客のサブスクリプションに追加します。
+使用量ベースの料金を使い始めるには、まずStripeダッシュボードで[利用量ベースモデル](https://docs.stripe.com/billing/subscriptions/usage-based/implementation-guide)と[メーター](https://docs.stripe.com/billing/subscriptions/usage-based/recording-usage#configure-meter)を使用して新しい商品を作成する必要があります。メーターを作成したら、関連するイベント名とメーターIDを保存します。次に、`meteredPrice`メソッドを使用して、顧客のサブスクリプションへメーター価格IDを追加します。
 
     use Illuminate\Http\Request;
 
@@ -1340,54 +1340,33 @@ Stripeの顧客は, サブスクリプションを同時に複数利用可能で
 <a name="reporting-usage"></a>
 #### 利用状況のレポート
 
-顧客がアプリケーションを使用しているとき、正確な請求ができるように、利用状況をStripeへ報告します。従量制サブスクリプションの使用量を増やすには、`reportUsage`メソッドを使用します。
+顧客がアプリケーションを使用しているとき、正確な請求ができるように、利用状況をStripeへ報告します。メーター付けしたイベントの使用状況を報告するには、`Billable`モデルの`reportMeterEvent`メソッドを使用します。
 
     $user = User::find(1);
 
-    $user->subscription('default')->reportUsage();
+    $user->reportMeterEvent('emails-sent');
 
 デフォルトでは、「使用量」１が請求期間に追加されます。または、指定の「使用量」を渡して、請求期間中の顧客の使用量に追加することもできます。
 
     $user = User::find(1);
 
-    $user->subscription('default')->reportUsage(15);
+    $user->reportMeterEvent('emails-sent', quantity: 15);
 
-アプリケーションが単一のサブスクリプションで複数の価格を提供している場合は、`reportUsageFor`メソッドを使用して、利用状況を報告する従量制価格を指定する必要があります。
+メーターに対する、顧客のイベント要約を取得するには、`Billable`インスタンスの`meterEventSummaries`メソッドを使用します。
 
     $user = User::find(1);
 
-    $user->subscription('default')->reportUsageFor('price_metered', 15);
+    $meterUsage = $user->meterEventSummaries($meterId);
 
-以前に報告した利用状況を更新する必要も起こるでしょう。これにはタイムスタンプまたは`DateTimeInterface`インスタンスを２番目のパラメータとして`reportUsage`に渡します。その際、Stripeはその時点で報告された利用状況を更新します。指定する日時は現在の請求期間内であるため、以前の使用記録を引き続き更新できます。
+    $meterUsage->first()->aggregated_value // 10
 
-    $user = User::find(1);
-
-    $user->subscription('default')->reportUsage(5, $timestamp);
-
-<a name="retrieving-usage-records"></a>
-#### 使用記録の取得
-
-顧客の過去の利用状況を取得するには、サブスクリプションインスタンスの`usageRecords`メソッドを使用します。
-
-    $user = User::find(1);
-
-    $usageRecords = $user->subscription('default')->usageRecords();
+Stripeの[メーターイベント要約のオブジェクトドキュメント](https://docs.stripe.com/api/billing/meter-event_summary/object)も参照してください。
 
-アプリケーションが１つのサブスクリプションで複数の価格を提供している場合は、`usageRecordsFor`メソッドを使用して、使用記録を取得する従量制価格を指定します。
+[全てのメーターをリストする](https://docs.stripe.com/api/billing/meter/list)には、`Billable`インスタンスの`meters`メソッドを使用します。
 
     $user = User::find(1);
 
-    $usageRecords = $user->subscription('default')->usageRecordsFor('price_metered');
-
-`usageRecords`メソッドと`usageRecordsFor`メソッドは、使用レコードの連想配列を含むCollectionインスタンスを返します。この配列を繰り返し処理して、顧客の合計使用量を表示できます。
-
-    @foreach ($usageRecords as $usageRecord)
-        - Period Starting: {{ $usageRecord['period']['start'] }}
-        - Period Ending: {{ $usageRecord['period']['end'] }}
-        - Total Usage: {{ $usageRecord['total_usage'] }}
-    @endforeach
-
-返されるすべての利用状況データの完全なリファレンスと、Stripeのカーソルベースのペジネーションの使用方法の詳細は、[Stripe公式のAPIドキュメント](https://stripe.com/docs/api/usage_records/subscription_item_summary_list)を参照してください。
+    $user->meters();
 
 <a name="subscription-taxes"></a>
 ### サブスクリプションの税率