fix conflicts

Author: taylorotwell

authorization.md

@@ -168,8 +168,8 @@ So far, we have only examined gates that return simple boolean values. However,
 
     Gate::define('edit-settings', function (User $user) {
         return $user->isAdmin
-                    ? Response::allow()
-                    : Response::deny('You must be an administrator.');
+            ? Response::allow()
+            : Response::deny('You must be an administrator.');
     });
 
 Even when you return an authorization response from your gate, the `Gate::allows` method will still return a simple boolean value; however, you may use the `Gate::inspect` method to get the full authorization response returned by the gate:
@@ -199,8 +199,8 @@ When an action is denied via a Gate, a `403` HTTP response is returned; however,
 
     Gate::define('edit-settings', function (User $user) {
         return $user->isAdmin
-                    ? Response::allow()
-                    : Response::denyWithStatus(404);
+            ? Response::allow()
+            : Response::denyWithStatus(404);
     });
 
 Because hiding resources via a `404` response is such a common pattern for web applications, the `denyAsNotFound` method is offered for convenience:
@@ -211,8 +211,8 @@ Because hiding resources via a `404` response is such a common pattern for web a
 
     Gate::define('edit-settings', function (User $user) {
         return $user->isAdmin
-                    ? Response::allow()
-                    : Response::denyAsNotFound();
+            ? Response::allow()
+            : Response::denyAsNotFound();
     });
 
 <a name="intercepting-gate-checks"></a>
@@ -362,8 +362,8 @@ So far, we have only examined policy methods that return simple boolean values.
     public function update(User $user, Post $post): Response
     {
         return $user->id === $post->user_id
-                    ? Response::allow()
-                    : Response::deny('You do not own this post.');
+            ? Response::allow()
+            : Response::deny('You do not own this post.');
     }
 
 When returning an authorization response from your policy, the `Gate::allows` method will still return a simple boolean value; however, you may use the `Gate::inspect` method to get the full authorization response returned by the gate:
@@ -399,8 +399,8 @@ When an action is denied via a policy method, a `403` HTTP response is returned;
     public function update(User $user, Post $post): Response
     {
         return $user->id === $post->user_id
-                    ? Response::allow()
-                    : Response::denyWithStatus(404);
+            ? Response::allow()
+            : Response::denyWithStatus(404);
     }
 
 Because hiding resources via a `404` response is such a common pattern for web applications, the `denyAsNotFound` method is offered for convenience:
@@ -415,8 +415,8 @@ Because hiding resources via a `404` response is such a common pattern for web a
     public function update(User $user, Post $post): Response
     {
         return $user->id === $post->user_id
-                    ? Response::allow()
-                    : Response::denyAsNotFound();
+            ? Response::allow()
+            : Response::denyAsNotFound();
     }
 
 <a name="methods-without-models"></a>

billing.md

