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.3.1
Choose a base ref
...
head repository: laravel/jetstream
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.0.0
Choose a head ref

Commits on Feb 10, 2023

  1. update branch alias

    taylorotwell committed Feb 10, 2023
    Copy the full SHA
    0cced4b View commit details

Commits on Feb 14, 2023

  1. Merge branch '3.x'

    driesvints committed Feb 14, 2023
    Copy the full SHA
    5f073a6 View commit details
  2. wip

    driesvints committed Feb 14, 2023
    Copy the full SHA
    a08f4ce View commit details
  3. Merge branch '3.x'

    driesvints committed Feb 14, 2023
    Copy the full SHA
    5b3a9e1 View commit details

Commits on May 8, 2023

  1. Ensure email is included in state (#1309)

    * Ensure email is included in state
    
    If email is hidden for serialization the view will crash, as toArray() won't include the email.
    
    Hiding email field in particular is useful if application contains any API endpoints or livewire components that handle users - to not accidentally expose other users emails to the client.
    
    * Update UpdateProfileInformationForm.php
    
    ---------
    
    Co-authored-by: Taylor Otwell <taylor@laravel.com>
    antja0 and taylorotwell authored May 8, 2023
    Copy the full SHA
    afe6aa5 View commit details
  2. Copy the full SHA
    a2e87fb View commit details

Commits on Aug 24, 2023

  1. Merge branch '4.x'

    nunomaduro committed Aug 24, 2023
    Copy the full SHA
    5e5068d View commit details
  2. Alias 5.x to master

    nunomaduro committed Aug 24, 2023
    Copy the full SHA
    503f5d1 View commit details

Commits on Nov 24, 2023

  1. Merge branch '4.x'

    # Conflicts:
    #	CHANGELOG.md
    driesvints committed Nov 24, 2023
    Copy the full SHA
    4e21e43 View commit details

Commits on Nov 28, 2023

  1. Merge branch '4.x'

    nunomaduro committed Nov 28, 2023
    Copy the full SHA
    1a8325f View commit details

Commits on Dec 28, 2023

  1. [5.x] Adds L11 support (#1410)

    * Adds L11 support
    
    * Adjust test suite
    
    * Keeps working on adding L11 support
    
    * wip
    
    * Fixes fortify redirect route
    
    * Removes unused replace
    
    * Comments
    
    * Removes usage of RouteServiceProvider
    
    * Installs API earlier
    
    * Fixes migrations
    
    * Adds missing password_reset_tokens
    
    * Ensures middleware folders exists
    
    * Removes non-used imports
    
    * Removes non-used import
    
    * Uses `addProviderToBootstrapFile`
    
    * Uses `publishesMigrations` and points fortify to develop
    
    * Uses stable version of Jetstream
    
    * Uses stable version of Inertia and Sanctum
    
    * Uses PHPUnit 10.4
    
    * Updates user migrations
    
    * Avoids creation of session table if already exists
    
    * Does not installs again Sanctum migrations
    
    * Fixes tests on L11
    
    * Don't uses `AUTH_GUARD=sanctum`
    
    * Updates user model
    
    * Apply fixes from StyleCI
    
    * Uses `casts` method for `Team` model
    
    * Uses `casts` on UserWithTeams
    
    * Updates UserFactory
    
    ---------
    
    Co-authored-by: StyleCI Bot <bot@styleci.io>
    nunomaduro and StyleCIBot authored Dec 28, 2023
    Copy the full SHA
    24f133e View commit details

Commits on Jan 3, 2024

  1. Merge branch '4.x'

    nunomaduro committed Jan 3, 2024
    Copy the full SHA
    3e78662 View commit details
  2. Removes non used code

    nunomaduro committed Jan 3, 2024
    Copy the full SHA
    4c6bcd7 View commit details
  3. Copy the full SHA
    24ec224 View commit details

Commits on Jan 11, 2024

  1. Copy the full SHA
    ec33679 View commit details
  2. Copy the full SHA
    04fcf07 View commit details

Commits on Jan 18, 2024

  1. Copy the full SHA
    84850ab View commit details
  2. Slim comments

    nunomaduro authored Jan 18, 2024
    Copy the full SHA
    4855a5b View commit details

Commits on Jan 22, 2024

  1. [5.x] Re-runs database migrations on Jetstream (#1436)

    * Runs database migrations
    
    * Refactors
    
    * line
    
    * removes line
    
    * wipe before migrate
    
    * Improves confirm
    
    * removes line
    
    * Re-adds line
    
    * wording
    
    * Update InstallCommand.php
    
    * Update InstallCommand.php
    
    ---------
    
    Co-authored-by: Taylor Otwell <taylor@laravel.com>
    nunomaduro and taylorotwell authored Jan 22, 2024
    Copy the full SHA
    e0f9730 View commit details

Commits on Jan 29, 2024

  1. wip

    nunomaduro committed Jan 29, 2024
    Copy the full SHA
    7b7f47e View commit details

Commits on Feb 13, 2024

  1. Merge branch '4.x'

    nunomaduro committed Feb 13, 2024
    Copy the full SHA
    b87e03f View commit details

Commits on Feb 14, 2024

  1. Use @session directive (#1441)

    jrd-lewis authored Feb 14, 2024
    Copy the full SHA
    6b73895 View commit details

Commits on Feb 28, 2024

  1. Copy the full SHA
    7012263 View commit details

Commits on Mar 4, 2024

  1. Copy the full SHA
    ed67606 View commit details

Commits on Mar 5, 2024

  1. Update CHANGELOG

    driesvints authored and github-actions[bot] committed Mar 5, 2024
    Copy the full SHA
    5f7811b View commit details
  2. Merge branch '4.x'

    nunomaduro committed Mar 5, 2024
    Copy the full SHA
    61bbf49 View commit details

Commits on Mar 7, 2024

  1. [5.x] Fixes double migrate-prompt (#1447)

    * Fixes double migrate-prompt
    
    * Update InstallCommand.php
    
    ---------
    
    Co-authored-by: Taylor Otwell <taylor@laravel.com>
    nunomaduro and taylorotwell authored Mar 7, 2024
    Copy the full SHA
    6af8850 View commit details

Commits on Mar 12, 2024

  1. Adjusts minimum stability

    nunomaduro authored Mar 12, 2024
    Copy the full SHA
    4b51064 View commit details
  2. Copy the full SHA
    342d7f7 View commit details
  3. Branch alias

    driesvints committed Mar 12, 2024
    Copy the full SHA
    fde0f25 View commit details
  4. wip

    driesvints committed Mar 12, 2024
    Copy the full SHA
    852e28a View commit details
14 changes: 11 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.1, 8.2, 8.3]
laravel: [10]
php: [8.2, 8.3]
laravel: [11]

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}

@@ -49,7 +49,7 @@ jobs:
fail-fast: true
matrix:
stack: [inertia, livewire]
laravel: [10]
laravel: [11]

name: Test Stubs - Laravel ${{ matrix.laravel }} - ${{ matrix.stack }}

@@ -64,11 +64,19 @@ jobs:
coverage: none

- name: Setup Laravel
if: matrix.laravel != 11
run: |
composer create-project laravel/laravel:^${{ matrix.laravel }} .
composer require laravel/jetstream:@dev --no-interaction --no-update
composer config repositories.jetstream '{"type": "path", "url": "jetstream"}' --file composer.json
- name: Setup Laravel
if: matrix.laravel == 11
run: |
composer create-project laravel/laravel:dev-master .
composer require laravel/jetstream:@dev --no-interaction --no-update
composer config repositories.jetstream '{"type": "path", "url": "jetstream"}' --file composer.json
- name: Checkout code
uses: actions/checkout@v3
with:
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Release Notes

## [Unreleased](https://github.com/laravel/jetstream/compare/v4.3.0...4.x)
## [Unreleased](https://github.com/laravel/jetstream/compare/v4.3.1...5.x)

## [v4.3.1](https://github.com/laravel/jetstream/compare/v4.3.0...v4.3.1) - 2024-02-29

* [4.x] Remove unnecessary e.preventDefault on modal close by [@Smef](https://github.com/Smef) in https://github.com/laravel/jetstream/pull/1444

## [v4.3.0](https://github.com/laravel/jetstream/compare/v4.2.2...v4.3.0) - 2024-02-23

15 changes: 15 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Upgrade Guide

## Upgrading from Jetstream 4.x to Jetstream 5.x

> **Note**
> This upgrade guide only discusses upgrading to Jetstream 5.x. Upgrading your Laravel, Tailwind, Livewire, or Inertia installations is outside the scope of this documentation and may not be strictly required in order to use Jetstream 5.x. Please consult the upgrade guides for those libraries for information on their upgrade process.
- [Changes Common To Both Stacks](#jetstream-5x-changes-common-to-both-stacks)

### Jetstream 5.x Changes Common To Both Stacks

#### Dependency Versions

You should upgrade your `laravel/jetstream` dependency to `^5.0` within your application's `composer.json` file. Then, run the `composer update` command:

composer update

## Upgrading from Jetstream 3.x to Jetstream 4.x

> **Note**
21 changes: 9 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
@@ -14,21 +14,21 @@
}
],
"require": {
"php": "^8.1.0",
"php": "^8.2.0",
"ext-json": "*",
"illuminate/console": "^10.17",
"illuminate/support": "^10.17",
"laravel/fortify": "^1.19",
"illuminate/console": "^11.0",
"illuminate/support": "^11.0",
"laravel/fortify": "^1.20",
"mobiledetect/mobiledetectlib": "^4.8"
},
"require-dev": {
"inertiajs/inertia-laravel": "^0.6.5",
"laravel/sanctum": "^3.0",
"livewire/livewire": "^3.0",
"inertiajs/inertia-laravel": "^1.0",
"laravel/sanctum": "^4.0",
"livewire/livewire": "^3.3",
"mockery/mockery": "^1.0",
"orchestra/testbench": "^8.11",
"orchestra/testbench": "^9.0",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^10.1"
"phpunit/phpunit": "^10.4"
},
"autoload": {
"psr-4": {
@@ -43,9 +43,6 @@
}
},
"extra": {
"branch-alias": {
"dev-master": "4.x-dev"
},
"laravel": {
"providers": [
"Laravel\\Jetstream\\JetstreamServiceProvider"
1 change: 0 additions & 1 deletion database/factories/TeamFactory.php
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@

namespace Database\Factories;

use App\Models\Team;
use App\Models\User;
use Illuminate\Database\Eloquent\Factories\Factory;

20 changes: 12 additions & 8 deletions database/factories/UserFactory.php
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
use App\Models\Team;
use App\Models\User;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
use Laravel\Jetstream\Features;

@@ -13,6 +14,11 @@
*/
class UserFactory extends Factory
{
/**
* The current password being used by the factory.
*/
protected static ?string $password;

/**
* Define the model's default state.
*
@@ -21,10 +27,10 @@ class UserFactory extends Factory
public function definition(): array
{
return [
'name' => $this->faker->name(),
'email' => $this->faker->unique()->safeEmail(),
'name' => fake()->name(),
'email' => fake()->unique()->safeEmail(),
'email_verified_at' => now(),
'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
'password' => static::$password ??= Hash::make('password'),
'two_factor_secret' => null,
'two_factor_recovery_codes' => null,
'remember_token' => Str::random(10),
@@ -38,11 +44,9 @@ public function definition(): array
*/
public function unverified(): static
{
return $this->state(function (array $attributes) {
return [
'email_verified_at' => null,
];
});
return $this->state(fn (array $attributes) => [
'email_verified_at' => null,
]);
}

/**
Original file line number Diff line number Diff line change
@@ -22,6 +22,21 @@ public function up(): void
$table->string('profile_photo_path', 2048)->nullable();
$table->timestamps();
});

Schema::create('password_reset_tokens', function (Blueprint $table) {
$table->string('email')->primary();
$table->string('token');
$table->timestamp('created_at')->nullable();
});

Schema::create('sessions', function (Blueprint $table) {
$table->string('id')->primary();
$table->foreignId('user_id')->nullable()->index();
$table->string('ip_address', 45)->nullable();
$table->text('user_agent')->nullable();
$table->longText('payload');
$table->integer('last_activity')->index();
});
}

/**
@@ -30,5 +45,7 @@ public function up(): void
public function down(): void
{
Schema::dropIfExists('users');
Schema::dropIfExists('password_reset_tokens');
Schema::dropIfExists('sessions');
}
};
Loading