From 864b441688efee6573d233b21075a6f23a903097 Mon Sep 17 00:00:00 2001
From: Thomas Ruiz <contact@thomasruiz.eu>
Date: Fri, 28 Feb 2020 19:28:55 +0100
Subject: composer: keep composer autocompletion when using global (#5933)

---
 plugins/composer/composer.plugin.zsh | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'plugins/composer/composer.plugin.zsh')

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 634961023..fb53da113 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -15,20 +15,16 @@ _composer_get_required_list () {
 }
 
 _composer () {
-  local curcontext="$curcontext" state line
-  typeset -A opt_args
-  _arguments \
-    '1: :->command'\
-    '*: :->args'
-
-  case $state in
-    command)
-      compadd $(_composer_get_command_list)
-      ;;
-    *)
-      compadd $(_composer_get_required_list)
-      ;;
-  esac
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+    _arguments \
+        '*:: :->subcmds'
+
+    if (( CURRENT == 1 )) || ( ((CURRENT == 2)) && [ "$words[1]" = "global" ] ) ; then
+        compadd $(_composer_get_command_list)
+    else
+        compadd $(_composer_get_required_list)
+    fi
 }
 
 compdef _composer composer
-- 
cgit v1.2.3-70-g09d2


From 54c29bbde144d1eac549817b74f5b13162dbebf1 Mon Sep 17 00:00:00 2001
From: Shahin Sorkh <sorkh.shahin@protonmail.com>
Date: Mon, 13 Apr 2020 19:53:52 +0430
Subject: composer: fix cdo alias due to command api change (#8828)

---
 plugins/composer/composer.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/composer/composer.plugin.zsh')

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index fb53da113..2c6044aef 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -39,7 +39,7 @@ alias crm='composer remove'
 alias ci='composer install'
 alias ccp='composer create-project'
 alias cdu='composer dump-autoload'
-alias cdo='composer dump-autoload --optimize-autoloader'
+alias cdo='composer dump-autoload -o'
 alias cgu='composer global update'
 alias cgr='composer global require'
 alias cgrm='composer global remove'
-- 
cgit v1.2.3-70-g09d2