summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore10
-rw-r--r--.travis.yml2
2 files changed, 8 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index e3b3bf09..b50ee0d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,7 +74,11 @@ tests/unit/Caching/mockapp/runtime/*
tests/unit/Data/db/test.db
tests/unit/Security/app/runtime/*
tests/unit/Web/app/runtime/*
+
+# Composer stuff
vendor/*
-phpunit
-phing
-apigen.php \ No newline at end of file
+bin/phpunit
+bin/phing
+bin/apigen.php
+bin/coveralls
+bin/dbunit.php \ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 57e1082e..e6accdee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ php:
before_script:
- composer self-update
- - composer install
+ - composer update --prefer-source --dev
script:
- ./bin/phing test