Merge branch 'master' into 2.4

lib/Cake/Console/Command/Task/TestTask.php

@@ -277,7 +277,7 @@ class TestTask extends BakeTask {
  * @param string $class the Classname of the class the test is being generated for.
  * @return object And instance of the class that is going to be tested.
  */
-	public function &buildTestSubject($type, $class) {
+	public function buildTestSubject($type, $class) {
 		ClassRegistry::flush();
 		App::import($type, $class);
 		$class = $this->getRealClassName($type, $class);

lib/Cake/I18n/I18n.php

@@ -110,7 +110,7 @@ class I18n {
  *
  * @return I18n
  */
-	public static function &getInstance() {
+	public static function getInstance() {
 		static $instance = array();
 		if (!$instance) {
 			$instance[0] = new I18n();

lib/Cake/Routing/Router.php

@@ -1083,7 +1083,7 @@ class Router {
  *
  * @return CakeRoute Matching route object.
  */
-	public static function &requestRoute() {
+	public static function requestRoute() {
 		return self::$_currentRoute[0];
 	}
 
@@ -1092,7 +1092,7 @@ class Router {
  *
  * @return CakeRoute Matching route object.
  */
-	public static function &currentRoute() {
+	public static function currentRoute() {
 		return self::$_currentRoute[count(self::$_currentRoute) - 1];
 	}
 

lib/Cake/Utility/ClassRegistry.php

@@ -58,7 +58,7 @@ class ClassRegistry {
  *
  * @return ClassRegistry instance
  */
-	public static function &getInstance() {
+	public static function getInstance() {
 		static $instance = array();
 		if (!$instance) {
 			$instance[0] = new ClassRegistry();
@@ -259,7 +259,7 @@ class ClassRegistry {
  * @param string $key Key of object to look for
  * @return mixed Object stored in registry or boolean false if the object does not exist.
  */
-	public static function &getObject($key) {
+	public static function getObject($key) {
 		$_this = ClassRegistry::getInstance();
 		$key = Inflector::underscore($key);
 		$return = false;

lib/Cake/Utility/Debugger.php

@@ -154,7 +154,7 @@ class Debugger {
  * @param string $class
  * @return object
  */
-	public static function &getInstance($class = null) {
+	public static function getInstance($class = null) {
 		static $instance = array();
 		if (!empty($class)) {
 			if (!$instance || strtolower($class) != strtolower(get_class($instance[0]))) {

lib/Cake/Utility/File.php

@@ -526,7 +526,7 @@ class File {
  * @return Folder Current folder
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#File::Folder
  */
-	public function &folder() {
+	public function folder() {
 		return $this->Folder;
 	}