@@ -842,8 +842,8 @@ The amount of time a customer has to pay their invoice before their subscription
 If you would like to set a specific [quantity](https://stripe.com/docs/billing/subscriptions/quantities) for the price when creating the subscription, you should invoke the `quantity` method on the subscription builder before creating the subscription:
 
     $user->newSubscription('default', 'price_monthly')
-         ->quantity(5)
-         ->create($paymentMethod);
+        ->quantity(5)
+        ->create($paymentMethod);
 
 <a name="additional-details"></a>
 #### Additional Details
@@ -862,14 +862,14 @@ If you would like to specify additional [customer](https://stripe.com/docs/api/c
 If you would like to apply a coupon when creating the subscription, you may use the `withCoupon` method:
 
     $user->newSubscription('default', 'price_monthly')
-         ->withCoupon('code')
-         ->create($paymentMethod);
+        ->withCoupon('code')
+        ->create($paymentMethod);
 
 Or, if you would like to apply a [Stripe promotion code](https://stripe.com/docs/billing/subscriptions/discounts/codes), you may use the `withPromotionCode` method:
 
     $user->newSubscription('default', 'price_monthly')
-         ->withPromotionCode('promo_code_id')
-         ->create($paymentMethod);
+        ->withPromotionCode('promo_code_id')
+        ->create($paymentMethod);
 
 The given promotion code ID should be the Stripe API ID assigned to the promotion code and not the customer facing promotion code. If you need to find a promotion code ID based on a given customer facing promotion code, you may use the `findPromotionCode` method:
 
@@ -1104,8 +1104,8 @@ If the customer is on trial, the trial period will be maintained. Additionally,
 If you would like to swap prices and cancel any trial period the customer is currently on, you may invoke the `skipTrial` method:
 
     $user->subscription('default')
-            ->skipTrial()
-            ->swap('price_yearly');
+        ->skipTrial()
+        ->swap('price_yearly');
 
 If you would like to swap prices and immediately invoice the customer instead of waiting for their next billing cycle, you may use the `swapAndInvoice` method:
 
@@ -1237,8 +1237,8 @@ If you want to swap a single price on a subscription, you may do so using the `s
     $user = User::find(1);
 
     $user->subscription('default')
-            ->findItemOrFail('price_basic')
-            ->swap('price_pro');
+        ->findItemOrFail('price_basic')
+        ->swap('price_pro');
 
 <a name="proration"></a>
 #### Proration
@@ -1329,9 +1329,9 @@ To start using usage billing, you will first need to create a new product in you
 You may also start a metered subscription via [Stripe Checkout](#checkout):
 
     $checkout = Auth::user()
-            ->newSubscription('default', [])
-            ->meteredPrice('price_metered')
-            ->checkout();
+        ->newSubscription('default', [])
+        ->meteredPrice('price_metered')
+        ->checkout();
 
     return view('your-checkout-view', [
         'checkout' => $checkout,
@@ -1441,8 +1441,8 @@ By default, the billing cycle anchor is the date the subscription was created or
         $anchor = Carbon::parse('first day of next month');
 
         $request->user()->newSubscription('default', 'price_monthly')
-                    ->anchorBillingCycleOn($anchor->startOfDay())
-                    ->create($request->paymentMethodId);
+            ->anchorBillingCycleOn($anchor->startOfDay())
+            ->create($request->paymentMethodId);
 
         // ...
     });
@@ -1507,8 +1507,8 @@ If you would like to offer trial periods to your customers while still collectin
 
     Route::post('/user/subscribe', function (Request $request) {
         $request->user()->newSubscription('default', 'price_monthly')
-                    ->trialDays(10)
-                    ->create($request->paymentMethodId);
+            ->trialDays(10)
+            ->create($request->paymentMethodId);
 
         // ...
     });
@@ -1523,8 +1523,8 @@ The `trialUntil` method allows you to provide a `DateTime` instance that specifi
     use Carbon\Carbon;
 
     $user->newSubscription('default', 'price_monthly')
-                ->trialUntil(Carbon::now()->addDays(10))
-                ->create($paymentMethod);
+        ->trialUntil(Carbon::now()->addDays(10))
+        ->create($paymentMethod);
 
 You may determine if a user is within their trial period using either the `onTrial` method of the user instance or the `onTrial` method of the subscription instance. The two examples below are equivalent:
 
@@ -2131,7 +2131,7 @@ First, you could redirect your customer to the dedicated payment confirmation pa
 
     try {
         $subscription = $user->newSubscription('default', 'price_monthly')
-                                ->create($paymentMethod);
+            ->create($paymentMethod);
     } catch (IncompletePayment $exception) {
         return redirect()->route(
             'cashier.payment',

cashier-paddle.md

@@ -1081,8 +1081,9 @@ If you would like to offer trial periods to your customers while still collectin
     use Illuminate\Http\Request;
 
     Route::get('/user/subscribe', function (Request $request) {
-        $checkout = $request->user()->subscribe('pri_monthly')
-                    ->returnTo(route('home'));
+        $checkout = $request->user()
+            ->subscribe('pri_monthly')
+            ->returnTo(route('home'));
 
         return view('billing', ['checkout' => $checkout]);
     });
@@ -1147,7 +1148,8 @@ Once you are ready to create an actual subscription for the user, you may use th
     use Illuminate\Http\Request;
 
     Route::get('/user/subscribe', function (Request $request) {
-        $checkout = $user->subscribe('pri_monthly')
+        $checkout = $request->user()
+            ->subscribe('pri_monthly')
             ->returnTo(route('home'));
 
         return view('billing', ['checkout' => $checkout]);

configuration.md

@@ -17,7 +17,7 @@
 
 All of the configuration files for the Laravel framework are stored in the `config` directory. Each option is documented, so feel free to look through the files and get familiar with the options available to you.
 
-These configuration files allow you to configure things like your database connection information, your mail server information, as well as various other core configuration values such as your application timezone and encryption key.
+These configuration files allow you to configure things like your database connection information, your mail server information, as well as various other core configuration values such as your application URL and encryption key.
 
 <a name="the-about-command"></a>
 #### The `about` Command

console-tests.md

@@ -63,11 +63,11 @@ You may test this command with the following test:
 ```php tab=Pest
 test('console command', function () {
     $this->artisan('question')
-         ->expectsQuestion('What is your name?', 'Taylor Otwell')
-         ->expectsQuestion('Which language do you prefer?', 'PHP')
-         ->expectsOutput('Your name is Taylor Otwell and you prefer PHP.')
-         ->doesntExpectOutput('Your name is Taylor Otwell and you prefer Ruby.')
-         ->assertExitCode(0);
+        ->expectsQuestion('What is your name?', 'Taylor Otwell')
+        ->expectsQuestion('Which language do you prefer?', 'PHP')
+        ->expectsOutput('Your name is Taylor Otwell and you prefer PHP.')
+        ->doesntExpectOutput('Your name is Taylor Otwell and you prefer Ruby.')
+        ->assertExitCode(0);
 });
 ```
 
@@ -78,11 +78,11 @@ test('console command', function () {
 public function test_console_command(): void
 {
     $this->artisan('question')
-         ->expectsQuestion('What is your name?', 'Taylor Otwell')
-         ->expectsQuestion('Which language do you prefer?', 'PHP')
-         ->expectsOutput('Your name is Taylor Otwell and you prefer PHP.')
-         ->doesntExpectOutput('Your name is Taylor Otwell and you prefer Ruby.')
-         ->assertExitCode(0);
+        ->expectsQuestion('What is your name?', 'Taylor Otwell')
+        ->expectsQuestion('Which language do you prefer?', 'PHP')
+        ->expectsOutput('Your name is Taylor Otwell and you prefer PHP.')
+        ->doesntExpectOutput('Your name is Taylor Otwell and you prefer Ruby.')
+        ->assertExitCode(0);
 }
 ```
 
@@ -91,12 +91,12 @@ If you are utilizing the `search` or `multisearch` functions provided by [Larave
 ```php tab=Pest
 test('console command', function () {
     $this->artisan('example')
-         ->expectsSearch('What is your name?', search: 'Tay', answers: [
+        ->expectsSearch('What is your name?', search: 'Tay', answers: [
             'Taylor Otwell',
             'Taylor Swift',
             'Darian Taylor'
-         ], answer: 'Taylor Otwell')
-         ->assertExitCode(0);
+        ], answer: 'Taylor Otwell')
+        ->assertExitCode(0);
 });
 ```
 
@@ -107,12 +107,12 @@ test('console command', function () {
 public function test_console_command(): void
 {
     $this->artisan('example')
-         ->expectsSearch('What is your name?', search: 'Tay', answers: [
+        ->expectsSearch('What is your name?', search: 'Tay', answers: [
             'Taylor Otwell',
             'Taylor Swift',
             'Darian Taylor'
-         ], answer: 'Taylor Otwell')
-         ->assertExitCode(0);
+        ], answer: 'Taylor Otwell')
+        ->assertExitCode(0);
 }
 ```
 
@@ -121,8 +121,8 @@ You may also assert that a console command does not generate any output using th
 ```php tab=Pest
 test('console command', function () {
     $this->artisan('example')
-         ->doesntExpectOutput()
-         ->assertExitCode(0);
+        ->doesntExpectOutput()
+        ->assertExitCode(0);
 });
 ```
 
@@ -143,8 +143,8 @@ The `expectsOutputToContain` and `doesntExpectOutputToContain` methods may be us
 ```php tab=Pest
 test('console command', function () {
     $this->artisan('example')
-         ->expectsOutputToContain('Taylor')
-         ->assertExitCode(0);
+        ->expectsOutputToContain('Taylor')
+        ->assertExitCode(0);
 });
 ```
 

container.md

@@ -222,16 +222,16 @@ Sometimes you may have two classes that utilize the same interface, but you wish
     use Illuminate\Support\Facades\Storage;
 
     $this->app->when(PhotoController::class)
-              ->needs(Filesystem::class)
-              ->give(function () {
-                  return Storage::disk('local');
-              });
+        ->needs(Filesystem::class)
+        ->give(function () {
+            return Storage::disk('local');
+        });
 
     $this->app->when([VideoController::class, UploadController::class])
-              ->needs(Filesystem::class)
-              ->give(function () {
-                  return Storage::disk('s3');
-              });
+        ->needs(Filesystem::class)
+        ->give(function () {
+            return Storage::disk('s3');
+        });
 
 <a name="contextual-attributes"></a>
 ### Contextual Attributes
@@ -349,8 +349,8 @@ Sometimes you may have a class that receives some injected classes, but also nee
     use App\Http\Controllers\UserController;
 
     $this->app->when(UserController::class)
-              ->needs('$variableName')
-              ->give($value);
+        ->needs('$variableName')
+        ->give($value);
 
 Sometimes a class may depend on an array of [tagged](#tagging) instances. Using the `giveTagged` method, you may easily inject all of the container bindings with that tag:
 
@@ -397,24 +397,24 @@ Occasionally, you may have a class that receives an array of typed objects using
 Using contextual binding, you may resolve this dependency by providing the `give` method with a closure that returns an array of resolved `Filter` instances:
 
     $this->app->when(Firewall::class)
-              ->needs(Filter::class)
-              ->give(function (Application $app) {
-                    return [
-                        $app->make(NullFilter::class),
-                        $app->make(ProfanityFilter::class),
-                        $app->make(TooLongFilter::class),
-                    ];
-              });
+        ->needs(Filter::class)
+        ->give(function (Application $app) {
+              return [
+                  $app->make(NullFilter::class),
+                  $app->make(ProfanityFilter::class),
+                  $app->make(TooLongFilter::class),
+              ];
+        });
 
 For convenience, you may also just provide an array of class names to be resolved by the container whenever `Firewall` needs `Filter` instances:
 
     $this->app->when(Firewall::class)
-              ->needs(Filter::class)
-              ->give([
-                  NullFilter::class,
-                  ProfanityFilter::class,
-                  TooLongFilter::class,
-              ]);
+        ->needs(Filter::class)
+        ->give([
+            NullFilter::class,
+            ProfanityFilter::class,
+            TooLongFilter::class,
+        ]);
 
 <a name="variadic-tag-dependencies"></a>
 #### Variadic Tag Dependencies

context.md

@@ -250,14 +250,18 @@ $data = Context::all();
 <a name="determining-item-existence"></a>
 ### Determining Item Existence
 
-You may use the `has` method to determine if the context has any value stored for the given key:
+You may use the `has` and `missing` methods to determine if the context has any value stored for the given key:
 
 ```php
 use Illuminate\Support\Facades\Context;
 
 if (Context::has('key')) {
     // ...
 }
+
+if (Context::missing('key')) {
+    // ...
+}
 ```
 
 The `has` method will return `true` regardless of the value stored. So, for example, a key with a `null` value will be considered present:

controllers.md

@@ -208,9 +208,9 @@ Typically, a 404 HTTP response will be generated if an implicitly bound resource
     use Illuminate\Support\Facades\Redirect;
 
     Route::resource('photos', PhotoController::class)
-            ->missing(function (Request $request) {
-                return Redirect::route('photos.index');
-            });
+        ->missing(function (Request $request) {
+            return Redirect::route('photos.index');
+        });
 
 <a name="soft-deleted-models"></a>
 #### Soft Deleted Models