Merge branch '1.1.x'

Conflicts:
	composer.json

Author: stof

DependencyInjection/Compiler/AddTemplatePathPass.php

@@ -13,11 +13,21 @@ class AddTemplatePathPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('twig.loader')) {
+        $loaderDefinition = null;
+
+        if ($container->hasDefinition('twig.loader.filesystem')) {
+            $loaderDefinition = $container->getDefinition('twig.loader.filesystem');
+        } elseif ($container->hasDefinition('twig.loader')) {
+            // Symfony 2.0 and 2.1 were not using an alias for the filesystem loader
+            $loaderDefinition = $container->getDefinition('twig.loader');
+        }
+
+        if (null === $loaderDefinition) {
             return;
         }
+
         $refl = new \ReflectionClass('Knp\Menu\ItemInterface');
         $path = dirname($refl->getFileName()).'/Resources/views';
-        $container->getDefinition('twig.loader')->addMethodCall('addPath', array($path));
+        $loaderDefinition->addMethodCall('addPath', array($path));
     }
 }

Tests/DependencyInjection/Compiler/AddTemplatePathPassTest.php

@@ -33,6 +33,28 @@ public function testProcess()
         $containerBuilderMock->expects($this->once())
             ->method('hasDefinition')
             ->will($this->returnValue(true));
+        $containerBuilderMock->expects($this->once())
+            ->method('getDefinition')
+            ->with($this->equalTo('twig.loader.filesystem'))
+            ->will($this->returnValue($definitionMock));
+
+        $templatePathPass = new AddTemplatePathPass();
+        $templatePathPass->process($containerBuilderMock);
+    }
+
+    public function testProcessLegacy()
+    {
+        $definitionMock = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $definitionMock->expects($this->once())
+            ->method('addMethodCall')
+            ->with($this->equalTo('addPath'), $this->isType('array'));
+
+        $containerBuilderMock = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
+        $containerBuilderMock->expects($this->exactly(2))
+            ->method('hasDefinition')
+            ->will($this->onConsecutiveCalls(false, true));
         $containerBuilderMock->expects($this->once())
             ->method('getDefinition')
             ->with($this->equalTo('twig.loader'))