Do not register document if RoutingBundle not registered

Author: dantleech

CmfRoutingAutoBundle.php

@@ -40,16 +40,20 @@ private function buildPhpcrCompilerPass(ContainerBuilder $container)
             return;
         }
 
-        $container->addCompilerPass(
-            DoctrinePhpcrMappingsPass::createXmlMappingDriver(
-                array(
-                    realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingAutoBundle\Model',
-                ),
-                array('cmf_routing_auto.persistence.phpcr.manager_name'),
-                false,
-                array('CmfRoutingAutoBundle' => 'Symfony\Cmf\Bundle\RoutingAutoBundle\Model')
-            )
-        );
+        $bundles = $container->getParameter('kernel.bundles');
+
+        if (isset($bundles['CmfRoutingBundle'])) {
+            $container->addCompilerPass(
+                DoctrinePhpcrMappingsPass::createXmlMappingDriver(
+                    array(
+                        realpath(__DIR__.'/Resources/config/doctrine-model') => 'Symfony\Cmf\Bundle\RoutingAutoBundle\Model',
+                    ),
+                    array('cmf_routing_auto.persistence.phpcr.manager_name'),
+                    false,
+                    array('CmfRoutingAutoBundle' => 'Symfony\Cmf\Bundle\RoutingAutoBundle\Model')
+                )
+            );
+        }
     }
 
 }

Tests/Unit/Adapter/PhpcrOdmAdapterTest.php

@@ -116,10 +116,6 @@ public function testCreateAutoRoute($path, $expectedParentPath, $expectedName, $
         }
 
         $this->uriContext->getUri()->willReturn($path);
-<<<<<<< HEAD
-
-=======
->>>>>>> Added possiblity to register custom adapters
         $res = $this->adapter->createAutoRoute($this->uriContext->reveal(), $this->contentDocument, 'fr');
         $this->assertNotNull($res);
         $this->assertInstanceOf('Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute', $res);
@@ -137,11 +133,7 @@ public function testCreateAutoRouteNonExistingBasePath()
     {
         $this->dm->getPhpcrSession()->willReturn($this->phpcrSession);
         $this->dm->find(null, $this->baseRoutePath)->willReturn(null);
-<<<<<<< HEAD
         $this->uriContext->getUri()->willReturn('/asdasd');
-=======
-        $this->uriContext->getUri()->willReturn('/foo');
->>>>>>> Added possiblity to register custom adapters
         $this->adapter->createAutoRoute($this->uriContext->reveal(), $this->contentDocument, 'fr');
     }