Merge branch '2.x'

* 2.x:
  fixed typo
  Load templates from cache, even if they have just been compiled
  Allow construction without constructor arguments

Author: fabpot

lib/Twig/Environment.php

@@ -332,7 +332,16 @@ public function loadTemplate($name, $index = null)
             if (!class_exists($cls, false)) {
                 $content = $this->compileSource($this->getLoader()->getSourceContext($name));
                 $this->cache->write($key, $content);
-                eval('?>'.$content);
+                $this->cache->load($key);
+
+                if (!class_exists($cls, false)) {
+                    /* Last line of defense if either $this->bcWriteCacheFile was used,
+                     * $this->cache is implemented as a no-op or we have a race condition
+                     * where the cache was cleared between the above calls to write to and load from
+                     * the cache.
+                     */
+                    eval('?>'.$content);
+                }
             }
         }
 

lib/Twig/Loader/Array.php

@@ -30,7 +30,7 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
      *
      * @param array $templates An array of templates (keys are the names, and values are the source code)
      */
-    public function __construct(array $templates)
+    public function __construct(array $templates = array())
     {
         $this->templates = $templates;
     }

lib/Twig/Profiler/NodeVisitor/Profiler.php

@@ -41,14 +41,14 @@ protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
         } elseif ($node instanceof Twig_Node_Block) {
             $varName = $this->getVarName();
             $node->setNode('body', new Twig_Node_Body(array(
-                new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::BLOCK, $node->getTemplateName(), $varName),
+                new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::BLOCK, $node->getAttribute('name'), $varName),
                 $node->getNode('body'),
                 new Twig_Profiler_Node_LeaveProfile($varName),
             )));
         } elseif ($node instanceof Twig_Node_Macro) {
             $varName = $this->getVarName();
             $node->setNode('body', new Twig_Node_Body(array(
-                new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::MACRO, $node->getTemplateName(), $varName),
+                new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::MACRO, $node->getAttribute('name'), $varName),
                 $node->getNode('body'),
                 new Twig_Profiler_Node_LeaveProfile($varName),
             )));

test/Twig/Tests/EnvironmentTest.php

@@ -178,7 +178,9 @@ public function testAutoReloadCacheMiss()
             ->will($this->returnValue(0));
         $loader->expects($this->never())
             ->method('isFresh');
-        $cache->expects($this->never())
+        $cache->expects($this->once())
+            ->method('write');
+        $cache->expects($this->once())
             ->method('load');
 
         $twig->loadTemplate($templateName);
@@ -206,7 +208,7 @@ public function testAutoReloadCacheHit()
         $loader->expects($this->once())
             ->method('isFresh')
             ->will($this->returnValue(true));
-        $cache->expects($this->once())
+        $cache->expects($this->atLeastOnce())
             ->method('load');
 
         $twig->loadTemplate($templateName);
@@ -232,7 +234,9 @@ public function testAutoReloadOutdatedCacheHit()
         $loader->expects($this->once())
             ->method('isFresh')
             ->will($this->returnValue(false));
-        $cache->expects($this->never())
+        $cache->expects($this->once())
+            ->method('write');
+        $cache->expects($this->once())
             ->method('load');
 
         $twig->loadTemplate($templateName);