Merge pull request #28 from symfony-cmf/menu_20

Updated dependencies for CmfMenuBundle 2.0

.travis.yml

@@ -4,7 +4,6 @@ php:
   - 5.3
   - 5.4
   - 5.5
-  - 5.6
   - 7.0
   - hhvm
 
@@ -14,11 +13,21 @@ cache:
   directories:
     - $HOME/.composer/cache
 
-before_script:
+matrix:
+  finish_fast: true
+  include:
+    - php: 5.6
+      env: COMPOSER_CMD=install
+
+before_install:
+  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
+  - phpenv config-rm xdebug.ini || true
   - composer self-update
-  - composer install --prefer-dist
-  - app/console doctrine:database:create -e=test
-  - app/console doctrine:phpcr:init:dbal -e=test
+
+install: if [ "$COMPOSER_CMD" = "install" ]; then composer install --prefer-dist; else composer update --prefer-dist; fi
+
+before_script:
+  - app/console doctrine:phpcr:init:dbal --force -e=test
   - app/console doctrine:phpcr:workspace:create standard_test -e=test
   - app/console doctrine:phpcr:repository:init -e=test
 

app/AppKernel.php

@@ -35,7 +35,6 @@ public function registerBundles()
 
             new Symfony\Cmf\Bundle\CreateBundle\CmfCreateBundle(),
             new FOS\RestBundle\FOSRestBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle(),
 
             // Application bundles
             new AppBundle\AppBundle(),

composer.json

@@ -14,10 +14,10 @@
         "psr-0": { "": "src/", "SymfonyStandard": "app/" }
     },
     "minimum-stability": "dev",
+    "prefer-stable": true,
     "require": {
         "php": "^5.3.9|^7.0",
         "symfony/symfony": "~2.6",
-        "symfony/symfony": "2.6.*",
         "doctrine/orm": "~2.2,>=2.2.3,<2.5",
         "doctrine/dbal": "<2.5",
         "doctrine/doctrine-bundle": "~1.2",