added phpunit to composer

hypertext · Feb 18, 2013 · b741835 · b741835
1 parent 790ff91
commit b741835
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+bin
 composer.lock
 composer.phar
 phpunit.xml

diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ before_install:
 before_script:
     - php-cgi -b 127.0.0.1:9000 &
     - nginx -v && sudo nginx -c nginx.conf.dist -p test
+    - composer self-update
     - composer install --dev
 
-script: phpunit --coverage-text
+script: ./bin/phpunit --coverage-text
diff --git a/composer.json b/composer.json
@@ -15,12 +15,18 @@
     "require": {
         "php": ">=5.3.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "3.7.*"
+    },
     "suggest": {
         "ext-curl": "*"
     },
+    "config": {
+        "bin-dir": "bin"
+    },
     "autoload": {
         "psr-0": {
             "Buzz": "lib/"
         }
     }
-}
+}