better stackLoader cache

kokspflanze · Nov 20, 2019 · db44458 · db44458
1 parent 8b18123
commit db44458
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Twig/StackLoader.php b/src/Twig/StackLoader.php
@@ -67,6 +67,12 @@ protected function findTemplate(string $name, bool $throw = true): ?string
         // normalize name
         $name = preg_replace('#/{2,}#', '/', strtr($name, '\\', '/'));
 
+        // Ensure we have the expected file extension
+        $defaultSuffix = $this->getDefaultSuffix();
+        if (pathinfo($name, PATHINFO_EXTENSION) != $defaultSuffix) {
+            $name .= '.' . $defaultSuffix;
+        }
+
         if (isset($this->cache[$name])) {
             return $this->cache[$name];
         }
@@ -78,12 +84,6 @@ protected function findTemplate(string $name, bool $throw = true): ?string
             throw new Error\LoaderError($this->errorCache[$name]);
         }
 
-        // Ensure we have the expected file extension
-        $defaultSuffix = $this->getDefaultSuffix();
-        if (pathinfo($name, PATHINFO_EXTENSION) != $defaultSuffix) {
-            $name .= '.' . $defaultSuffix;
-        }
-
         $this->validateName($name);
 
         $namespace = '__main__';