Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 10efaba

Browse files
authored
Merge pull request #70 from EmmanuelVella/patch-1
Allow jms/serializer-bundle 3.x
2 parents 4fba087 + 3b63b13 commit 10efaba

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ before_install:
5656
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
5757
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
5858

59-
install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
59+
install: COMPOSER_MEMORY_LIMIT=-1 travis_wait composer update --prefer-dist $COMPOSER_FLAGS
6060

6161
script:
6262
- if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"require": {
1313
"php": "^7.1",
1414
"symfony-cmf/resource-bundle": "^1.0",
15-
"jms/serializer-bundle": "^1.0 | ^2.0",
15+
"jms/serializer-bundle": "^1.0 | ^2.0 | ^3.0",
1616
"symfony/translation": "^2.8 || ^3.3 || ^4.0"
1717
},
1818
"require-dev": {

0 commit comments

Comments
 (0)