Merge pull request #3 from ptondereau/udpate-glide

Update to glide 1.0

.gitignore

@@ -2,4 +2,5 @@
 .idea
 vendor
 bin
-phpunit.xml
+phpunit.xml
+composer.lock

.travis.yml

@@ -1,11 +1,28 @@
 language: php
 
 php:
+  - hhvm
+  - 7.1
+  - 7.0
   - 5.6
   - 5.5
   - 5.4
 
+# This triggers builds to run on the new TravisCI infrastructure.
+# See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/
+sudo: false
+
+## Cache composer
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+before_install:
+  - if [[ $TRAVIS_PHP_VERSION =~ ^hhvm ]]; then echo 'hhvm.jit = false' >> /etc/hhvm/php.ini ; fi
+  - composer self-update --stable -n
+
+install:
+  - travis_retry composer install --no-suggest --prefer-dist -n -o
+
 script:
-  - composer self-update
-  - composer install
-  - phpunit --coverage-text
+  - vendor/phpunit/phpunit/phpunit --coverage-text

composer.json

@@ -29,8 +29,8 @@
     "league/glide": "~1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.2.6",
-    "matthiasnoback/symfony-dependency-injection-test": "0.*"
+    "phpunit/phpunit": "^4.8|^5.0",
+    "matthiasnoback/symfony-dependency-injection-test": "^1.0"
   },
   "autoload": {
     "psr-4": { "AshleyDawson\\GlideBundle\\": "src" }