Merge remote-tracking branch 'upstream/master'

darookee · Mar 21, 2014 · 734a8b3 · 734a8b3
2 parents ab0e535 + e868e17
commit 734a8b3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
@@ -120,19 +120,19 @@ endsnippet
 
 snippet gs "PHP Class Getter Setter" b
 /*
- * Getter for ${1/(\w+)\s*;/$1/}
+ * Getter for $1
  */
-public function get${1/(\w+)\s*;/\u$1/}()
+public function get${1/\w+\s*/\u$0/}()
 {
-	return $this->${1/(\w+)\s*;/$1/};$2
+	return $this->$1;$2
 }
 
 /*
- * Setter for ${1/(\w+)\s*;/$1/}
+ * Setter for $1
  */
-public function set${1/(\w+)\s*;/\u$1/}($${1/(\w+)\s*;/$1/})
+public function set${1/\w+\s*/\u$0/}($$1)
 {
-	$this->${1/(\w+)\s*;/$1/} = $${1/(\w+)\s*;/$1/};$3
+	$this->$1 = $$1;$3
 	${4:return $this;}
 }
 $0