From 2ceb9fbbe689afe302e707c6760a2349be9d2647 Mon Sep 17 00:00:00 2001 From: Ciro Mattia Gonano Date: Fri, 13 Sep 2013 15:41:13 +0200 Subject: Leave vendor bindir in vendor dir --- .travis.yml | 6 ++---- composer.json | 5 +---- composer.lock | 2 +- 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": [ ], -- cgit v1.2.3