Merge pull request #103 from symfony-cmf/fos-js-routing

Optionally include FOSJsRoutingBundle

Author: wouterj

src/HttpKernel/TestKernel.php

@@ -62,22 +62,23 @@ public function __construct($env, $debug)
         if (class_exists('Sonata\jQueryBundle\SonatajQueryBundle')) {
             $baseSonataBundles[] = 'Sonata\jQueryBundle\SonatajQueryBundle';
         }
+        
+        if (class_exists('FOS\JsRoutingBundle\FOSJsRoutingBundle')) {
+            $baseSonataBundles[] = 'FOS\JsRoutingBundle\FOSJsRoutingBundle';
+        }
 
         $this->registerBundleSet('sonata_admin', array_merge(array(
             'Sonata\DoctrinePHPCRAdminBundle\SonataDoctrinePHPCRAdminBundle',
             'Symfony\Cmf\Bundle\TreeBrowserBundle\CmfTreeBrowserBundle',
-            'FOS\JsRoutingBundle\FOSJsRoutingBundle',
         ), $baseSonataBundles));
 
         $this->registerBundleSet('sonata_admin_orm', array_merge(array(
-            'FOS\JsRoutingBundle\FOSJsRoutingBundle',
             'Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle',
         ), $baseSonataBundles));
 
         $this->registerBundleSet('sonata_admin_phpcr', array_merge(array(
             'Sonata\DoctrinePHPCRAdminBundle\SonataDoctrinePHPCRAdminBundle',
             'Symfony\Cmf\Bundle\TreeBrowserBundle\CmfTreeBrowserBundle',
-            'FOS\JsRoutingBundle\FOSJsRoutingBundle',
         ), $baseSonataBundles));
 
         parent::__construct($env, $debug);