Sulu changes

dantleech · dantleech · commit 29e2d88076c8 · 2015-03-18T08:53:16.000Z
diff --git a/DependencyInjection/CmfRoutingAutoExtension.php b/DependencyInjection/CmfRoutingAutoExtension.php
@@ -51,20 +51,15 @@ public function load(array $configs, ContainerBuilder $container)
             }
         }
         $container->setParameter('cmf_routing_auto.metadata.loader.resources', $resources);
+        $container->setParameter('cmf_routing_auto.adapter_name', $config['adapter']);
 
         $hasProvider = false;
+
         if ($this->isConfigEnabled($container, $config['persistence']['phpcr'])) {
             $hasProvider = true;
             $loader->load('phpcr-odm.xml');
             $container->setParameter('cmf_routing_auto.persistence.phpcr.route_basepath', $config['persistence']['phpcr']['route_basepath']);
         }
-
-        if (!$hasProvider) {
-            throw new InvalidConfigurationException(
-                'The RoutingAutoBundle requires that you enable one of the persistence layers in your application configuration. ' .
-                'See the documentation for more information'
-            );
-        }
     }
 
     protected function findMappingFiles($bundles)
diff --git a/DependencyInjection/Compiler/AutoRoutePass.php b/DependencyInjection/Compiler/AutoRoutePass.php
@@ -22,6 +22,45 @@
 class AutoRoutePass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
