Moved snippet sfa into Symfony snippets

UltiSnips/php-symfony2.snippets

@@ -53,6 +53,18 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
+snippet sfa "Symfony 2 Controller action"
+/**
+* @Route("/${1:route_name}", name="$1")
+* @Template()
+*/
+public function $1Action($2)
+{
+	$3
+	return ${4:array();}$0
+}
+endsnippet
+
 snippet act "Symfony2 action" b
 /**
  * @Route("${3}", name="${4}")

UltiSnips/php.snippets

@@ -330,7 +330,6 @@ if m:
  */
 trait $1
 {
-	public function ${3:someFunction}();$4                                                                                                              
 }
 endsnippet
 
@@ -352,19 +351,6 @@ snippet pc "Dumb debug helper in cli"
 var_export($1);$0
 endsnippet
 
-# Symfony 2 based snippets
-snippet sfa "Symfony 2 Controller action"
-/**
-* @Route("/${1:route_name}", name="$1")
-* @Template()
-*/
-public function $1Action($2)
-{
-	$3
-	return ${4:array();}$0
-}
-endsnippet
-
 snippet inheritdoc "@inheritdoc docblock"
 /**
  * {@inheritdoc}