Merge branch '6.4' into 7.3

* 6.4:
  [String] Fix nodes singular
  [Console] Fix testing multiline question
  [Security][Validator] Review translations.
  [Security] Ignore target route when exiting impersonation

Author: xabbuh

src/Symfony/Component/Console/Helper/QuestionHelper.php

@@ -516,12 +516,16 @@ private function readInput($inputStream, Question $question): string|false
         $ret = '';
         $cp = $this->setIOCodepage();
         while (false !== ($char = fgetc($multiLineStreamReader))) {
-            if (\PHP_EOL === "{$ret}{$char}") {
+            if ("\x4" === $char || \PHP_EOL === "{$ret}{$char}") {
                 break;
             }
             $ret .= $char;
         }
 
+        if (stream_get_meta_data($inputStream)['seekable']) {
+            fseek($inputStream, ftell($multiLineStreamReader));
+        }
+
         return $this->resetIOCodepage($cp, $ret);
     }
 

src/Symfony/Component/Console/Tester/TesterTrait.php

@@ -169,6 +169,10 @@ private static function createStream(array $inputs)
 
         foreach ($inputs as $input) {
             fwrite($stream, $input.\PHP_EOL);
+
+            if (str_contains($input, \PHP_EOL)) {
+                fwrite($stream, "\x4");
+            }
         }
 
         rewind($stream);

src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php

@@ -519,7 +519,7 @@ public function testAskMultilineResponseWithWithCursorInMiddleOfSeekableInputStr
         $question->setMultiline(true);
 
         $this->assertSame("some\ninput", $dialog->ask($this->createStreamableInputInterfaceMock($response), $this->createOutputInterface(), $question));
-        $this->assertSame(8, ftell($response));
+        $this->assertSame(18, ftell($response));
     }
 
     /**

src/Symfony/Component/Security/Core/Resources/translations/security.es.xlf

@@ -76,7 +76,7 @@
             </trans-unit>
             <trans-unit id="20">
                 <source>Too many failed login attempts, please try again in %minutes% minutes.</source>
-                <target state="needs-review-translation">Demasiados intentos fallidos de inicio de sesión, inténtelo de nuevo en %minutes% minutos.</target>
+                <target>Demasiados intentos fallidos de inicio de sesión, inténtelo de nuevo en %minutes% minutos.</target>
             </trans-unit>
         </body>
     </file>

src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php

@@ -111,7 +111,7 @@ public function authenticate(RequestEvent $event): void
         if (!$this->stateless) {
             $request->query->remove($this->usernameParameter);
             $request->server->set('QUERY_STRING', http_build_query($request->query->all(), '', '&'));
-            $response = new RedirectResponse($this->urlGenerator && $this->targetRoute ? $this->urlGenerator->generate($this->targetRoute) : $request->getUri(), 302);
+            $response = new RedirectResponse($this->urlGenerator && $this->targetRoute && self::EXIT_VALUE !== $username ? $this->urlGenerator->generate($this->targetRoute) : $request->getUri(), 302);
 
             $event->setResponse($response);
         }

src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php

@@ -17,6 +17,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\SwitchUserToken;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -109,6 +110,20 @@ public function testExitUserUpdatesToken()
         $this->assertSame($originalToken, $this->tokenStorage->getToken());
     }
 
+    public function testExitUserDoesNotRedirectToTargetRoute()
+    {
+        $originalToken = new UsernamePasswordToken(new InMemoryUser('username', '', []), 'key', []);
+        $this->tokenStorage->setToken(new SwitchUserToken(new InMemoryUser('username', '', ['ROLE_USER']), 'key', ['ROLE_USER'], $originalToken));
+
+        $this->request->query->set('_switch_user', SwitchUserListener::EXIT_VALUE);
+
+        $listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager, urlGenerator: $this->createMock(UrlGeneratorInterface::class), targetRoute: 'whatever');
+        $listener($this->event);
+
+        $this->assertInstanceOf(RedirectResponse::class, $this->event->getResponse());
+        $this->assertSame($this->request->getUri(), $this->event->getResponse()->getTargetUrl());
+    }
+
     public function testExitUserDispatchesEventWithRefreshedUser()
     {
         $originalUser = new InMemoryUser('username', null);

src/Symfony/Component/String/Inflector/EnglishInflector.php

@@ -25,6 +25,9 @@ final class EnglishInflector implements InflectorInterface
         // Fourth entry: Whether the suffix may succeed a consonant
         // Fifth entry: singular suffix, normal
 
+        // nodes (node)
+        ['sedon', 5, true, true, 'node'],
+
         // bacteria (bacterium)
         ['airetcab', 8, true, true, 'bacterium'],
 
@@ -202,6 +205,9 @@ final class EnglishInflector implements InflectorInterface
         // Fourth entry: Whether the suffix may succeed a consonant
         // Fifth entry: plural suffix, normal
 
+        // nodes (node)
+        ['edon', 4, true, true, 'nodes'],
+
         // axes (axis)
         ['sixa', 4, false, false, 'axes'],
 

src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php

@@ -123,6 +123,7 @@ public static function singularizeProvider()
             ['nebulae', 'nebula'],
             ['neuroses', ['neuros', 'neurose', 'neurosis']],
             ['news', 'news'],
+            ['nodes', 'node'],
             ['oases', ['oas', 'oase', 'oasis']],
             ['objectives', 'objective'],
             ['outages', 'outage'],
@@ -281,6 +282,7 @@ public static function pluralizeProvider()
             ['nebula', 'nebulae'],
             ['neurosis', 'neuroses'],
             ['news', 'news'],
+            ['node', 'nodes'],
             ['oasis', 'oases'],
             ['objective', 'objectives'],
             ['ox', 'oxen'],

src/Symfony/Component/Validator/Resources/translations/validators.es.xlf

@@ -468,7 +468,7 @@
             </trans-unit>
             <trans-unit id="121">
                 <source>This value is not a valid Twig template.</source>
-                <target state="needs-review-translation">Este valor no es una plantilla Twig válida.</target>
+                <target>Este valor no es una plantilla Twig válida.</target>
             </trans-unit>
         </body>
     </file>