+    {
+        $this->registerServices($container);
+        $this->registerAdapter($container);
+    }
+
+    private function registerAdapter(ContainerBuilder $container)
+    {
+        $adapter = $container->getParameter('cmf_routing_auto.adapter_name');
+        $adapterId = null;
+        $adapterNames = array();
+        $ids = $container->findTaggedServiceIds('cmf_routing_auto.adapter');
+
+        foreach ($ids as $id => $attributes) {
+            if (!isset($attributes[0]['alias'])) {
+                throw new \InvalidArgumentException(sprintf(
+                    'No "name" specified for auto route adapter "%s"',
+                    $id
+                ));
+            }
+
+            $alias = $attributes[0]['alias'];
+            $adapterNames[] = $alias;
+            if ($adapter === $alias) {
+                $adapterId = $id;
+            }
+        }
+
+        if (null === $adapterId) {
+            throw new \RuntimeException(sprintf(
+                'Could not find configured adapter "%s", available adapters: "%s"',
+                $adapter,
+                implode('", "', $adapterNames)
+            ));
+        }
+
+        $container->setAlias('cmf_routing_auto.adapter', $adapterId);
+    }
+
+    private function registerServices(ContainerBuilder $container)
     {
         if (!$container->hasDefinition(
             'cmf_routing_auto.service_registry'
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -26,7 +26,11 @@ public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
         $treeBuilder->root('cmf_routing_auto')
+            ->addDefaultsIfNotSet()
             ->children()
+                ->scalarNode('adapter')
+                    ->defaultValue('doctrine_phpcr_odm')
+                ->end()
                 ->booleanNode('auto_mapping')->defaultTrue()->end()
                 ->arrayNode('mapping')
                     ->fixXmlConfig('resource')
diff --git a/Doctrine/Phpcr/AutoRouteListener.php b/Doctrine/Phpcr/AutoRouteListener.php
@@ -69,6 +69,7 @@ public function onFlush(ManagerEventArgs $args)
 
                 // refactor this.
                 foreach ($uriContextCollection->getUriContexts() as $uriContext) {
+            var_dump('123');
                     $autoRoute = $uriContext->getAutoRoute();
                     $dm->persist($autoRoute);
                     $uow->computeChangeSets();
diff --git a/Resources/config/auto_route.xml b/Resources/config/auto_route.xml
@@ -8,7 +8,6 @@
         <parameter key="cmf_routing_auto.phpcrodm_auto_route_listener.class">Symfony\Cmf\Bundle\RoutingAutoBundle\Doctrine\Phpcr\AutoRouteListener</parameter>
         <parameter key="cmf_routing_auto.auto_route_manager.class">Symfony\Cmf\Component\RoutingAuto\AutoRouteManager</parameter>
         <parameter key="cmf_routing_auto.service_registry.class">Symfony\Cmf\Component\RoutingAuto\ServiceRegistry</parameter>
-        <parameter key="cmf_routing_auto.adapter.phpcr_odm.class">Symfony\Cmf\Bundle\RoutingAutoBundle\Adapter\PhpcrOdmAdapter</parameter>
         <parameter key="cmf_routing_auto.uri_generator.class">Symfony\Cmf\Component\RoutingAuto\UriGenerator</parameter>
 
         <parameter key="cmf_routing_auto.metadata.loader.yaml.class">Symfony\Cmf\Component\RoutingAuto\Mapping\Loader\YmlFileLoader</parameter>
@@ -35,15 +34,15 @@
             id="cmf_routing_auto.auto_route_manager"
             class="Symfony\Cmf\Component\RoutingAuto\AutoRouteManager"
             >
-            <argument type="service" id="cmf_routing_auto.adapter.phpcr_odm"/>
+            <argument type="service" id="cmf_routing_auto.adapter" />
             <argument type="service" id="cmf_routing_auto.uri_generator" />
             <argument type="service" id="cmf_routing_auto.defunct_route_handler.delegating" />
         </service>
 
         <!-- URL Generator -->
         <service id="cmf_routing_auto.uri_generator" class="%cmf_routing_auto.uri_generator.class%">
             <argument type="service" id="cmf_routing_auto.metadata.factory" />
-            <argument type="service" id="cmf_routing_auto.adapter.phpcr_odm" />
+            <argument type="service" id="cmf_routing_auto.adapter" />
             <argument type="service" id="cmf_routing_auto.service_registry" />
         </service>
 
diff --git a/Resources/config/conflict_resolvers.xml b/Resources/config/conflict_resolvers.xml
@@ -13,7 +13,7 @@
     <services>
 
         <service id="cmf_routing_auto.conflict_resolver.auto_increment" class="%cmf_routing_auto.conflict_resolver.auto_increment.class%">
-            <argument type="service" id="cmf_routing_auto.adapter.phpcr_odm" />
+            <argument type="service" id="cmf_routing_auto.adapter" />
             <tag name="cmf_routing_auto.conflict_resolver" alias="auto_increment" />
         </service>
 
diff --git a/Resources/config/defunct_route_handlers.xml b/Resources/config/defunct_route_handlers.xml
@@ -14,18 +14,18 @@
     <services>
 
         <service id="cmf_routing_auto.defunct_route_handler.remove" class="%cmf_routing_auto.defunct_route_handler.remove.class%">
-            <argument type="service" id="cmf_routing_auto.adapter.phpcr_odm" />
+            <argument type="service" id="cmf_routing_auto.adapter" />
             <tag name="cmf_routing_auto.defunct_route_handler" alias="remove" />
         </service>
 
         <service id="cmf_routing_auto.defunct_route_handler.leave_redirect" class="%cmf_routing_auto.defunct_route_handler.leave_redirect.class%">
-            <argument type="service" id="cmf_routing_auto.adapter.phpcr_odm" />
+            <argument type="service" id="cmf_routing_auto.adapter" />
             <tag name="cmf_routing_auto.defunct_route_handler" alias="leave_redirect" />
         </service>
 
         <service id="cmf_routing_auto.defunct_route_handler.delegating" class="%cmf_routing_auto.defunct_route_handler.delegating.class%">
             <argument type="service" id="cmf_routing_auto.metadata.factory" />
-            <argument type="service" id="cmf_routing_auto.adapter.phpcr_odm" />
+            <argument type="service" id="cmf_routing_auto.adapter" />
             <argument type="service" id="cmf_routing_auto.service_registry" />
         </service>
 
diff --git a/Resources/config/phpcr-odm.xml b/Resources/config/phpcr-odm.xml
@@ -15,6 +15,7 @@
         <service id="cmf_routing_auto.adapter.phpcr_odm" class="%cmf_routing_auto.adapter.phpcr_odm.class%">
             <argument type="service" id="doctrine_phpcr.odm.default_document_manager"/>
             <argument>%cmf_routing_auto.persistence.phpcr.route_basepath%</argument>
+            <tag name="cmf_routing_auto.adapter" alias="doctrine_phpcr_odm" />
         </service>
 
         <service id="cmf_routing_auto.phpcrodm_auto_route_listener" class="%cmf_routing_auto.phpcrodm_auto_route_listener.class%">
diff --git a/Tests/Unit/DependencyInjection/Compiler/AutoRoutePassTest.php b/Tests/Unit/DependencyInjection/Compiler/AutoRoutePassTest.php
@@ -14,7 +14,7 @@ protected function registerCompilerPass(ContainerBuilder $container)
         $container->addCompilerPass(new AutoRoutePass());
     }
 
-    public function testRegistration()
+    public function testServiceRegistration()
     {
         $serviceRegistryDefinition = new Definition();
         $this->setDefinition('cmf_routing_auto.service_registry', $serviceRegistryDefinition);
@@ -32,6 +32,36 @@ public function testRegistration()
                 new Reference('some_token_provider')
             )
         );
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Could not find configured adapter "bar", available adapters: "foobar"
+     */
+    public function testAdapterRegistrationUnknownAdapter()
+    {
+        $managerDef = new Definition();
+        $this->setDefinition('cmf_routing_auto.auto_route_manager', $managerDef);
+        $this->container->setParameter('cmf_routing_auto.adapter_name', 'bar');
+
+        $adapterDef = new Definition();
+        $adapterDef->addTag('cmf_routing_auto.adapter', array('alias' => 'foobar'));
+        $this->setDefinition('some_adapter', $adapterDef);
+        $this->compile();
+    }
+
+    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');
+
+        $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));
     }
 }
diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -31,6 +31,7 @@ protected function getConfiguration()
     public function testSupportsAllConfigFormats()
     {
         $expectedConfiguration = array(
+            'adapter' => 'doctrine_phpcr_odm',
             'auto_mapping' => false,
             'mapping' => array(
                 'resources' => array(

Original file line number	Diff line number	Diff line change
`@@ -51,20 +51,15 @@ public function load(array $configs, ContainerBuilder $container)`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`$container->setParameter('cmf_routing_auto.metadata.loader.resources', $resources);`
	`54`	`+ $container->setParameter('cmf_routing_auto.adapter_name', $config['adapter']);`
`54`	`55`
`55`	`56`	`$hasProvider = false;`
	`57`	`+`
`56`	`58`	`if ($this->isConfigEnabled($container, $config['persistence']['phpcr'])) {`
`57`	`59`	`$hasProvider = true;`
`58`	`60`	`$loader->load('phpcr-odm.xml');`
`59`	`61`	`$container->setParameter('cmf_routing_auto.persistence.phpcr.route_basepath', $config['persistence']['phpcr']['route_basepath']);`
`60`	`62`	`}`
`61`		`-`
`62`		`- if (!$hasProvider) {`
`63`		`- throw new InvalidConfigurationException(`
`64`		`- 'The RoutingAutoBundle requires that you enable one of the persistence layers in your application configuration. ' .`
`65`		`- 'See the documentation for more information'`
`66`		`- );`
`67`		`- }`
`68`	`63`	`}`
`69`	`64`
`70`	`65`	`protected function findMappingFiles($bundles)`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ protected function getConfiguration()`
`31`	`31`	`public function testSupportsAllConfigFormats()`
`32`	`32`	`{`
`33`	`33`	`$expectedConfiguration = array(`
	`34`	`+ 'adapter' => 'doctrine_phpcr_odm',`
`34`	`35`	`'auto_mapping' => false,`
`35`	`36`	`'mapping' => array(`
`36`	`37`	`'resources' => array(`