From 9f45349167d2b7780aab67599b4228e5d6a0dcec Mon Sep 17 00:00:00 2001
From: Kevin ARBOUIN <lesmyrmidons@gmail.com>
Date: Thu, 10 Jul 2014 18:02:36 +0200
Subject: [PATCH 1/2] Add compatibility Symfony 3

---
 plugins/symfony2/symfony2.plugin.zsh | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 4c07349a4..cbdd9dc97 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -4,19 +4,35 @@ _symfony2_get_command_list () {
 	php app/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
 }
 
+_symfony3_get_command_list () {
+	php bin/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+}
+
 _symfony2 () {
   if [ -f app/console ]; then
     compadd `_symfony2_get_command_list`
+  elif [ -f bin/console ]; then
+    compadd `_symfony3_get_command_list`
+  fi
+}
+
+_symfony_bin () {
+  if [ -f app/console ]; then
+    php app/console
+  elif [ -f bin/console ]; then
+    php bin/console
   fi
 }
 
 compdef _symfony2 app/console
+compdef _symfony2 bin/console
 compdef _symfony2 sf
 
 #Alias
-alias sf='php app/console'
-alias sfcl='php app/console cache:clear'
-alias sfroute='php app/console router:debug'
-alias sfcontainer='php app/console container:debug'
-alias sfgb='php app/console generate:bundle'
+alias sf='_symfony_bin'
+alias sfcl='_symfony_bin cache:clear'
+alias sfcw='_symfony_bin cache:warmup'
+alias sfroute='_symfony_bin router:debug'
+alias sfcontainer='_symfony_bin container:debug'
+alias sfgb='_symfony_bin generate:bundle'
 

From 9f9dd795dd5319ceab25fcbc0fdd4e017fde023f Mon Sep 17 00:00:00 2001
From: Kevin ARBOUIN <lesmyrmidons@gmail.com>
Date: Fri, 11 Jul 2014 17:19:11 +0200
Subject: [PATCH 2/2] Fix completion for alias sf

---
 plugins/symfony2/symfony2.plugin.zsh | 42 +++++++++++++---------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index cbdd9dc97..e5d0a9f6f 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -1,38 +1,34 @@
 # Symfony2 basic command completion
+if [[ -f app/console ]]; then
+    symfony='app/console'
+elif [[ -f bin/console ]]; then
+    symfony='bin/console'
+fi
 
 _symfony2_get_command_list () {
-	php app/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+    php app/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
 }
 
 _symfony3_get_command_list () {
-	php bin/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+    php bin/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
 }
 
 _symfony2 () {
-  if [ -f app/console ]; then
-    compadd `_symfony2_get_command_list`
-  elif [ -f bin/console ]; then
-    compadd `_symfony3_get_command_list`
-  fi
+    if [[ -f app/console ]]; then
+        compadd `_symfony2_get_command_list`
+    elif [[ -f bin/console ]]; then
+        compadd `_symfony3_get_command_list`
+    fi
 }
 
-_symfony_bin () {
-  if [ -f app/console ]; then
-    php app/console
-  elif [ -f bin/console ]; then
-    php bin/console
-  fi
-}
-
-compdef _symfony2 app/console
-compdef _symfony2 bin/console
+compdef _symfony2 $symfony
 compdef _symfony2 sf
 
 #Alias
-alias sf='_symfony_bin'
-alias sfcl='_symfony_bin cache:clear'
-alias sfcw='_symfony_bin cache:warmup'
-alias sfroute='_symfony_bin router:debug'
-alias sfcontainer='_symfony_bin container:debug'
-alias sfgb='_symfony_bin generate:bundle'
+alias sf=$symfony
+alias sfcl='$symfony cache:clear'
+alias sfcw='$symfony cache:warmup'
+alias sfroute='$symfony router:debug'
+alias sfcontainer='$symfony container:debug'
+alias sfgb='$symfony generate:bundle'