From 8cba684ee792504f683fbce8ca6d2420d46744f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20DECOOL?= Date: Tue, 7 Feb 2017 21:33:10 +0100 Subject: [PATCH] Allow the bundle to use atoum 3.x to be compatible with PHP 7.1 --- .travis.yml | 5 +++-- composer.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d831d0..f477b08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ php: - 5.5 - 5.6 - 7.0 - + - 7.1 cache: directories: @@ -21,7 +21,8 @@ env: script: - composer update $COMPOSER_PREFER - - "[[ \"$TRAVIS_PHP_VERSION\" != '5.3' && \"$TRAVIS_PHP_VERSION\" != '5.4' ]] && composer require --dev 'atoum/reports-extension:^2.0.1' || true" + - "[[ \"$TRAVIS_PHP_VERSION\" == '7.1' ]] && composer require 'atoum/atoum:dev-3.0.x-dev' || true" + - "[[ \"$TRAVIS_PHP_VERSION\" != '5.3' && \"$TRAVIS_PHP_VERSION\" != '5.4' && \"$TRAVIS_PHP_VERSION\" != '7.1' ]] && composer require --dev 'atoum/reports-extension:^2.0.1' || true" - bin/atoum -ncc notifications: diff --git a/composer.json b/composer.json index 8b1e660..02a94e6 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "symfony/finder": ">=2.3.0|^3.0", "symfony/dom-crawler": ">=2.3.0|^3.0", "symfony/css-selector": ">=2.3.0|^3.0", - "atoum/atoum": ">=2.1.0,<3.0", + "atoum/atoum": "^2.1.0|^3.0", "fzaninotto/faker": "1.*" }, "require-dev": {