Merge remote-tracking branch 'upstream/master'

Felix Jung · Felix Jung · commit 734a8b3e0607 · 2014-03-21T14:07:44.000+01:00
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

Original file line number	Diff line number	Diff line change
`@@ -120,19 +120,19 @@ endsnippet`
`120`	`120`
`121`	`121`	`snippet gs "PHP Class Getter Setter" b`
`122`	`122`	`/*`
`123`		`- * Getter for ${1/(\w+)\s*;/$1/}`
	`123`	`+ * Getter for $1`
`124`	`124`	`*/`
`125`		`-public function get${1/(\w+)\s*;/\u$1/}()`
	`125`	`+public function get${1/\w+\s*/\u$0/}()`
`126`	`126`	`{`
`127`		`- return $this->${1/(\w+)\s*;/$1/};$2`
	`127`	`+ return $this->$1;$2`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`/*`
`131`		`- * Setter for ${1/(\w+)\s*;/$1/}`
	`131`	`+ * Setter for $1`
`132`	`132`	`*/`
`133`		`-public function set${1/(\w+)\s;/\u$1/}($${1/(\w+)\s;/$1/})`
	`133`	`+public function set${1/\w+\s*/\u$0/}($$1)`
`134`	`134`	`{`
`135`		`- $this->${1/(\w+)\s;/$1/} = $${1/(\w+)\s;/$1/};$3`
	`135`	`+ $this->$1 = $$1;$3`
`136`	`136`	`${4:return $this;}`
`137`	`137`	`}`
`138`	`138`	`$0`