Upgrade 1-11.38

vendor/symfony/framework-bundle/Templating/Loader/TemplateLocator.php

@@ -24,6 +24,8 @@ class TemplateLocator implements FileLocatorInterface
     protected $locator;
     protected $cache;
 
+    private $cacheHits = array();
+
     /**
      * Constructor.
      *
@@ -32,7 +34,7 @@ class TemplateLocator implements FileLocatorInterface
      */
     public function __construct(FileLocatorInterface $locator, $cacheDir = null)
     {
-        if (null !== $cacheDir && is_file($cache = $cacheDir.'/templates.php')) {
+        if (null !== $cacheDir && file_exists($cache = $cacheDir.'/templates.php')) {
             $this->cache = require $cache;
         }
 
@@ -71,12 +73,15 @@ class TemplateLocator implements FileLocatorInterface
 
         $key = $this->getCacheKey($template);
 
+        if (isset($this->cacheHits[$key])) {
+            return $this->cacheHits[$key];
+        }
         if (isset($this->cache[$key])) {
-            return $this->cache[$key];
+            return $this->cacheHits[$key] = realpath($this->cache[$key]) ?: $this->cache[$key];
         }
 
         try {
-            return $this->cache[$key] = $this->locator->locate($template->getPath(), $currentPath);
+            return $this->cacheHits[$key] = $this->locator->locate($template->getPath(), $currentPath);
         } catch (\InvalidArgumentException $e) {
             throw new \InvalidArgumentException(sprintf('Unable to find template "%s" : "%s".', $template, $e->getMessage()), 0, $e);
         }