Merge branch '6.3' into 6.4

* 6.3:
  [HttpKernel] Move @internal from AbstractSessionListener class to its methods and properties
  [Validator] Add missing translation for Greek (el)
  Add missing ID translations
  Add missing translations for Vietnamese (vi)
  [Validator] Add missing translations for Japanese.
  [Validator] Add missing translation for Russia (ru) #53041
  [Validator] add missing Azerbaijani translation
  Add missing FR translation
  Add missing spanish translation
  [Validator] Update Hungarian translations
  [Validator] add missing Turkish translation and correct grammar
  Add missing romanian translation
  Add missing translation for Ukrainian (uk) #53050
  sv_SE translation trans-unit id 110
  [Validator] Add missing Croation translation
  Add missing translation into validators.pl.xlf
  [Validator] add missing lv translation
  [Validator] Added missing dutch translation
  [HttpKernel] Fix request attribute value ignored with pinned resolvers

Author: fabpot

Controller/ArgumentResolver.php

@@ -73,6 +73,7 @@ public function getArguments(Request $request, callable $controller, \Reflection
 
                     $argumentValueResolvers = [
                         $this->namedResolvers->get($resolverName),
+                        new RequestAttributeValueResolver(),
                         new DefaultValueResolver(),
                     ];
                 }

EventListener/AbstractSessionListener.php

@@ -35,28 +35,36 @@
  *
  * @author Johannes M. Schmitt <[email protected]>
  * @author Tobias Schultze <http://tobion.de>
- *
- * @internal
  */
 abstract class AbstractSessionListener implements EventSubscriberInterface, ResetInterface
 {
     public const NO_AUTO_CACHE_CONTROL_HEADER = 'Symfony-Session-NoAutoCacheControl';
 
+    /**
+     * @internal
+     */
     protected ?ContainerInterface $container;
+
     private bool $debug;
 
     /**
      * @var array<string, mixed>
      */
     private array $sessionOptions;
 
+    /**
+     * @internal
+     */
     public function __construct(ContainerInterface $container = null, bool $debug = false, array $sessionOptions = [])
     {
         $this->container = $container;
         $this->debug = $debug;
         $this->sessionOptions = $sessionOptions;
     }
 
+    /**
+     * @internal
+     */
     public function onKernelRequest(RequestEvent $event): void
     {
         if (!$event->isMainRequest()) {
@@ -90,6 +98,9 @@ public function onKernelRequest(RequestEvent $event): void
         }
     }
 
+    /**
+     * @internal
+     */
     public function onKernelResponse(ResponseEvent $event): void
     {
         if (!$event->isMainRequest() || (!$this->container->has('initialized_session') && !$event->getRequest()->hasSession())) {
@@ -218,6 +229,9 @@ public function onKernelResponse(ResponseEvent $event): void
         }
     }
 
+    /**
+     * @internal
+     */
     public function onSessionUsage(): void
     {
         if (!$this->debug) {
@@ -253,6 +267,9 @@ public function onSessionUsage(): void
         throw new UnexpectedSessionUsageException('Session was used while the request was declared stateless.');
     }
 
+    /**
+     * @internal
+     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -262,6 +279,9 @@ public static function getSubscribedEvents(): array
         ];
     }
 
+    /**
+     * @internal
+     */
     public function reset(): void
     {
         if (\PHP_SESSION_ACTIVE === session_status()) {
@@ -278,6 +298,8 @@ public function reset(): void
 
     /**
      * Gets the session object.
+     *
+     * @internal
      */
     abstract protected function getSession(): ?SessionInterface;
 

Tests/Controller/ArgumentResolverTest.php

@@ -22,6 +22,8 @@
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
+use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadataFactory;
 use Symfony\Component\HttpKernel\Exception\ResolverNotFoundException;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\ExtendingRequest;
@@ -298,24 +300,39 @@ public function testTargetedResolver()
 
     public function testTargetedResolverWithDefaultValue()
     {
-        $resolver = self::getResolver([], [RequestAttributeValueResolver::class => new RequestAttributeValueResolver()]);
+        $resolver = self::getResolver([], [TestEntityValueResolver::class => new TestEntityValueResolver()]);
 
         $request = Request::create('/');
         $controller = (new ArgumentResolverTestController())->controllerTargetingResolverWithDefaultValue(...);
 
-        $this->assertSame([2], $resolver->getArguments($request, $controller));
+        /** @var Post[] $arguments */
+        $arguments = $resolver->getArguments($request, $controller);
+
+        $this->assertCount(1, $arguments);
+        $this->assertSame('Default', $arguments[0]->title);
     }
 
     public function testTargetedResolverWithNullableValue()
     {
-        $resolver = self::getResolver([], [RequestAttributeValueResolver::class => new RequestAttributeValueResolver()]);
+        $resolver = self::getResolver([], [TestEntityValueResolver::class => new TestEntityValueResolver()]);
 
         $request = Request::create('/');
         $controller = (new ArgumentResolverTestController())->controllerTargetingResolverWithNullableValue(...);
 
         $this->assertSame([null], $resolver->getArguments($request, $controller));
     }
 
+    public function testTargetedResolverWithRequestAttributeValue()
+    {
+        $resolver = self::getResolver([], [TestEntityValueResolver::class => new TestEntityValueResolver()]);
+
+        $request = Request::create('/');
+        $request->attributes->set('foo', $object = new Post('Random '.time()));
+        $controller = $this->controllerTargetingResolverWithTestEntity(...);
+
+        $this->assertSame([$object], $resolver->getArguments($request, $controller));
+    }
+
     public function testDisabledResolver()
     {
         $resolver = self::getResolver(namedResolvers: []);
@@ -396,11 +413,15 @@ public function controllerTargetingResolver(#[ValueResolver(DefaultValueResolver
     {
     }
 
-    public function controllerTargetingResolverWithDefaultValue(#[ValueResolver(RequestAttributeValueResolver::class)] int $foo = 2)
+    public function controllerTargetingResolverWithDefaultValue(#[ValueResolver(TestEntityValueResolver::class)] Post $foo = new Post('Default'))
+    {
+    }
+
+    public function controllerTargetingResolverWithNullableValue(#[ValueResolver(TestEntityValueResolver::class)] ?Post $foo)
     {
     }
 
-    public function controllerTargetingResolverWithNullableValue(#[ValueResolver(RequestAttributeValueResolver::class)] ?int $foo)
+    public function controllerTargetingResolverWithTestEntity(#[ValueResolver(TestEntityValueResolver::class)] Post $foo)
     {
     }
 
@@ -425,3 +446,21 @@ public function controllerTargetingUnknownResolver(
 function controller_function($foo, $foobar)
 {
 }
+
+class TestEntityValueResolver implements ValueResolverInterface
+{
+    public function resolve(Request $request, ArgumentMetadata $argument): iterable
+    {
+        return Post::class === $argument->getType() && $request->request->has('title')
+            ? [new Post($request->request->get('title'))]
+            : [];
+    }
+}
+
+class Post
+{
+    public function __construct(
+        public readonly string $title,
+    ) {
+    }
+}