Merge pull request #107 from jdecool/php71-compatibility

Allow the bundle to use atoum 3.x to be compatible with PHP 7.1
atoum · Feb 10, 2017 · 789d2eb · 789d2eb · omansour · Feb 23, 2017
2 parents 34f9a8e + 8cba684
commit 789d2eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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": {