From 3e0e868626ec69b658641b3202cbeed2a9f82447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Haso=C5=88?= Date: Thu, 6 Aug 2015 11:19:27 +0200 Subject: [PATCH 1/2] Add an optional dependency on jms/serializer-bundle Conflicts: composer.json --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a7f819d..1d9cce9 100644 --- a/composer.json +++ b/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" }, From 85f2b75a6b7ab55154f2176946350e9ccbd42cd8 Mon Sep 17 00:00:00 2001 From: Lukas Kahwe Smith Date: Sat, 26 Dec 2015 10:26:52 +0100 Subject: [PATCH 2/2] fix PHP 5.3 build issues by increasing the memory limit --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3cfe042..ce5fc92 100644 --- a/.travis.yml +++ b/.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