[4.x] Remove Unreachable return in PHPUnit test stubs (#1423)

nathanheffley · web-flow · commit 108e2ce2d199 · 2023-12-26T08:30:36.000-06:00
* Update RegistrationTest.php

* Update PasswordResetTest.php

* Update EmailVerificationTest.php

* Update ApiTokenPermissionsTest.php

* Update CreateApiTokenTest.php

* Update DeleteAccountTest.php

* Update DeleteApiTokenTest.php

* Update InviteTeamMemberTest.php

* Update TwoFactorAuthenticationSettingsTest.php

* Update TwoFactorAuthenticationSettingsTest.php

* Update ApiTokenPermissionsTest.php

* Update CreateApiTokenTest.php

* Update DeleteAccountTest.php

* Update DeleteApiTokenTest.php

* Update InviteTeamMemberTest.php

* Update TwoFactorAuthenticationSettingsTest.php
diff --git a/stubs/tests/EmailVerificationTest.php b/stubs/tests/EmailVerificationTest.php
@@ -19,8 +19,6 @@ public function test_email_verification_screen_can_be_rendered(): void
     {
         if (! Features::enabled(Features::emailVerification())) {
             $this->markTestSkipped('Email verification not enabled.');
-
-            return;
         }
 
         $user = User::factory()->withPersonalTeam()->unverified()->create();
@@ -34,8 +32,6 @@ public function test_email_can_be_verified(): void
     {
         if (! Features::enabled(Features::emailVerification())) {
             $this->markTestSkipped('Email verification not enabled.');
-
-            return;
         }
 
         Event::fake();
@@ -60,8 +56,6 @@ public function test_email_can_not_verified_with_invalid_hash(): void
     {
         if (! Features::enabled(Features::emailVerification())) {
             $this->markTestSkipped('Email verification not enabled.');
-
-            return;
         }
 
         $user = User::factory()->unverified()->create();
diff --git a/stubs/tests/PasswordResetTest.php b/stubs/tests/PasswordResetTest.php
@@ -17,8 +17,6 @@ public function test_reset_password_link_screen_can_be_rendered(): void
     {
         if (! Features::enabled(Features::resetPasswords())) {
             $this->markTestSkipped('Password updates are not enabled.');
-
-            return;
         }
 
         $response = $this->get('/forgot-password');
@@ -30,8 +28,6 @@ public function test_reset_password_link_can_be_requested(): void
     {
         if (! Features::enabled(Features::resetPasswords())) {
             $this->markTestSkipped('Password updates are not enabled.');
-
-            return;
         }
 
         Notification::fake();
@@ -49,8 +45,6 @@ public function test_reset_password_screen_can_be_rendered(): void
     {
         if (! Features::enabled(Features::resetPasswords())) {
             $this->markTestSkipped('Password updates are not enabled.');
-
-            return;
         }
 
         Notification::fake();
@@ -74,8 +68,6 @@ public function test_password_can_be_reset_with_valid_token(): void
     {
         if (! Features::enabled(Features::resetPasswords())) {
             $this->markTestSkipped('Password updates are not enabled.');
-
-            return;
         }
 
         Notification::fake();
diff --git a/stubs/tests/RegistrationTest.php b/stubs/tests/RegistrationTest.php
@@ -16,8 +16,6 @@ public function test_registration_screen_can_be_rendered(): void
     {
         if (! Features::enabled(Features::registration())) {
             $this->markTestSkipped('Registration support is not enabled.');
-
-            return;
         }
 
         $response = $this->get('/register');
@@ -29,8 +27,6 @@ public function test_registration_screen_cannot_be_rendered_if_support_is_disabl
     {
         if (Features::enabled(Features::registration())) {
             $this->markTestSkipped('Registration support is enabled.');
-
-            return;
         }
 
         $response = $this->get('/register');
@@ -42,8 +38,6 @@ public function test_new_users_can_register(): void
     {
         if (! Features::enabled(Features::registration())) {
             $this->markTestSkipped('Registration support is not enabled.');
-
-            return;
         }
 
         $response = $this->post('/register', [
diff --git a/stubs/tests/inertia/ApiTokenPermissionsTest.php b/stubs/tests/inertia/ApiTokenPermissionsTest.php
@@ -16,8 +16,6 @@ public function test_api_token_permissions_can_be_updated(): void
     {
         if (! Features::hasApiFeatures()) {
             $this->markTestSkipped('API support is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->withPersonalTeam()->create());
diff --git a/stubs/tests/inertia/CreateApiTokenTest.php b/stubs/tests/inertia/CreateApiTokenTest.php
@@ -15,8 +15,6 @@ public function test_api_tokens_can_be_created(): void
     {
         if (! Features::hasApiFeatures()) {
             $this->markTestSkipped('API support is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->withPersonalTeam()->create());
diff --git a/stubs/tests/inertia/DeleteAccountTest.php b/stubs/tests/inertia/DeleteAccountTest.php
@@ -15,8 +15,6 @@ public function test_user_accounts_can_be_deleted(): void
     {
         if (! Features::hasAccountDeletionFeatures()) {
             $this->markTestSkipped('Account deletion is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->create());
@@ -32,8 +30,6 @@ public function test_correct_password_must_be_provided_before_account_can_be_del
     {
         if (! Features::hasAccountDeletionFeatures()) {
             $this->markTestSkipped('Account deletion is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->create());
diff --git a/stubs/tests/inertia/DeleteApiTokenTest.php b/stubs/tests/inertia/DeleteApiTokenTest.php
@@ -16,8 +16,6 @@ public function test_api_tokens_can_be_deleted(): void
     {
         if (! Features::hasApiFeatures()) {
             $this->markTestSkipped('API support is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->withPersonalTeam()->create());
diff --git a/stubs/tests/inertia/InviteTeamMemberTest.php b/stubs/tests/inertia/InviteTeamMemberTest.php
@@ -17,8 +17,6 @@ public function test_team_members_can_be_invited_to_team(): void
     {
         if (! Features::sendsTeamInvitations()) {
             $this->markTestSkipped('Team invitations not enabled.');
-
-            return;
         }
 
         Mail::fake();
@@ -39,8 +37,6 @@ public function test_team_member_invitations_can_be_cancelled(): void
     {
         if (! Features::sendsTeamInvitations()) {
             $this->markTestSkipped('Team invitations not enabled.');
-
-            return;
         }
 
         Mail::fake();
diff --git a/stubs/tests/inertia/TwoFactorAuthenticationSettingsTest.php b/stubs/tests/inertia/TwoFactorAuthenticationSettingsTest.php
@@ -15,8 +15,6 @@ public function test_two_factor_authentication_can_be_enabled(): void
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two factor authentication is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->create());
@@ -33,8 +31,6 @@ public function test_recovery_codes_can_be_regenerated(): void
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two factor authentication is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->create());
@@ -56,8 +52,6 @@ public function test_two_factor_authentication_can_be_disabled(): void
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two factor authentication is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->create());
diff --git a/stubs/tests/livewire/ApiTokenPermissionsTest.php b/stubs/tests/livewire/ApiTokenPermissionsTest.php
@@ -18,8 +18,6 @@ public function test_api_token_permissions_can_be_updated(): void
     {
         if (! Features::hasApiFeatures()) {
             $this->markTestSkipped('API support is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->withPersonalTeam()->create());
diff --git a/stubs/tests/livewire/CreateApiTokenTest.php b/stubs/tests/livewire/CreateApiTokenTest.php
@@ -17,8 +17,6 @@ public function test_api_tokens_can_be_created(): void
     {
         if (! Features::hasApiFeatures()) {
             $this->markTestSkipped('API support is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->withPersonalTeam()->create());
diff --git a/stubs/tests/livewire/DeleteAccountTest.php b/stubs/tests/livewire/DeleteAccountTest.php
@@ -17,8 +17,6 @@ public function test_user_accounts_can_be_deleted(): void
     {
         if (! Features::hasAccountDeletionFeatures()) {
             $this->markTestSkipped('Account deletion is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->create());
@@ -34,8 +32,6 @@ public function test_correct_password_must_be_provided_before_account_can_be_del
     {
         if (! Features::hasAccountDeletionFeatures()) {
             $this->markTestSkipped('Account deletion is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->create());
diff --git a/stubs/tests/livewire/DeleteApiTokenTest.php b/stubs/tests/livewire/DeleteApiTokenTest.php
@@ -18,8 +18,6 @@ public function test_api_tokens_can_be_deleted(): void
     {
         if (! Features::hasApiFeatures()) {
             $this->markTestSkipped('API support is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->withPersonalTeam()->create());
diff --git a/stubs/tests/livewire/InviteTeamMemberTest.php b/stubs/tests/livewire/InviteTeamMemberTest.php
@@ -19,8 +19,6 @@ public function test_team_members_can_be_invited_to_team(): void
     {
         if (! Features::sendsTeamInvitations()) {
             $this->markTestSkipped('Team invitations not enabled.');
-
-            return;
         }
 
         Mail::fake();
@@ -42,8 +40,6 @@ public function test_team_member_invitations_can_be_cancelled(): void
     {
         if (! Features::sendsTeamInvitations()) {
             $this->markTestSkipped('Team invitations not enabled.');
-
-            return;
         }
 
         Mail::fake();
diff --git a/stubs/tests/livewire/TwoFactorAuthenticationSettingsTest.php b/stubs/tests/livewire/TwoFactorAuthenticationSettingsTest.php
@@ -17,8 +17,6 @@ public function test_two_factor_authentication_can_be_enabled(): void
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two factor authentication is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->create());
@@ -38,8 +36,6 @@ public function test_recovery_codes_can_be_regenerated(): void
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two factor authentication is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->create());
@@ -62,8 +58,6 @@ public function test_two_factor_authentication_can_be_disabled(): void
     {
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two factor authentication is not enabled.');
-
-            return;
         }
 
         $this->actingAs($user = User::factory()->create());

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ public function test_email_verification_screen_can_be_rendered(): void`
`19`	`19`	`{`
`20`	`20`	`if (! Features::enabled(Features::emailVerification())) {`
`21`	`21`	`$this->markTestSkipped('Email verification not enabled.');`
`22`		`-`
`23`		`- return;`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`$user = User::factory()->withPersonalTeam()->unverified()->create();`
`@@ -34,8 +32,6 @@ public function test_email_can_be_verified(): void`
`34`	`32`	`{`
`35`	`33`	`if (! Features::enabled(Features::emailVerification())) {`
`36`	`34`	`$this->markTestSkipped('Email verification not enabled.');`
`37`		`-`
`38`		`- return;`
`39`	`35`	`}`
`40`	`36`
`41`	`37`	`Event::fake();`
`@@ -60,8 +56,6 @@ public function test_email_can_not_verified_with_invalid_hash(): void`
`60`	`56`	`{`
`61`	`57`	`if (! Features::enabled(Features::emailVerification())) {`
`62`	`58`	`$this->markTestSkipped('Email verification not enabled.');`
`63`		`-`
`64`		`- return;`
`65`	`59`	`}`
`66`	`60`
`67`	`61`	`$user = User::factory()->unverified()->create();`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ public function test_reset_password_link_screen_can_be_rendered(): void`
`17`	`17`	`{`
`18`	`18`	`if (! Features::enabled(Features::resetPasswords())) {`
`19`	`19`	`$this->markTestSkipped('Password updates are not enabled.');`
`20`		`-`
`21`		`- return;`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`$response = $this->get('/forgot-password');`
`@@ -30,8 +28,6 @@ public function test_reset_password_link_can_be_requested(): void`
`30`	`28`	`{`
`31`	`29`	`if (! Features::enabled(Features::resetPasswords())) {`
`32`	`30`	`$this->markTestSkipped('Password updates are not enabled.');`
`33`		`-`
`34`		`- return;`
`35`	`31`	`}`
`36`	`32`
`37`	`33`	`Notification::fake();`
`@@ -49,8 +45,6 @@ public function test_reset_password_screen_can_be_rendered(): void`
`49`	`45`	`{`
`50`	`46`	`if (! Features::enabled(Features::resetPasswords())) {`
`51`	`47`	`$this->markTestSkipped('Password updates are not enabled.');`
`52`		`-`
`53`		`- return;`
`54`	`48`	`}`
`55`	`49`
`56`	`50`	`Notification::fake();`
`@@ -74,8 +68,6 @@ public function test_password_can_be_reset_with_valid_token(): void`
`74`	`68`	`{`
`75`	`69`	`if (! Features::enabled(Features::resetPasswords())) {`
`76`	`70`	`$this->markTestSkipped('Password updates are not enabled.');`
`77`		`-`
`78`		`- return;`
`79`	`71`	`}`
`80`	`72`
`81`	`73`	`Notification::fake();`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ public function test_registration_screen_can_be_rendered(): void`
`16`	`16`	`{`
`17`	`17`	`if (! Features::enabled(Features::registration())) {`
`18`	`18`	`$this->markTestSkipped('Registration support is not enabled.');`
`19`		`-`
`20`		`- return;`
`21`	`19`	`}`
`22`	`20`
`23`	`21`	`$response = $this->get('/register');`
`@@ -29,8 +27,6 @@ public function test_registration_screen_cannot_be_rendered_if_support_is_disabl`
`29`	`27`	`{`
`30`	`28`	`if (Features::enabled(Features::registration())) {`
`31`	`29`	`$this->markTestSkipped('Registration support is enabled.');`
`32`		`-`
`33`		`- return;`
`34`	`30`	`}`
`35`	`31`
`36`	`32`	`$response = $this->get('/register');`
`@@ -42,8 +38,6 @@ public function test_new_users_can_register(): void`
`42`	`38`	`{`
`43`	`39`	`if (! Features::enabled(Features::registration())) {`
`44`	`40`	`$this->markTestSkipped('Registration support is not enabled.');`
`45`		`-`
`46`		`- return;`
`47`	`41`	`}`
`48`	`42`
`49`	`43`	`$response = $this->post('/register', [`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@ public function test_api_tokens_can_be_created(): void`
`15`	`15`	`{`
`16`	`16`	`if (! Features::hasApiFeatures()) {`
`17`	`17`	`$this->markTestSkipped('API support is not enabled.');`
`18`		`-`
`19`		`- return;`
`20`	`18`	`}`
`21`	`19`
`22`	`20`	`$this->actingAs($user = User::factory()->withPersonalTeam()->create());`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ public function test_api_token_permissions_can_be_updated(): void`
`18`	`18`	`{`
`19`	`19`	`if (! Features::hasApiFeatures()) {`
`20`	`20`	`$this->markTestSkipped('API support is not enabled.');`
`21`		`-`
`22`		`- return;`
`23`	`21`	`}`
`24`	`22`
`25`	`23`	`$this->actingAs($user = User::factory()->withPersonalTeam()->create());`