Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/jetstream
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.2.0
Choose a base ref
...
head repository: laravel/jetstream
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.2.1
Choose a head ref
  • 3 commits
  • 17 files changed
  • 3 contributors

Commits on Dec 19, 2023

  1. Update CHANGELOG

    @driesvints @github-actions
    driesvints authored and github-actions[bot] committed Dec 19, 2023

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    9173207 View commit details

Commits on Dec 26, 2023

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

    * 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
    @nathanheffley
    nathanheffley authored Dec 26, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    108e2ce View commit details

Commits on Dec 27, 2023

  1. [4.x] Fix PHPDoc for UpdateUserProfileInformation::update (#1424) 

    The `$input` parameter is typed as an `array<string, string>`, but
`$input['photo']` is an `UploadedFile` and not a `string`.
    @rstefanic
    rstefanic authored Dec 27, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fb22f2d View commit details
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Release Notes

## [Unreleased](https://github.com/laravel/jetstream/compare/v4.1.2...4.x)
## [Unreleased](https://github.com/laravel/jetstream/compare/v4.2.0...4.x)

## [v4.2.0](https://github.com/laravel/jetstream/compare/v4.1.2...v4.2.0) - 2023-12-19

* [4.x] Vite 5 by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/jetstream/pull/1418

## [v4.1.2](https://github.com/laravel/jetstream/compare/v4.1.1...v4.1.2) - 2023-11-29

2 changes: 1 addition & 1 deletion stubs/app/Actions/Fortify/UpdateUserProfileInformation.php
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
/**
* Validate and update the given user's profile information.
*
* @param array<string, string> $input
* @param array<string, mixed> $input
*/
public function update(User $user, array $input): void
{
6 changes: 0 additions & 6 deletions stubs/tests/EmailVerificationTest.php
View file
Original file line number Diff line number Diff line change
@@ -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();
8 changes: 0 additions & 8 deletions stubs/tests/PasswordResetTest.php
View file
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
{
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();
6 changes: 0 additions & 6 deletions stubs/tests/RegistrationTest.php
View file
Original file line number Diff line number Diff line change
@@ -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', [
2 changes: 0 additions & 2 deletions stubs/tests/inertia/ApiTokenPermissionsTest.php
View file
Original file line number Diff line number Diff line change
@@ -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());
2 changes: 0 additions & 2 deletions stubs/tests/inertia/CreateApiTokenTest.php
View file
Original file line number Diff line number Diff line change
@@ -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());
4 changes: 0 additions & 4 deletions stubs/tests/inertia/DeleteAccountTest.php
View file
Original file line number Diff line number Diff line change
@@ -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());
2 changes: 0 additions & 2 deletions stubs/tests/inertia/DeleteApiTokenTest.php
View file
Original file line number Diff line number Diff line change
@@ -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());
4 changes: 0 additions & 4 deletions stubs/tests/inertia/InviteTeamMemberTest.php
View file
Original file line number Diff line number Diff line change
@@ -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();
6 changes: 0 additions & 6 deletions stubs/tests/inertia/TwoFactorAuthenticationSettingsTest.php
View file
Original file line number Diff line number Diff line change
@@ -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());
2 changes: 0 additions & 2 deletions stubs/tests/livewire/ApiTokenPermissionsTest.php
View file
Original file line number Diff line number Diff line change
@@ -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());
2 changes: 0 additions & 2 deletions stubs/tests/livewire/CreateApiTokenTest.php
View file
Original file line number Diff line number Diff line change
@@ -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());
4 changes: 0 additions & 4 deletions stubs/tests/livewire/DeleteAccountTest.php
View file
Original file line number Diff line number Diff line change
@@ -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());
2 changes: 0 additions & 2 deletions stubs/tests/livewire/DeleteApiTokenTest.php
View file
Original file line number Diff line number Diff line change
@@ -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());
4 changes: 0 additions & 4 deletions stubs/tests/livewire/InviteTeamMemberTest.php
View file
Original file line number Diff line number Diff line change
@@ -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();
6 changes: 0 additions & 6 deletions stubs/tests/livewire/TwoFactorAuthenticationSettingsTest.php
View file
Original file line number Diff line number Diff line change
@@ -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());