Diff
1diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
2index 86f2ca4dfba5bbaf5dcf391392423b622f517f8e..7f70e3d7267ea9ff6a37b70846bfaf04b41df193 100644
3--- a/plugins/composer/composer.plugin.zsh
4+++ b/plugins/composer/composer.plugin.zsh
5@@ -7,11 +7,11 @@
6
7 # Composer basic command completion
8 _composer_get_command_list () {
9- composer --no-ansi | sed "1,/Available commands/d" | awk '/^ [a-z]+/ { print $1 }'
10+ $_comp_command1 --no-ansi | sed "1,/Available commands/d" | awk '/^\s*[a-z]+/ { print $1 }'
11 }
12
13 _composer_get_required_list () {
14- composer show -s --no-ansi | sed '1,/requires/d' | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }'
15+ $_comp_command1 show -s --no-ansi | sed '1,/requires/d' | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }'
16 }
17
18 _composer () {
19@@ -20,29 +20,30 @@ _composer () {
20 _arguments \
21 '1: :->command'\
22 '*: :->args'
23- if [ -f composer.json ]; then
24- case $state in
25- command)
26- compadd `_composer_get_command_list`
27- ;;
28- *)
29- compadd `_composer_get_required_list`
30- ;;
31- esac
32- else
33- compadd create-project init search selfupdate show
34- fi
35+
36+ case $state in
37+ command)
38+ compadd $(_composer_get_command_list)
39+ ;;
40+ *)
41+ compadd $(_composer_get_required_list)
42+ ;;
43+ esac
44 }
45
46 compdef _composer composer
47+compdef _composer composer.phar
48
49 # Aliases
50 alias c='composer'
51 alias csu='composer self-update'
52 alias cu='composer update'
53+alias cr='composer require'
54 alias ci='composer install'
55 alias ccp='composer create-project'
56 alias cdu='composer dump-autoload'
57+alias cgu='composer global update'
58+alias cgr='composer global require'
59
60 # install composer in the current directory
61 alias cget='curl -s https://getcomposer.org/installer | php'