Introduce flashbag cache to Twig AppVariable

JoshuaBehrens · web-flow · commit 3ab308f42f6b · 2023-01-20T08:49:05.000+01:00
diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
@@ -17,18 +17,20 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Exposes some Symfony parameters and services as an "app" global variable.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class AppVariable
+class AppVariable implements ResetInterface
 {
     private TokenStorageInterface $tokenStorage;
     private RequestStack $requestStack;
     private string $environment;
     private bool $debug;
+    private array $flashBagCache = [];
 
     public function setTokenStorage(TokenStorageInterface $tokenStorage)
     {
@@ -135,25 +137,25 @@ public function getDebug(): bool
      */
     public function getFlashes(string|array $types = null): array
     {
-        try {
-            if (null === $session = $this->getSession()) {
-                return [];
-            }
-        } catch (\RuntimeException) {
-            return [];
-        }
-
-        if (null === $types || '' === $types || [] === $types) {
-            return $session->getFlashBag()->all();
-        }
+        $flashes = $this->getFlashesUncached($types);
+        $result = $flashes;
 
         if (\is_string($types)) {
-            return $session->getFlashBag()->get($types);
-        }
+            if (isset($this->flashBagCache[$types])) {
+                $result = [...$result, ...$this->flashes[$types]];
+            }
 
-        $result = [];
-        foreach ($types as $type) {
-            $result[$type] = $session->getFlashBag()->get($type);
+            $this->flashBagCache[$types] = [...$flashes, ...($this->flashBagCache[$types] ?? [])];
+        } else {
+            foreach ($this->flashBagCache as $key => $values) {
+                if ($types === null || \in_array($key, $types)) {
+                    $result[$key] = [...$values, ...$result[$key] ?? []];
+                }
+            }
+
+            foreach ($flashes as $key => $values) {
+                $this->flashBagCache[$key] = [...$values, ...($this->flashBagCache[$key] ?? [])];
+            }
         }
 
         return $result;
@@ -179,4 +181,35 @@ public function getCurrent_route_parameters(): array
 
         return $this->getRequest()?->attributes->get('_route_params') ?? [];
     }
+
+    public function reset(): void
+    {
+        $this->flashBagCache = [];
+    }
+
+    protected function getFlashesUncached(string|array $types = null): array
+    {
+        try {
+            if (null === $session = $this->getSession()) {
+                return [];
+            }
+        } catch (\RuntimeException) {
+            return [];
+        }
+
+        if (null === $types || '' === $types || [] === $types) {
+            return $session->getFlashBag()->all();
+        }
+
+        if (\is_string($types)) {
+            return $session->getFlashBag()->get($types);
+        }
+
+        $result = [];
+        foreach ($types as $type) {
+            $result[$type] = $session->getFlashBag()->get($type);
+        }
+
+        return $result;
+    }
 }
