Fixing undefined variable usage

Squash of pull request #872
cakephp · Sep 29, 2012 · 2d46fc6 · 2d46fc6
1 parent 393849a
commit 2d46fc6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/lib/Cake/Cache/Engine/WincacheEngine.php b/lib/Cake/Cache/Engine/WincacheEngine.php
@@ -183,6 +183,7 @@ public function groups() {
  * @return boolean success
  **/
 	public function clearGroup($group) {
+		$success = null;
 		wincache_ucache_inc($this->settings['prefix'] . $group, 1, $success);
 		return $success;
 	}

diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php
@@ -215,7 +215,8 @@ public function dispatch() {
 				return $Shell->main();
 			}
 		}
-		throw new MissingShellMethodException(array('shell' => $shell, 'method' => $arg));
+
+		throw new MissingShellMethodException(array('shell' => $shell, 'method' => $command));
 	}
 
 /**

diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
@@ -3250,7 +3250,7 @@ public function joinModel($assoc, $keys = array()) {
 			return array($with, array_unique(array_merge($assoc[$with], $keys)));
 		}
 		trigger_error(
-			__d('cake_dev', 'Invalid join model settings in %s', $model->alias),
+			__d('cake_dev', 'Invalid join model settings in %s. The association parameter has the wrong type, expecting a string or array, but was passed type: %s', $this->alias, gettype($assoc)),
 			E_USER_WARNING
 		);
 	}