Adding word boundaries to the request patterns. Also adding lookaheads

to prevent methods from being changed.

cake/console/shells/upgrade.php

@@ -175,32 +175,32 @@ public function request() {
 		$patterns = array(
 			array(
 				'$this->data -> $this->request->data',
-				'/(\$this->data)/',
+				'/(\$this->data\b(?!\())/',
 				'$this->request->data'
 			),
 			array(
 				'$this->params -> $this->request->params',
-				'/(\$this->params)/',
+				'/(\$this->params\b(?!\())/',
 				'$this->request->params'
 			),
 			array(
 				'$this->webroot -> $this->request->webroot',
-				'/(\$this->webroot)/',
+				'/(\$this->webroot\b(?!\())/',
 				'$this->request->webroot'
 			),
 			array(
 				'$this->base -> $this->request->base',
-				'/(\$this->base)/',
+				'/(\$this->base\b(?!\())/',
 				'$this->request->base'
 			),
 			array(
 				'$this->here -> $this->request->here',
-				'/(\$this->here)/',
+				'/(\$this->here\b(?!\())/',
 				'$this->request->here'
 			),
 			array(
 				'$this->action -> $this->request->action',
-				'/(\$this->action)/',
+				'/(\$this->action\b(?!\())/',
 				'$this->request->action'
 			),
 		);