From a157310eb9b8a37531ae22cd013aa9ce7727ba2d Mon Sep 17 00:00:00 2001
From: Diogo Azevedo <diogoazevedos@gmail.com>
Date: Wed, 31 Aug 2016 09:25:32 -0300
Subject: [PATCH 1/3] Add composer folder recognizer

---
 plugins/composer/composer.plugin.zsh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 07eb1de88..35ddafd9e 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -14,6 +14,19 @@ _composer_get_required_list () {
     $_comp_command1 show -s --no-ansi 2>/dev/null | sed '1,/requires/d' | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }'
 }
 
+FOUND_COMPOSER=0
+composerdirs=("$HOME/.composer" "$HOME/.config/composer")
+
+for composerdir in "${composerdirs[@]}" ; do
+    if [ -d $composerdir/bin -a $FOUND_COMPOSER -eq 0 ] ; then
+        FOUND_RBENV=1
+        
+        # Add Composer's global binaries to PATH
+        export PATH=${composerdir}/vendor/bin:$PATH
+    fi
+done
+unset composerdir
+
 _composer () {
   local curcontext="$curcontext" state line
   typeset -A opt_args
@@ -47,6 +60,3 @@ alias cgr='composer global require'
 
 # install composer in the current directory
 alias cget='curl -s https://getcomposer.org/installer | php'
-
-# Add Composer's global binaries to PATH
-export PATH=$PATH:~/.composer/vendor/bin

From f542dc33650f79e3b403e44c7f2d52d56b22985c Mon Sep 17 00:00:00 2001
From: Diogo Azevedo <diogoazevedos@gmail.com>
Date: Wed, 31 Aug 2016 09:32:21 -0300
Subject: [PATCH 2/3] Fix the composer check path

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

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 35ddafd9e..ca8bc20f2 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -18,7 +18,7 @@ FOUND_COMPOSER=0
 composerdirs=("$HOME/.composer" "$HOME/.config/composer")
 
 for composerdir in "${composerdirs[@]}" ; do
-    if [ -d $composerdir/bin -a $FOUND_COMPOSER -eq 0 ] ; then
+    if [ -d $composerdir/vendor/bin -a $FOUND_COMPOSER -eq 0 ] ; then
         FOUND_RBENV=1
         
         # Add Composer's global binaries to PATH

From c5e410ee595cddce15f96c9eb211f1a70289c02e Mon Sep 17 00:00:00 2001
From: Diogo Azevedo <diogoazevedos@gmail.com>
Date: Sat, 29 Oct 2016 20:34:15 -0200
Subject: [PATCH 3/3] Fix found variable name

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

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index ca8bc20f2..bb3ad6eff 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -19,7 +19,7 @@ composerdirs=("$HOME/.composer" "$HOME/.config/composer")
 
 for composerdir in "${composerdirs[@]}" ; do
     if [ -d $composerdir/vendor/bin -a $FOUND_COMPOSER -eq 0 ] ; then
-        FOUND_RBENV=1
+        FOUND_COMPOSER=1
         
         # Add Composer's global binaries to PATH
         export PATH=${composerdir}/vendor/bin:$PATH