symfony
diff --git a/‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/templates/bundles/BarBundle/layout.html.twig
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/templates/bundles/BarBundle/layout.html.twig
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
+2-1Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
+2-1Lines changed: 2 additions & 1 deletion
@@ -41,6 +41,7 @@
             <argument type="service" id="kernel" />
             <argument>%kernel.root_dir%</argument>
             <argument type="collection" /> <!-- Twig paths -->
+            <argument>%twig.default_path%</argument>
         </service>
 
         <service id="twig.template_cache_warmer" class="Symfony\Bundle\TwigBundle\CacheWarmer\TemplateCacheWarmer">
 
@@ -0,0 +1 @@
+This is a layout
@@ -25,13 +25,14 @@ public function testGetIterator()
         $kernel->expects($this->any())->method('getBundles')->will($this->returnValue(array(
             $bundle,
         )));
-        $iterator = new TemplateIterator($kernel, __DIR__.'/Fixtures/templates', array(__DIR__.'/Fixtures/templates/Foo' => 'Foo'));
+        $iterator = new TemplateIterator($kernel, __DIR__.'/Fixtures/templates', array(__DIR__.'/Fixtures/templates/Foo' => 'Foo'), __DIR__.'/DependencyInjection/Fixtures/templates');
 
         $sorted = iterator_to_array($iterator);
         sort($sorted);
         $this->assertEquals(
             array(
                 '@Bar/index.html.twig',
+                '@Bar/layout.html.twig',
                 '@Foo/index.html.twig',
                 'layout.html.twig',
                 'sub/sub.html.twig',