Merge pull request #270 from fenom-template/develop

Fix bugs; phpunit things
fenom-template · Apr 22, 2017 · 7d0db43 · 7d0db43
2 parents 449b76e + 44ac3b1
commit 7d0db43
Show file tree

Hide file tree

Showing 10 changed files with 565 additions and 376 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,10 +11,11 @@ php:
   - 7.1
 
 before_script:
-  - composer update --dev --quiet
+  - composer global require satooshi/php-coveralls
+#  - composer update --dev --quiet
 
 script:
-  - phpunit
+  - phpunit -c phpunit.xml.dist
 
 after_script:
-  - php vendor/bin/coveralls
+  - coveralls
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "ext-tokenizer": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "*",
+        "phpunit/phpunit": "<6.0",
         "satooshi/php-coveralls": "*"
     },
     "autoload": {