Added possiblity to register custom adapters

Author: dantleech

DependencyInjection/Compiler/AutoRoutePass.php

@@ -29,6 +29,12 @@ public function process(ContainerBuilder $container)
 
     private function registerAdapter(ContainerBuilder $container)
     {
+        if (!$container->hasDefinition(
+            'cmf_routing_auto.auto_route_manager'
+        )) {
+            return;
+        }
+
         $adapter = $container->getParameter('cmf_routing_auto.adapter_name');
         $adapterId = null;
         $adapterNames = array();
@@ -57,6 +63,7 @@ private function registerAdapter(ContainerBuilder $container)
             ));
         }
 
+        $managerDef = $container->getDefinition('cmf_routing_auto.auto_route_manager');
         $container->setAlias('cmf_routing_auto.adapter', $adapterId);
     }
 

Doctrine/Phpcr/AutoRouteListener.php

@@ -69,7 +69,6 @@ public function onFlush(ManagerEventArgs $args)
 
                 // refactor this.
                 foreach ($uriContextCollection->getUriContexts() as $uriContext) {
-            var_dump('123');
                     $autoRoute = $uriContext->getAutoRoute();
                     $dm->persist($autoRoute);
                     $uow->computeChangeSets();

Tests/Unit/Adapter/PhpcrOdmAdapterTest.php

@@ -116,7 +116,10 @@ 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);
@@ -134,7 +137,11 @@ 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');
     }
 

Tests/Unit/DependencyInjection/CmfRoutingAutoExtensionTest.php

@@ -35,16 +35,6 @@ protected function loadPhpcrOdm()
         ));
     }
 
-    /**
-     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage enable one of the persistence layers
-     */
-    public function testLoad()
-    {
-        $this->setParameter('kernel.bundles', array());
-        $this->load();
-    }
-
     public function testAutoMappingRegistration()
     {
         $this->loadPhpcrOdm();

Tests/Unit/DependencyInjection/Compiler/AutoRoutePassTest.php

@@ -6,6 +6,7 @@
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Alias;
 
 class AutoRoutePassTest extends AbstractCompilerPassTestCase
 {
@@ -55,13 +56,13 @@ public function testAdapterRegistration()
         $managerDef = new Definition();
         $managerDef->setArguments(array(0, 1, 2));
         $this->setDefinition('cmf_routing_auto.auto_route_manager', $managerDef);
-        $this->container->setParameter('cmf_routing_auto.adapter', 'foobar');
+        $this->container->setParameter('cmf_routing_auto.adapter_name', 'foobar');
 
         $adapterDef = new Definition();
         $adapterDef->addTag('cmf_routing_auto.adapter', array('alias' => 'foobar'));
         $this->setDefinition('some_adapter', $adapterDef);
         $this->compile();
 
-        $this->assertEquals(new Reference('some_adapter'), $managerDef->getArgument(0));
+        $this->assertEquals(new Alias('some_adapter'), $this->container->getAlias('cmf_routing_auto.adapter'));
     }
 }