Merge pull request #145 from symfony-cmf/backport-jms-serializer

Add an optional dependency on jms/serializer-bundle

Author: lsmith77

.travis.yml

@@ -20,6 +20,7 @@ matrix:
       env: SYMFONY_VERSION=2.6.*
 
 before_script:
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
   - composer self-update
   - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
   - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh

composer.json

@@ -19,13 +19,14 @@
         "symfony/framework-bundle": "~2.3",
         "symfony/assetic-bundle": "~2.1",
         "friendsofsymfony/rest-bundle": "~1.0",
-        "jms/serializer-bundle": "~0.12",
         "midgard/createphp": "~1.0"
     },
     "require-dev": {
+        "jms/serializer-bundle": "^0.12|^1.0",
         "symfony-cmf/testing": "~1.1"
     },
     "suggest": {
+        "jms/serializer-bundle": "Add support for advanced serialization capabilities (^0.12|^1.0)",
         "symfony-cmf/core-bundle": "To be able to enable 'rest_force_request_locale', ~1.0",
         "symfony-cmf/media-bundle": "When using the default image support, ~1.1"
     },