Merge pull request #27 from GrahamCampbell/stuff

Composer And Travis Updates

Author: mvriel

.gitignore

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

.travis.yml

@@ -5,15 +5,24 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - hhvm
+  - hhvm-nightly
+
+matrix:
+    allow_failures:
+        - php: hhvm
+        - php: hhvm-nightly
 
 script:
- - vendor/phpunit/phpunit/composer/bin/phpunit -v
+ - vendor/bin/phpunit
 
 before_script:
  - sudo apt-get -qq update > /dev/null
  - phpenv rehash > /dev/null
  - composer selfupdate --quiet
- - composer install --dev --prefer-dist
+ - composer install --no-interaction --prefer-source --dev
+ - vendor/bin/phpunit
+ - composer update --no-interaction --prefer-source --dev
 
 notifications:
   irc: "irc.freenode.org#phpdocumentor"

composer.json

@@ -12,16 +12,16 @@
     "require": {
         "php": ">=5.3.3",
         "psr/log": "~1.0",
-        "nikic/php-parser": "0.9.4",
-        "phpdocumentor/reflection-docblock": "2.*"
+        "nikic/php-parser": "~0.9.4",
+        "phpdocumentor/reflection-docblock": "~2.0"
     },
     "suggests": {
         "symfony/event-dispatcher": "~2.1"
     },
     "require-dev": {
         "behat/behat": "~2.4",
-        "phpunit/phpunit": "~3.7",
-        "mockery/mockery": ">=0.7.0"
+        "phpunit/phpunit": "~4.0",
+        "mockery/mockery": "~0.8"
     },
     "extra": {
         "branch-alias": {