Modify TwigExtensionTest to include bundle inheritance paths

wesleylancel · wesleylancel · commit b3d4a158c1ff · 2016-08-10T11:25:43.000+02:00
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/TwigResourcesBundle/TwigResourcesBundle.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/Bundle/TwigResourcesBundle/TwigResourcesBundle.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection\Fixtures\Bundle\TwigResourcesBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class TwigResourcesBundle extends Bundle
+{
+    public function getParent()
+    {
+        return 'TwigBundle';
+    }
+}
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -152,10 +152,12 @@ public function testTwigLoaderPaths($format)
         $this->compileContainer($container);
 
         $def = $container->getDefinition('twig.loader.filesystem');
-        $paths = array();
+        $paths = array(); $prependPaths = array();
         foreach ($def->getMethodCalls() as $call) {
             if ('addPath' === $call[0] && false === strpos($call[1][0], 'Form')) {
                 $paths[] = $call[1];
+            } elseif ('prependPath' === $call[0]) {
+                $prependPaths[] = $call[1];
             }
         }
 
@@ -167,8 +169,13 @@ public function testTwigLoaderPaths($format)
             array('namespaced_path3', 'namespace3'),
             array(__DIR__.'/Fixtures/Resources/TwigBundle/views', 'Twig'),
             array(realpath(__DIR__.'/../..').'/Resources/views', 'Twig'),
+            array(__DIR__.'/Fixtures/Bundle/TwigResourcesBundle/Resources/views', 'TwigResources'),
             array(__DIR__.'/Fixtures/Resources/views'),
         ), $paths);
+
+        $this->assertEquals(array(
+            array(__DIR__.'/Fixtures/Bundle/TwigResourcesBundle/Resources/views', 'Twig'),
+        ), $prependPaths);
     }
 
     public function getFormats()
@@ -218,7 +225,10 @@ private function createContainer()
             'kernel.root_dir' => __DIR__.'/Fixtures',
             'kernel.charset' => 'UTF-8',
             'kernel.debug' => false,
-            'kernel.bundles' => array('TwigBundle' => 'Symfony\\Bundle\\TwigBundle\\TwigBundle'),
+            'kernel.bundles' => array(
+                'TwigBundle' => 'Symfony\\Bundle\\TwigBundle\\TwigBundle',
+                'TwigResourcesBundle' => 'Symfony\\Bundle\\TwigBundle\\Tests\\DependencyInjection\\Fixtures\\Bundle\\TwigResourcesBundle\\TwigResourcesBundle',
+            ),
         )));
 
         return $container;
