Apply recent 2.x changes to 3.x

Author: jessarcher

Diff for: 3.x/features/authentication.md

@@ -31,10 +31,8 @@ use Laravel\Fortify\Fortify;
 
 /**
  * Bootstrap any application services.
- *
- * @return void
  */
-public function boot()
+public function boot(): void
 {
     Fortify::loginView(function () {
         return view('auth.login');
@@ -75,10 +73,8 @@ use Laravel\Fortify\Fortify;
 
 /**
  * Bootstrap any application services.
- *
- * @return void
  */
-public function boot()
+public function boot(): void
 {
     // ...
 

Diff for: 3.x/features/password-confirmation.md

@@ -57,10 +57,8 @@ After adding this trait to a component, you should call the `ensurePasswordIsCon
 ```php
 /**
  * Enable administration mode for user.
- *
- * @return void
  */
-public function enableAdminMode()
+public function enableAdminMode(): void
 {
     $this->ensurePasswordIsConfirmed();
 
@@ -129,10 +127,8 @@ After adding the `confirms-password` component to your application's user interf
 ```php
 /**
  * Enable administration mode for user.
- *
- * @return void
  */
-public function enableAdminMode()
+public function enableAdminMode(): void
 {
     $this->ensurePasswordIsConfirmed();
 
@@ -152,24 +148,17 @@ Once the user has confirmed their password, they will not be required to re-ente
 If you are using the Inertia stack, you should wrap the user interface element that triggers an action requiring password confirmation with the `ConfirmsPassword` Vue component provided by Jetstream. To get started, import the `ConfirmsPassword` component into your page:
 
 ```js
-import JetConfirmsPassword from './Components/ConfirmsPassword'
-
-export default {
-    components: {
-        JetConfirmsPassword,
-        // ...
-    },
-}
+import ConfirmsPassword from './Components/ConfirmsPassword.vue'
 ```
 
 Next, wrap the component around the user interface element that triggers the action that should be confirmed. Your page should listen for the `ConfirmsPassword` component's `@confirmed` event in order to trigger the method that should be called once the user's password is confirmed:
 
 ```html
-<jet-confirms-password @confirmed="enableAdminMode">
-    <jet-button type="button" :class="{ 'opacity-25': enabling }" :disabled="enabling">
+<ConfirmsPassword @confirmed="enableAdminMode">
+    <PrimaryButton type="button" :class="{ 'opacity-25': enabling }" :disabled="enabling">
         Enable
-    </jet-button>
-</jet-confirms-password>
+    </PrimaryButton>
+</ConfirmsPassword>
 ```
 
 #### Ensuring The Password Is Confirmed
@@ -192,19 +181,18 @@ Once the user has confirmed their password, they will not be required to re-ente
 Sometimes, you may wish to customize how the user's password is validated during confirmation. To do so, you may use the `Fortify::confirmPasswordsUsing` method. This method accepts a closure that receives the authenticated user instance and the `password` input field of the request. The closure should return `true` if the password is valid for the given user. Typically, this method should be called from the `boot` method of your `JetstreamServiceProvider`:
 
 ```php
+use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Laravel\Fortify\Fortify;
 
 /**
  * Bootstrap any application services.
- *
- * @return void
  */
-public function boot()
+public function boot(): void
 {
     // ...
 
-    Fortify::confirmPasswordsUsing(function ($user, string $password) {
+    Fortify::confirmPasswordsUsing(function (User $user, string $password) {
         return Hash::check($password, $user->password);
     });
 }

Diff for: 3.x/features/registration.md

@@ -57,10 +57,8 @@ use Laravel\Fortify\Fortify;
 
 /**
  * Bootstrap any application services.
- *
- * @return void
  */
-public function boot()
+public function boot(): void
 {
     Fortify::registerView(function () {
         return view('auth.register');

Diff for: 3.x/features/teams.md

@@ -197,12 +197,8 @@ When building a Jetstream application that provides both API support and team su
 ```php
 /**
  * Determine whether the user can view a flight.
- *
- * @param  \App\Models\User  $user
- * @param  \App\Models\Flight  $flight
- * @return bool
  */
-public function view(User $user, Flight $flight)
+public function view(User $user, Flight $flight): bool
 {
     return $user->belongsToTeam($flight->team) &&
            $user->hasTeamPermission($flight->team, 'flight:view') &&

Diff for: 3.x/introduction.md

@@ -16,7 +16,7 @@ Laravel Jetstream offers your choice of two frontend stacks: [Livewire](https://
 
 ### Livewire + Blade
 
-[Laravel Livewire](https://laravel-livewire.com) is a library that makes it simple to build modern, reactive, dynamic interfaces using Laravel Blade as your templating language. This is a great stack to choose if you want to build an application that is dynamic and reactive but don't feel comfortable jumping into a full JavaScript framework like Vue.js.
+[Laravel Livewire](https://laravel-livewire.com) is a library that makes it simple to build modern, reactive, dynamic interfaces using Laravel Blade as your templating language. This is a great stack to choose if you want to build an application that is dynamic and reactive, and is a great alternative to a full JavaScript framework like Vue.js.
 
 When using Livewire, you may pick and choose which portions of your application will be a Livewire component, while the remainder of your application can be rendered as the traditional Blade templates you are used to.
 

Diff for: 3.x/stacks/inertia.md

@@ -11,14 +11,12 @@ In other words, this stack gives you the full power of Vue.js without the comple
 ```php
 use Illuminate\Http\Request;
 use Inertia\Inertia;
+use Inertia\Response;
 
 /**
  * Show the general profile settings screen.
- *
- * @param  \Illuminate\Http\Request  $request
- * @return \Inertia\Response
  */
-public function show(Request $request)
+public function show(Request $request): Response
 {
     return Inertia::render('Profile/Show', [
         'sessions' => $this->sessions($request)->all(),
@@ -51,10 +49,8 @@ use Laravel\Jetstream\Jetstream;
 
 /**
  * Bootstrap any application services.
- *
- * @return void
  */
-public function boot()
+public function boot(): void
 {
     // ...
 
@@ -81,7 +77,7 @@ Jetstream's Inertia stack also includes two modal components: `DialogModal` and
 To illustrate the use of modals, consider the following modal that confirms a user would like to delete their account:
 
 ```html
-<jet-confirmation-modal :show="confirmingUserDeletion" @close="confirmingUserDeletion = false">
+<ConfirmationModal :show="confirmingUserDeletion" @close="confirmingUserDeletion = false">
     <template #title>
         Delete Account
     </template>
@@ -91,15 +87,15 @@ To illustrate the use of modals, consider the following modal that confirms a us
     </template>
 
     <template #footer>
-        <jet-secondary-button @click.native="confirmingUserDeletion = false">
+        <SecondaryButton @click.native="confirmingUserDeletion = false">
             Nevermind
-        </jet-secondary-button>
+        </SecondaryButton>
 
-        <jet-danger-button class="ml-2" @click.native="deleteTeam" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
+        <DangerButton class="ml-2" @click.native="deleteUser" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
             Delete Account
-        </jet-danger-button>
+        </DangerButton>
     </template>
-</jet-confirmation-modal>
+</ConfirmationModal>
 ```
 
 As you can see, the modal's open / close state is determined by a `show` property that is declared on the component. The modal's contents may be specified by hydrating three slots: `title`, `content`, and `footer`.
@@ -109,7 +105,7 @@ As you can see, the modal's open / close state is determined by a `show` propert
 Jetstream's Inertia stack includes Tighten's Ziggy library as a JavaScript alternative to the Laravel `route()` helper. You can refer to the [Ziggy usage documentation](https://github.com/tighten/ziggy#usage) for a complete guide on using this library, but some common examples can be found in Jetstream's own Vue files, including `Layouts/AppLayout.vue`:
 
 ```html
-<jet-nav-link :href="route('dashboard')" :active="route().current('dashboard')">
+<NavLink :href="route('dashboard')" :active="route().current('dashboard')">
     Dashboard
-</jet-nav-link>
+</NavLink>
 ```

Diff for: 3.x/stacks/livewire.md

@@ -4,7 +4,7 @@
 
 ## Introduction
 
-Laravel Livewire is a library that makes it simple to build modern, reactive, dynamic interfaces using Laravel Blade as your templating language. This is a great stack to choose if you want to build an application that is dynamic and reactive but don't feel comfortable jumping into a full JavaScript framework like Vue.js.
+Laravel Livewire is a library that makes it simple to build modern, reactive, dynamic interfaces using Laravel Blade as your templating language. This is a great stack to choose if you want to build an application that is dynamic and reactive, and is a great alternative to a full JavaScript framework like Vue.js.
 
 When using Livewire, your application's routes will respond with typical Blade templates. However, within these templates you may render Livewire components as necessary: