Delegate to DefaultValueResolver if a default value is present and no user is logged in

Seldaek · Seldaek · commit 733cd9a31e5a · 2022-03-16T21:14:14.000+01:00
diff --git a/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php b/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php
@@ -41,6 +41,11 @@ public function supports(Request $request, ArgumentMetadata $argument): bool
             return false;
         }
 
+        // if no user is present but a default value exists we delegate to DefaultValueResolver
+        if ($argument->hasDefaultValue() && null === $this->tokenStorage->getToken()?->getUser()) {
+            return false;
+        }
+
         return true;
     }
 
diff --git a/src/Symfony/Component/Security/Http/Tests/Controller/UserValueResolverTest.php b/src/Symfony/Component/Security/Http/Tests/Controller/UserValueResolverTest.php
@@ -36,6 +36,15 @@ public function testSupportsFailsWithNoType()
         $this->assertFalse($resolver->supports(Request::create('/'), $metadata));
     }
 
+    public function testSupportsFailsWhenDefaultValAndNoUser()
+    {
+        $tokenStorage = new TokenStorage();
+        $resolver = new UserValueResolver($tokenStorage);
+        $metadata = new ArgumentMetadata('foo', UserInterface::class, false, true, new InMemoryUser('username', 'password'));
+
+        $this->assertFalse($resolver->supports(Request::create('/'), $metadata));
+    }
+
     public function testResolveSucceedsWithUserInterface()
     {
         $user = new InMemoryUser('username', 'password');

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,11 @@ public function supports(Request $request, ArgumentMetadata $argument): bool`
`41`	`41`	`return false;`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ // if no user is present but a default value exists we delegate to DefaultValueResolver`
	`45`	`+ if ($argument->hasDefaultValue() && null === $this->tokenStorage->getToken()?->getUser()) {`
	`46`	`+ return false;`
	`47`	`+ }`
	`48`	`+`
`44`	`49`	`return true;`
`45`	`50`	`}`
`46`	`51`