Merge pull request #29 from jubianchi/update-atoum

Update to newer atoum versions
BedrockStreaming · Feb 27, 2017 · 9492fa8 · 9492fa8
2 parents 6c4f9fc + 2ff1c5c
commit 9492fa8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.bootstrap.atoum.php b/.bootstrap.atoum.php
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 5.5
   - 7.0
+  - 7.1
 
 env:
   - SYMFONY_VERSION="~2.3.0"
@@ -20,7 +21,7 @@ before_install:
   - sudo apt-add-repository ppa:linuxjedi/ppa -y
   - sudo apt-get update
   - sudo apt-get install -y libuv-dev libssl-dev
-  - cd /tmp && git clone https://github.com/datastax/php-driver.git && cd php-driver && git submodule update --init
+  - cd /tmp && git clone https://github.com/datastax/php-driver.git && cd php-driver && git checkout v1.2.2 && git submodule update --init
   - cd ext && ./install.sh && cd "$TRAVIS_BUILD_DIR"
   - echo "extension=cassandra.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
 

diff --git a/composer.json b/composer.json
@@ -13,10 +13,10 @@
   ],
   "require": {
     "php": ">=5.5",
-    "ext-cassandra": "*"
+    "ext-cassandra": "<1.3.0"
   },
   "require-dev": {
-    "atoum/atoum": "~2.0",
+    "atoum/atoum": "^2.8||^3.0",
     "m6web/coke": "~1.2",
     "m6web/symfony2-coding-standard": "~2.0",
     "symfony/dependency-injection": "~2.3",