summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiro Mattia Gonano <ciromattia@gmail.com>2013-09-13 15:41:13 +0200
committerCiro Mattia Gonano <ciromattia@gmail.com>2013-09-13 15:41:13 +0200
commit2ceb9fbbe689afe302e707c6760a2349be9d2647 (patch)
treed2d6a679c7dbdc0f5c148cc9b23ad90dc77b7f6b
parent1f11ca14d95fde7b77a9f567002b1fb1363819fe (diff)
Leave vendor bindir in vendor dir
-rw-r--r--.travis.yml6
-rw-r--r--composer.json5
-rw-r--r--composer.lock2
3 files changed, 4 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index e6accdee..f6f10ac4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,13 @@ language: php
php:
- 5.3
- - 5.4
- - 5.5
before_script:
- composer self-update
- composer update --prefer-source --dev
script:
- - ./bin/phing test
+ - ./vendor/bin/phing test
after_script:
- - php ./bin/coveralls -v \ No newline at end of file
+ - php ./vendor/bin/coveralls -v \ No newline at end of file
diff --git a/composer.json b/composer.json
index 3f5537fe..a36a528b 100644
--- a/composer.json
+++ b/composer.json
@@ -88,8 +88,5 @@
},
"bin" : [
"bin/prado-cli"
- ],
- "config" : {
- "bin-dir" : "bin"
- }
+ ]
}
diff --git a/composer.lock b/composer.lock
index aeb61606..5e765495 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "876db326d7203107ae1f5fba5be97d0a",
+ "hash": "95f56e197b8a573d5c2e50d9111091d5",
"packages": [
],