Merge branch '6.4' into 7.0

* 6.4:
  [Security] Make `impersonation_path()` argument mandatory and add `impersonation_url()`

Author: fabpot

CHANGELOG.md

@@ -12,6 +12,7 @@ CHANGELOG
  * Allow an array to be passed as the first argument to the `importmap()` Twig function
  * Add `TemplatedEmail::locale()` to set the locale for the email rendering
  * Add `AppVariable::getEnabledLocales()` to retrieve the enabled locales
+ * Add `impersonation_path()` and `impersonation_url()` Twig functions
 
 6.3
 ---

Extension/SecurityExtension.php

@@ -69,7 +69,16 @@ public function getImpersonateExitPath(string $exitTo = null): string
         return $this->impersonateUrlGenerator->generateExitPath($exitTo);
     }
 
-    public function getImpersonatePath(string $identifier = null): string
+    public function getImpersonateUrl(string $identifier): string
+    {
+        if (null === $this->impersonateUrlGenerator) {
+            return '';
+        }
+
+        return $this->impersonateUrlGenerator->generateImpersonationUrl($identifier);
+    }
+
+    public function getImpersonatePath(string $identifier): string
     {
         if (null === $this->impersonateUrlGenerator) {
             return '';
@@ -84,6 +93,7 @@ public function getFunctions(): array
             new TwigFunction('is_granted', $this->isGranted(...)),
             new TwigFunction('impersonation_exit_url', $this->getImpersonateExitUrl(...)),
             new TwigFunction('impersonation_exit_path', $this->getImpersonateExitPath(...)),
+            new TwigFunction('impersonation_url', $this->getImpersonateUrl(...)),
             new TwigFunction('impersonation_path', $this->getImpersonatePath(...)),
         ];
     }