Merge pull request #108 from symfony-cmf/fix_fos_js_routing

Fix FosJsRoutingBundle requirement

Author: wouterj

.travis.yml

@@ -37,9 +37,10 @@ matrix:
       env: SYMFONY_VERSION=3.0.*
 
 before_install:
-  - composer self-update || true
+  - composer self-update
 
 install:
+  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
   - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
   - composer update --prefer-source $COMPOSER_FLAGS
 

composer.json

@@ -20,7 +20,8 @@
         "doctrine/phpcr-bundle": "~1.1,>=1.1.0-beta2",
         "doctrine/data-fixtures": "1.*,>=1.0.0-alpha3",
         "jackalope/jackalope": "~1.1,>=1.1.5",
-        "jackalope/jackalope-doctrine-dbal": "~1.1,>=1.1.5"
+        "jackalope/jackalope-doctrine-dbal": "~1.1,>=1.1.5",
+        "friendsofsymfony/jsrouting-bundle": "~1.1"
     },
     "autoload": {
         "psr-4": {

src/HttpKernel/TestKernel.php

@@ -57,15 +57,12 @@ public function __construct($env, $debug)
             'Sonata\CoreBundle\SonataCoreBundle',
             'Sonata\AdminBundle\SonataAdminBundle',
             'Knp\Bundle\MenuBundle\KnpMenuBundle',
+            'FOS\JsRoutingBundle\FOSJsRoutingBundle',
         );
 
         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',