Merge branch '6.4' into 7.0

* 6.4: (24 commits)
  Fix Twig tests
  [Scheduler] Fix tests
  [TwigBridge] Add FormLayoutTestCase class
  Fix CS
  Allow sending scheduled messages through the slack API
  [TwigBridge] Add `AppVariable::getEnabledLocales()` to retrieve the enabled locales
  [RateLimiter] Add missing dependency
  [RateLimiter] Add SlidingWindowLimiter::reserve()
  [Messenger] Add WrappedExceptionsInterface for nested exceptions
  [Mime] Add `TemplatedEmail::locale()` to set the locale for the email rendering
  Fix CS
  [Messenger][Scheduler] Add AsCronTask & AsPeriodicTask attributes
  [Scheduler] Make debug:scheduler output more useful
  [Notifier] Tweak some phpdocs
  [FrameworkBundle] Change BrowserKitAssertionsTrait::getClient() to be protected
  Fix CS
  [FrameworkBundle] Allow BrowserKit relative URL redirect assert
  [Messenger] RejectRedeliveredMessageException should not be retried
  [Serializer] Make `ProblemNormalizer` give details about Messenger’s `ValidationFailedException`
  [WebProfilerBundle] Support `!` negation operator in url filter
  ...

Author: fabpot

CHANGELOG.md

@@ -11,6 +11,7 @@ CHANGELOG
 ---
 
  * `UserValueResolver` no longer implements `ArgumentValueResolverInterface`
+ * Deprecate calling the constructor of `DefaultLoginRateLimiter` with an empty secret
 
 6.3
 ---

Impersonate/ImpersonateUrlGenerator.php

@@ -18,7 +18,7 @@
 use Symfony\Component\Security\Http\Firewall\SwitchUserListener;
 
 /**
- * Provides generator functions for the impersonate url exit.
+ * Provides generator functions for the impersonation urls.
  *
  * @author Amrouche Hamza <[email protected]>
  * @author Damien Fayet <[email protected]>
@@ -36,9 +36,14 @@ public function __construct(RequestStack $requestStack, FirewallMap $firewallMap
         $this->firewallMap = $firewallMap;
     }
 
+    public function generateImpersonationPath(string $identifier = null): string
+    {
+        return $this->buildPath(null, $identifier);
+    }
+
     public function generateExitPath(string $targetUri = null): string
     {
-        return $this->buildExitPath($targetUri);
+        return $this->buildPath($targetUri);
     }
 
     public function generateExitUrl(string $targetUri = null): string
@@ -47,27 +52,31 @@ public function generateExitUrl(string $targetUri = null): string
             return '';
         }
 
-        return $request->getUriForPath($this->buildExitPath($targetUri));
+        return $request->getUriForPath($this->buildPath($targetUri));
     }
 
     private function isImpersonatedUser(): bool
     {
         return $this->tokenStorage->getToken() instanceof SwitchUserToken;
     }
 
-    private function buildExitPath(string $targetUri = null): string
+    private function buildPath(string $targetUri = null, string $identifier = SwitchUserListener::EXIT_VALUE): string
     {
-        if (null === ($request = $this->requestStack->getCurrentRequest()) || !$this->isImpersonatedUser()) {
+        if (null === ($request = $this->requestStack->getCurrentRequest())) {
+            return '';
+        }
+
+        if (!$this->isImpersonatedUser() && SwitchUserListener::EXIT_VALUE == $identifier) {
             return '';
         }
 
         if (null === $switchUserConfig = $this->firewallMap->getFirewallConfig($request)->getSwitchUser()) {
-            throw new \LogicException('Unable to generate the impersonate exit URL without a firewall configured for the user switch.');
+            throw new \LogicException('Unable to generate the impersonate URLs without a firewall configured for the user switch.');
         }
 
         $targetUri ??= $request->getRequestUri();
 
-        $targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => SwitchUserListener::EXIT_VALUE], '', '&');
+        $targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => $identifier], '', '&');
 
         return $targetUri;
     }