no need to specify manager_registry when we know its the phpcr one. fix tests to use getContent

Author: dbu

Admin/RedirectRouteAdmin.php

@@ -15,7 +15,7 @@ class RedirectRouteAdmin extends Admin
      * work around https://github.com/sonata-project/SonataAdminBundle/pull/1472
      */
     protected $baseRouteName = 'cmf_routing';
-    
+
     /**
      * work around https://github.com/sonata-project/SonataAdminBundle/pull/1472
      */

DependencyInjection/CmfRoutingExtension.php

@@ -136,10 +136,6 @@ public function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuild
         $container->setParameter($this->getAlias() . '.phpcr_provider.route_basepath', $config['route_basepath']);
         $container->setParameter($this->getAlias() . '.phpcr_provider.content_basepath', $config['content_basepath']);
 
-        $routeProvider = $container->getDefinition($this->getAlias() . '.phpcr_route_provider');
-        $routeProvider->replaceArgument(0, new Reference($config['manager_registry']));
-        $contentRepository = $container->getDefinition($this->getAlias() . '.phpcr_content_repository');
-        $contentRepository->replaceArgument(0, new Reference($config['manager_registry']));
         $container->setParameter($this->getAlias() . '.manager_name', $config['manager_name']);
 
         $container->setAlias($this->getAlias() . '.route_provider', $this->getAlias() . '.phpcr_route_provider');

DependencyInjection/Configuration.php

@@ -61,7 +61,6 @@ public function getConfigTreeBuilder()
                         ->arrayNode('phpcr_provider')
                             ->children()
                                 ->scalarNode('enabled')->defaultNull()->end()
-                                ->scalarNode('manager_registry')->defaultValue('doctrine_phpcr')->end()
                                 ->scalarNode('manager_name')->defaultNull()->end()
                                 ->scalarNode('route_basepath')->defaultValue('/cms/routes')->end()
                                 ->scalarNode('content_basepath')->defaultValue('/cms/content')->end()

Resources/config/provider_phpcr.xml

@@ -4,23 +4,23 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="cmf_routing.route_provider_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RouteProvider</parameter>
+        <parameter key="cmf_routing.phpcr_route_provider_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RouteProvider</parameter>
         <parameter key="cmf_routing.content_repository_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\ContentRepository</parameter>
         <parameter key="cmf_routing.phpcrodm_route_idprefix_listener_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\IdPrefixListener</parameter>
         <parameter key="cmf_routing.phpcrodm_route_locale_listener_class">Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\LocaleListener</parameter>
     </parameters>
 
     <services>
 
-        <service id="cmf_routing.phpcr_route_provider" class="%cmf_routing.route_provider_class%">
-            <argument/>
+        <service id="cmf_routing.phpcr_route_provider" class="%cmf_routing.phpcr_route_provider_class%">
+            <argument type="service" id="doctrine_phpcr"/>
             <argument>%cmf_routing.route_model_class%</argument>
             <call method="setManagerName"><argument>%cmf_routing.manager_name%</argument></call>
             <call method="setPrefix"><argument>%cmf_routing.phpcr_provider.route_basepath%</argument></call>
         </service>
 
         <service id="cmf_routing.phpcr_content_repository" class="%cmf_routing.content_repository_class%">
-            <argument/>
+            <argument type="service" id="doctrine_phpcr"/>
             <call method="setManagerName"><argument>%cmf_routing.manager_name%</argument></call>
         </service>
 

Tests/DependencyInjection/CmfRoutingExtensionTest.php

@@ -29,6 +29,7 @@ public function testLoadDefault()
                 array(
                     'dynamic' => array(
                         'phpcr_provider' => array(
+                            'enabled' => true,
                             'use_sonata_admin' => false,
                         ),
                     ),

Tests/Functional/Controller/RedirectControllerTest.php

@@ -55,7 +55,7 @@ public function testRedirectContent()
         $root = self::$dm->find(null, self::ROUTE_ROOT);
 
         $route = new Route;
-        $route->setRouteContent($root); // this happens to be a referenceable node
+        $route->setContent($root); // this happens to be a referenceable node
         $route->setPosition($root, 'testroute');
         self::$dm->persist($route);
 

Tests/Functional/Doctrine/Phpcr/RedirectRouteTest.php

@@ -22,7 +22,7 @@ public function testRedirectDoctrine()
         $root = self::$dm->find(null, self::ROUTE_ROOT);
 
         $route = new Route;
-        $route->setRouteContent($root); // this happens to be a referenceable node
+        $route->setContent($root); // this happens to be a referenceable node
         $route->setPosition($root, 'testroute');
         self::$dm->persist($route);
 
@@ -40,7 +40,7 @@ public function testRedirectDoctrine()
         $redirect = self::$dm->find(null, self::ROUTE_ROOT.'/redirect');
 
         $this->assertInstanceOf('Symfony\\Cmf\\Component\\Routing\\RedirectRouteInterface', $redirect);
-        $this->assertSame($redirect, $redirect->getRouteContent());
+        $this->assertSame($redirect, $redirect->getContent());
         $params = $redirect->getParameters();
         $this->assertSame($route, $redirect->getRouteTarget());
         $defaults = $redirect->getDefaults();
@@ -54,6 +54,6 @@ public function testSetContent()
     {
         $content = $this->getMock('Symfony\\Cmf\\Component\\Routing\\RouteAwareInterface');
         $redirect = new RedirectRoute;
-        $redirect->setRouteContent($content);
+        $redirect->setContent($content);
     }
 }

Tests/Functional/Doctrine/Phpcr/RouteTest.php

@@ -21,7 +21,7 @@ public function testPersist()
         $route = new Route;
         $root = self::$dm->find(null, self::ROUTE_ROOT);
 
-        $route->setRouteContent($root); // this happens to be a referenceable node
+        $route->setContent($root); // this happens to be a referenceable node
         $route->setPosition($root, 'testroute');
         $route->setDefault('x', 'y');
         $route->setRequirement('testreq', 'testregex');
@@ -36,7 +36,7 @@ public function testPersist()
 
         $route = self::$dm->find(null, self::ROUTE_ROOT.'/testroute');
 
-        $this->assertNotNull($route->getRouteContent());
+        $this->assertNotNull($route->getContent());
         $this->assertEquals('/testroute', $route->getPattern());
 
         $this->assertEquals('y', $route->getDefault('x'));

Tests/Functional/Routing/DynamicRouterTest.php

@@ -220,7 +220,7 @@ public function testEnhanceTemplateByClass()
         // put a route for this content
         $root = self::$dm->find(null, self::ROUTE_ROOT);
         $route = new Route;
-        $route->setRouteContent($document);
+        $route->setContent($document);
         $route->setPosition($root, 'templatebyclass');
         self::$dm->persist($route);
         self::$dm->flush();

UPGRADE-1.1.md

@@ -8,13 +8,14 @@ PHPCR specific configurations moved into
 
     dynamic:
         phpcr_provider:
-            use_sonata_admin: auto
-            manager_registry: ~
-            manager_name: ~
+            enabled: true
+            # the rest is optional, the defaults are
             route_basepath: ~
+            manager_name: ~
             content_basepath: ~
+            use_sonata_admin: auto
 
-You need to at least set `phpcr_provider: ~` to have the PHPCR provider loaded.
+You need to at least set `phpcr_provider.enabled: true` to have the PHPCR provider loaded.
 
 Dropped redundant unused `routing_repositoryroot` configuration.