Merge branch 'master' into subscriptions

Author: Konstantinos Christofilos

.gitignore

@@ -1,3 +1,2 @@
-.idea/*
-vendor/*
-public/*
+composer.lock
+vendor/

.travis.yml

@@ -1,5 +1,7 @@
 language: php
 
+sudo: false
+
 php:
   - 5.3
   - 5.4
@@ -11,13 +13,16 @@ php:
 matrix:
   allow_failures:
     - php: 7.0
+  include:
+    - php: 5.3
+      env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
 
 before_script:
   - travis_retry composer self-update
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
 
 script:
-  - phpunit --coverage-text --coverage-clover=coverage.clover
+  - php vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:
   - php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover

composer.json

@@ -32,7 +32,7 @@
     },
     "require": {
         "omnipay/common": "~2.0",
-        "braintree/braintree_php": "^2.0"
+        "braintree/braintree_php": "^2.39|^3.0"
     },
     "require-dev": {
         "omnipay/tests": "~2.0"