[1.x] Uses PHP Native Type Declarations 🐘

composer.json

@@ -32,6 +32,7 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "App\\Models\\": "tests/Fixtures/Models",
             "Laravel\\Fortify\\Tests\\": "tests/"
         }
     },

database/migrations/2014_10_12_200000_add_two_factor_columns_to_users_table.php

@@ -9,10 +9,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->text('two_factor_secret')
@@ -33,10 +31,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::table('users', function (Blueprint $table) {
             $table->dropColumn(array_merge([

src/Contracts/CreatesNewUsers.php

@@ -8,7 +8,7 @@ interface CreatesNewUsers
      * Validate and create a newly registered user.
      *
      * @param  array  $input
-     * @return mixed
+     * @return \Illuminate\Foundation\Auth\User
      */
     public function create(array $input);
 }

src/Contracts/ResetsUserPasswords.php

@@ -2,14 +2,10 @@
 
 namespace Laravel\Fortify\Contracts;
 
+/**
+ * @method void reset(\Illuminate\Foundation\Auth\User $user, array $input)
+ */
 interface ResetsUserPasswords
 {
-    /**
-     * Validate and reset the user's forgotten password.
-     *
-     * @param  mixed  $user
-     * @param  array  $input
-     * @return void
-     */
-    public function reset($user, array $input);
+    //
 }

src/Contracts/UpdatesUserPasswords.php

@@ -2,14 +2,10 @@
 
 namespace Laravel\Fortify\Contracts;
 
+/**
+ * @method void update(\Illuminate\Foundation\Auth\User $user, array $input)
+ */
 interface UpdatesUserPasswords
 {
-    /**
-     * Validate and update the user's password.
-     *
-     * @param  mixed  $user
-     * @param  array  $input
-     * @return void
-     */
-    public function update($user, array $input);
+    //
 }

src/Contracts/UpdatesUserProfileInformation.php

@@ -2,14 +2,10 @@
 
 namespace Laravel\Fortify\Contracts;
 
+/**
+ * @method void update(\Illuminate\Foundation\Auth\User $user, array $input)
+ */
 interface UpdatesUserProfileInformation
 {
-    /**
-     * Validate and update the given user's profile information.
-     *
-     * @param  mixed  $user
-     * @param  array  $input
-     * @return void
-     */
-    public function update($user, array $input);
+    //
 }

stubs/CreateNewUser.php

@@ -15,10 +15,9 @@ class CreateNewUser implements CreatesNewUsers
     /**
      * Validate and create a newly registered user.
      *
-     * @param  array  $input
-     * @return \App\Models\User
+     * @param  array<string, string>  $input
      */
-    public function create(array $input)
+    public function create(array $input): User
     {
         Validator::make($input, [
             'name' => ['required', 'string', 'max:255'],

stubs/FortifyServiceProvider.php

@@ -16,20 +16,16 @@ class FortifyServiceProvider extends ServiceProvider
 {
     /**
      * Register any application services.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         //
     }
 
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         Fortify::createUsersUsing(CreateNewUser::class);
         Fortify::updateUserProfileInformationUsing(UpdateUserProfileInformation::class);

stubs/PasswordValidationRules.php

@@ -9,9 +9,9 @@ trait PasswordValidationRules
     /**
      * Get the validation rules used to validate passwords.
      *
-     * @return array
+     * @return array<int, \Illuminate\Contracts\Validation\Rule|array|string>
      */
-    protected function passwordRules()
+    protected function passwordRules(): array
     {
         return ['required', 'string', new Password, 'confirmed'];
     }

stubs/ResetUserPassword.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Fortify;
 
+use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Laravel\Fortify\Contracts\ResetsUserPasswords;
@@ -13,11 +14,9 @@ class ResetUserPassword implements ResetsUserPasswords
     /**
      * Validate and reset the user's forgotten password.
      *
-     * @param  mixed  $user
-     * @param  array  $input
-     * @return void
+     * @param  array<string, string>  $input
      */
-    public function reset($user, array $input)
+    public function reset(User $user, array $input): void
     {
         Validator::make($input, [
             'password' => $this->passwordRules(),

stubs/UpdateUserPassword.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Fortify;
 
+use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Laravel\Fortify\Contracts\UpdatesUserPasswords;
@@ -13,11 +14,9 @@ class UpdateUserPassword implements UpdatesUserPasswords
     /**
      * Validate and update the user's password.
      *
-     * @param  mixed  $user
-     * @param  array  $input
-     * @return void
+     * @param  array<string, string>  $input
      */
-    public function update($user, array $input)
+    public function update(User $user, array $input): void
     {
         Validator::make($input, [
             'current_password' => ['required', 'string', 'current_password:web'],

stubs/UpdateUserProfileInformation.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Fortify;
 
+use App\Models\User;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
@@ -12,11 +13,9 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
     /**
      * Validate and update the given user's profile information.
      *
-     * @param  mixed  $user
-     * @param  array  $input
-     * @return void
+     * @param  array<string, string>  $input
      */
-    public function update($user, array $input)
+    public function update(User $user, array $input): void
     {
         Validator::make($input, [
             'name' => ['required', 'string', 'max:255'],
@@ -44,11 +43,9 @@ public function update($user, array $input)
     /**
      * Update the given verified user's profile information.
      *
-     * @param  mixed  $user
-     * @param  array  $input
-     * @return void
+     * @param  array<string, string>  $input
      */
-    protected function updateVerifiedUser($user, array $input)
+    protected function updateVerifiedUser(User $user, array $input): void
     {
         $user->forceFill([
             'name' => $input['name'],

tests/Fixtures/Models/User.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Foundation\Auth\User as Authenticatable;
+
+class User extends Authenticatable
+{
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array<int, string>
+     */
+    protected $fillable = [
+        'name',
+        'email',
+        'password',
+    ];
+
+    /**
+     * The attributes that should be hidden for serialization.
+     *
+     * @var array<int, string>
+     */
+    protected $hidden = [
+        'password',
+        'remember_token',
+    ];
+
+    /**
+     * The attributes that should be cast.
+     *
+     * @var array<string, string>
+     */
+    protected $casts = [
+        'email_verified_at' => 'datetime',
+    ];
+}

tests/PasswordControllerTest.php

@@ -3,8 +3,7 @@
 namespace Laravel\Fortify\Tests;
 
 use App\Actions\Fortify\UpdateUserPassword;
-use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Support\Facades\Hash;
+use App\Models\User;
 use Illuminate\Validation\ValidationException;
 use Laravel\Fortify\Contracts\UpdatesUserPasswords;
 use Mockery;
@@ -13,9 +12,7 @@ class PasswordControllerTest extends OrchestraTestCase
 {
     public function test_passwords_can_be_updated()
     {
-        $user = Mockery::mock(Authenticatable::class);
-
-        $user->password = Hash::make('password');
+        $user = Mockery::mock(User::class);
 
         $this->mock(UpdatesUserPasswords::class)
                     ->shouldReceive('update')
@@ -32,8 +29,7 @@ public function test_passwords_can_be_updated()
 
     public function test_passwords_cannot_be_updated_without_current_password()
     {
-        $user = Mockery::mock(Authenticatable::class);
-        $user->password = '';
+        $user = Mockery::mock(User::class);
 
         require_once __DIR__.'/../stubs/PasswordValidationRules.php';
         require_once __DIR__.'/../stubs/UpdateUserPassword.php';
@@ -53,8 +49,7 @@ public function test_passwords_cannot_be_updated_without_current_password()
 
     public function test_passwords_cannot_be_updated_without_current_password_confirmation()
     {
-        $user = Mockery::mock(Authenticatable::class);
-        $user->password = '';
+        $user = Mockery::mock(User::class);
 
         require_once __DIR__.'/../stubs/PasswordValidationRules.php';
         require_once __DIR__.'/../stubs/UpdateUserPassword.php';