From 8a023a189775c2b54052549f3b6ee8939be567c8 Mon Sep 17 00:00:00 2001 From: Guilhem N Date: Mon, 27 Nov 2017 14:40:22 +0100 Subject: [PATCH] Update travis config (#1117) --- .travis.yml | 2 +- composer.json | 3 +++ phpunit.xml.dist | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e2b3080..2e3204a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ before_install: - phpenv config-rm xdebug.ini - if [ "$SF_4" == "true" ]; then composer config minimum-stability dev; fi - if [ "$SF_4" == "true" ]; then composer require symfony/symfony:4.0.* --dev --no-update; fi - - if [ "$SF_4" == "true" ]; then composer require friendsofsymfony/rest-bundle:dev-master --dev --no-update; fi + - if [ "$SF_4" == "true" ]; then composer require jms/serializer-bundle:dev-master --dev --no-update; fi install: composer update $COMPOSER_FLAGS --prefer-stable diff --git a/composer.json b/composer.json index 6d10ec7..354c5c1 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,9 @@ "zircote/swagger-php": "^2.0.9" }, "require-dev": { + "symfony/yaml": "Temporary: see https://github.com/symfony/symfony/pull/24634/files#r153192689", + "symfony/yaml": "^2.8|^3.0|^4.0", + "symfony/templating": "^2.8|^3.0|^4.0", "symfony/twig-bundle": "^3.0|^4.0", "symfony/asset": "^2.8|^3.0|^4.0", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index fb133f5..58e4a52 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -8,6 +8,7 @@ bootstrap="vendor/autoload.php" > +