use Auth::userResolver when resolving the authenticated user (#54382)

laravel · Jan 28, 2025 · 95adbb7 · 95adbb7
1 parent 33d61c4
commit 95adbb7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Illuminate/Container/Attributes/Authenticated.php b/src/Illuminate/Container/Attributes/Authenticated.php
@@ -25,6 +25,6 @@ public function __construct(public ?string $guard = null)
      */
     public static function resolve(self $attribute, Container $container)
     {
-        return $container->make('auth')->guard($attribute->guard)->user();
+        return call_user_func($container->make('auth')->userResolver(), $attribute->guard);
     }
 }
diff --git a/tests/Container/ContextualAttributeBindingTest.php b/tests/Container/ContextualAttributeBindingTest.php
@@ -111,6 +111,7 @@ public function testAuthedAttribute()
         $container = new Container;
         $container->singleton('auth', function () {
             $manager = m::mock(AuthManager::class);
+            $manager->shouldReceive('userResolver')->andReturn(fn ($guard = null) => $manager->guard($guard)->user());
             $manager->shouldReceive('guard')->with('foo')->andReturnUsing(function () {
                 $guard = m::mock(GuardContract::class);
                 $guard->shouldReceive('user')->andReturn(m:mock(AuthenticatableContract::class));