From f2f97dd5e06be645f830e0467737d9f23544d631 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 9 May 2013 18:58:31 +0200 Subject: [ticket/11513] Update all CLI calls to phpunit to use vendor/bin. PHPBB3-11513 --- git-tools/merge.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'git-tools') diff --git a/git-tools/merge.php b/git-tools/merge.php index 034bd2032c..41a96c0890 100755 --- a/git-tools/merge.php +++ b/git-tools/merge.php @@ -78,12 +78,12 @@ function work($pull_id, $remote) add_remote($pull_user, 'phpbb3'); run("git fetch $pull_user"); run("git merge --no-ff $pull_user/$pull_branch"); - run("phpunit"); + run("phpBB/vendor/bin/phpunit"); run("git checkout develop"); run("git pull $remote develop"); run("git merge --no-ff develop-olympus"); - run("phpunit"); + run("phpBB/vendor/bin/phpunit"); break; case 'develop': @@ -93,7 +93,7 @@ function work($pull_id, $remote) add_remote($pull_user, 'phpbb3'); run("git fetch $pull_user"); run("git merge --no-ff $pull_user/$pull_branch"); - run("phpunit"); + run("phpBB/vendor/bin/phpunit"); break; default: -- cgit v1.2.3-65-gdbad