Merge pull request #297 from symfony-cmf/fix-bc-break

revert BC break introduced in #292

Author: dbu

Admin/RouteAdmin.php

@@ -15,6 +15,7 @@
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin;
+use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
 use Symfony\Cmf\Bundle\RoutingBundle\Model\Route;
 use PHPCR\Util\PathHelper;
 
@@ -40,6 +41,13 @@ class RouteAdmin extends Admin
      */
     protected $contentClass;
 
+    /**
+     * @var ControllerResolverInterface
+     *
+     * @deprecated Since 1.4, use the RouteDefaults validator on your document.
+     */
+    protected $controllerResolver;
+
     protected function configureListFields(ListMapper $listMapper)
     {
         $listMapper
@@ -109,6 +117,14 @@ public function setContentRoot($contentRoot)
         $this->contentRoot = $contentRoot;
     }
 
+    /**
+     * @deprecated Since 1.4, use the RouteDefaults validator on your document.
+     */
+    public function setControllerResolver($controllerResolver)
+    {
+        $this->controllerResolver = $controllerResolver;
+    }
+
     public function getExportFormats()
     {
         return array();

Resources/config/admin-phpcr.xml

@@ -32,6 +32,10 @@
             <call method="setRouteRoot">
                 <argument>%cmf_routing.dynamic.persistence.phpcr.admin_basepath%</argument>
             </call>
+
+            <call method="setControllerResolver">
+                <argument type="service" id="controller_resolver" />
+            </call>
         </service>
 
         <service id="cmf_routing.redirect_route_admin" class="%cmf_routing.redirect_route_admin.class%">