minor #50859 [Security] Remove ArgumentValueResolverInterface from UserValueResolver (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 29c1efae27fa · 2023-07-04T10:25:55.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Security] Remove ArgumentValueResolverInterface from UserValueResolver | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Needed to unlock #50858 without breaking compat between http-kernel v7 and security-http v6. Commits ------- e979e35 [Security] Remove ArgumentValueResolverInterface from UserValueResolver
diff --git a/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php b/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Security\Http\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -25,7 +24,7 @@
  *
  * @author Iltar van der Berg <kjarli@gmail.com>
  */
-final class UserValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface
+final class UserValueResolver implements ValueResolverInterface
 {
     private TokenStorageInterface $tokenStorage;
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\Security\Http\Controller;`
`13`	`13`
`14`	`14`	`use Symfony\Component\HttpFoundation\Request;`
`15`		`-use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;`
`16`	`15`	`use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;`
`17`	`16`	`use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;`
`18`	`17`	`use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;`
`@@ -25,7 +24,7 @@`
`25`	`24`	`*`
`26`	`25`	`* @author Iltar van der Berg <kjarli@gmail.com>`
`27`	`26`	`*/`
`28`		`-final class UserValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface`
	`27`	`+final class UserValueResolver implements ValueResolverInterface`
`29`	`28`	`{`
`30`	`29`	`private TokenStorageInterface $tokenStorage;`
`31`	`30`