Changeset 310

Timestamp:

03/03/10 12:41:24 (5 months ago)

Author:

sander

Message:

Do not assign the return of 'new' by reference or PHP 5.3 will yell

Location:

trunk/server/www/cake

Files:

• console/libs/console.php (modified) (1 diff)
• console/libs/schema.php (modified) (2 diffs)
• console/libs/shell.php (modified) (3 diffs)
• console/libs/tasks/controller.php (modified) (1 diff)
• console/libs/tasks/model.php (modified) (1 diff)
• console/libs/tasks/project.php (modified) (4 diffs)
• console/libs/tasks/view.php (modified) (2 diffs)
• dispatcher.php (modified) (2 diffs)
• libs/cache.php (modified) (2 diffs)
• libs/cache/file.php (modified) (1 diff)
• libs/cache/memcache.php (modified) (1 diff)
• libs/class_registry.php (modified) (3 diffs)
• libs/configure.php (modified) (4 diffs)
• libs/controller/component.php (modified) (1 diff)
• libs/controller/components/acl.php (modified) (1 diff)
• libs/controller/components/email.php (modified) (1 diff)
• libs/controller/controller.php (modified) (2 diffs)
• libs/debugger.php (modified) (2 diffs)
• libs/error.php (modified) (1 diff)
• libs/file.php (modified) (1 diff)
• libs/i18n.php (modified) (1 diff)
• libs/inflector.php (modified) (1 diff)
• libs/magic_db.php (modified) (3 diffs)
• libs/model/behavior.php (modified) (1 diff)
• libs/model/connection_manager.php (modified) (3 diffs)
• libs/model/schema.php (modified) (2 diffs)
• libs/multibyte.php (modified) (1 diff)
• libs/router.php (modified) (1 diff)
• libs/security.php (modified) (1 diff)
• libs/string.php (modified) (1 diff)
• libs/validation.php (modified) (1 diff)
• libs/view/helpers/cache.php (modified) (1 diff)
• libs/view/helpers/js.php (modified) (1 diff)
• libs/view/helpers/xml.php (modified) (2 diffs)
• libs/view/view.php (modified) (1 diff)
• libs/xml.php (modified) (3 diffs)
• tests/lib/cake_test_case.php (modified) (3 diffs)
• tests/lib/cake_test_fixture.php (modified) (1 diff)
• tests/lib/code_coverage_manager.php (modified) (3 diffs)
• tests/lib/test_manager.php (modified) (18 diffs)

trunk/server/www/cake/console/libs/console.php

@@ -65 +65 @@
                         $class = Inflector::camelize(r('.php', '', $model));
                         $this->models[$model] = $class;
-                        $this->{$class} =& new $class();
+                        $this->{$class} = new $class();
                 }
                 $this->out('Model classes:');

trunk/server/www/cake/console/libs/schema.php

@@ -84 +84 @@
                 }
 
-                $this->Schema =& new CakeSchema(compact('name', 'path', 'file', 'connection'));
+                $this->Schema = new CakeSchema(compact('name', 'path', 'file', 'connection'));
         }
 /**
@@ -143 +143 @@
 
                 if ($snapshot === true) {
-                        $Folder =& new Folder($this->Schema->path);
+                        $Folder = new Folder($this->Schema->path);
                         $result = $Folder->read();
 

trunk/server/www/cake/console/libs/shell.php

@@ -201 +201 @@
         function _loadDbConfig() {
                 if (config('database') && class_exists('DATABASE_CONFIG')) {
-                        $this->DbConfig =& new DATABASE_CONFIG();
+                        $this->DbConfig = new DATABASE_CONFIG();
                         return true;
                 }
@@ -223 +223 @@
 
                 if ($this->uses === true && App::import('Model', 'AppModel')) {
-                        $this->AppModel =& new AppModel(false, false, false);
+                        $this->AppModel = new AppModel(false, false, false);
                         return true;
                 }
@@ -291 +291 @@
                                 $this->taskNames[] = $taskName;
                                 if (!PHP5) {
-                                        $this->{$taskName} =& new $taskClass($this->Dispatch);
+                                        $this->{$taskName} = new $taskClass($this->Dispatch);
                                 } else {
                                         $this->{$taskName} = new $taskClass($this->Dispatch);

trunk/server/www/cake/console/libs/tasks/controller.php

@@ -250 +250 @@
                 }
                 $actions = null;
-                $modelObj =& new $currentModelName();
+                $modelObj = new $currentModelName();
                 $controllerPath = $this->_controllerPath($controllerName);
                 $pluralName = $this->_pluralName($currentModelName);

trunk/server/www/cake/console/libs/tasks/model.php

@@ -339 +339 @@
                         App::import('Model');
                         $tmpModelName = $this->_modelName($otherTable);
-                        $tempOtherModel = & new Model(array('name' => $tmpModelName, 'table' => $otherTable, 'ds' => $model->useDbConfig));
+                        $tempOtherModel = new Model(array('name' => $tmpModelName, 'table' => $otherTable, 'ds' => $model->useDbConfig));
                         $modelFieldsTemp = $tempOtherModel->schema();
 

trunk/server/www/cake/console/libs/tasks/project.php

@@ -193 +193 @@
  */
         function securitySalt($path) {
-                $File =& new File($path . 'config' . DS . 'core.php');
+                $File = new File($path . 'config' . DS . 'core.php');
                 $contents = $File->read();
                 if (preg_match('/([\\t\\x20]*Configure::write\\(\\\'Security.salt\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
@@ -217 +217 @@
         function corePath($path) {
                 if (dirname($path) !== CAKE_CORE_INCLUDE_PATH) {
-                        $File =& new File($path . 'webroot' . DS . 'index.php');
+                        $File = new File($path . 'webroot' . DS . 'index.php');
                         $contents = $File->read();
                         if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
@@ -228 +228 @@
                         }
 
-                        $File =& new File($path . 'webroot' . DS . 'test.php');
+                        $File = new File($path . 'webroot' . DS . 'test.php');
                         $contents = $File->read();
                         if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
@@ -249 +249 @@
  */
         function cakeAdmin($name) {
-                $File =& new File(CONFIGS . 'core.php');
+                $File = new File(CONFIGS . 'core.php');
                 $contents = $File->read();
                 if (preg_match('%([/\\t\\x20]*Configure::write\(\'Routing.admin\',[\\t\\x20\'a-z]*\\);)%', $contents, $match)) {

trunk/server/www/cake/console/libs/tasks/view.php

@@ -248 +248 @@
                 }
                 $controllerClassName = $this->controllerName . 'Controller';
-                $controllerObj = & new $controllerClassName();
+                $controllerObj = new $controllerClassName();
                 $controllerObj->constructClasses();
                 $modelClass = $controllerObj->modelClass;
@@ -291 +291 @@
                 }
                 $filename = $this->path . $this->controllerPath . DS . Inflector::underscore($action) . '.ctp';
-                $Folder =& new Folder($this->path . $this->controllerPath, true);
+                $Folder = new Folder($this->path . $this->controllerPath, true);
                 $errors = $Folder->errors();
                 if (empty($errors)) {

trunk/server/www/cake/dispatcher.php

@@ -469 +469 @@
                         }
                         $this->params = $params;
-                        $controller =& new $ctrlClass();
+                        $controller = new $ctrlClass();
                 }
                 return $controller;
@@ -701 +701 @@
                                 }
                                 $controller = null;
-                                $view =& new View($controller, false);
+                                $view = new View($controller, false);
                                 return $view->renderCache($filename, getMicrotime());
                         }

trunk/server/www/cake/libs/cache.php

@@ -69 +69 @@
                 static $instance = array();
                 if (!$instance) {
-                        $instance[0] =& new Cache();
+                        $instance[0] = new Cache();
                 }
                 return $instance[0];
@@ -153 +153 @@
                                 return false;
                         }
-                        $_this->_Engine[$name] =& new $cacheClass();
+                        $_this->_Engine[$name] = new $cacheClass();
                 }
 

trunk/server/www/cake/libs/cache/file.php

@@ -87 +87 @@
                                 require LIBS . 'file.php';
                         }
-                        $this->__File =& new File($this->settings['path'] . DS . 'cake');
+                        $this->__File = new File($this->settings['path'] . DS . 'cake');
                 }
 

trunk/server/www/cake/libs/cache/memcache.php

@@ -74 +74 @@
                 if (!isset($this->__Memcache)) {
                         $return = false;
-                        $this->__Memcache =& new Memcache();
+                        $this->__Memcache = new Memcache();
                         foreach ($this->settings['servers'] as $server) {
                                 $parts = explode(':', $server);

trunk/server/www/cake/libs/class_registry.php

@@ -66 +66 @@
                 static $instance = array();
                 if (!$instance) {
-                        $instance[0] =& new ClassRegistry();
+                        $instance[0] = new ClassRegistry();
                 }
                 return $instance[0];
@@ -132 +132 @@
 
                                 if (class_exists($class) || App::import($type, $pluginPath . $class)) {
-                                        ${$class} =& new $class($settings);
+                                        ${$class} = new $class($settings);
                                 } elseif ($type === 'Model') {
                                         if ($plugin && class_exists($plugin . 'AppModel')) {
@@ -140 +140 @@
                                         }
                                         $settings['name'] = $class;
-                                        ${$class} =& new $appModel($settings);
+                                        ${$class} = new $appModel($settings);
                                 }
 

trunk/server/www/cake/libs/configure.php

@@ -134 +134 @@
                 static $instance = array();
                 if (!$instance) {
-                        $instance[0] =& new Configure();
+                        $instance[0] = new Configure();
                         $instance[0]->__loadBootstrap($boot);
                 }
@@ -224 +224 @@
                 }
                 $items = array();
-                $Folder =& new Folder($path);
+                $Folder = new Folder($path);
                 $contents = $Folder->read(false, true);
 
@@ -901 +901 @@
                 static $instance = array();
                 if (!$instance) {
-                        $instance[0] =& new App();
+                        $instance[0] = new App();
                         $instance[0]->__map = Cache::read('file_map', '_cake_core_');
                 }
@@ -941 +941 @@
                                         require LIBS . 'folder.php';
                                 }
-                                $Folder =& new Folder();
+                                $Folder = new Folder();
                                 $directories = $Folder->tree($path, false, 'dir');
                                 $this->__paths[$path] = $directories;

trunk/server/www/cake/libs/controller/component.php

@@ -238 +238 @@
                                 } else {
                                         if ($componentCn === 'SessionComponent') {
-                                                $object->{$component} =& new $componentCn($base);
+                                                $object->{$component} = new $componentCn($base);
                                         } else {
-                                                $object->{$component} =& new $componentCn();
+                                                $object->{$component} = new $componentCn();
                                         }
                                         $object->{$component}->enabled = true;

trunk/server/www/cake/libs/controller/components/acl.php

@@ -57 +57 @@
                         }
                 }
-                $this->_Instance =& new $name();
+                $this->_Instance = new $name();
                 $this->_Instance->initialize($this);
         }

trunk/server/www/cake/libs/controller/components/email.php

@@ -657 +657 @@
                 App::import('Core', array('Socket'));
 
-                $this->__smtpConnection =& new CakeSocket(array_merge(array('protocol'=>'smtp'), $this->smtpOptions));
+                $this->__smtpConnection = new CakeSocket(array_merge(array('protocol'=>'smtp'), $this->smtpOptions));
 
                 if (!$this->__smtpConnection->connect()) {

trunk/server/www/cake/libs/controller/controller.php

@@ -310 +310 @@
                 $this->modelClass = Inflector::classify($this->name);
                 $this->modelKey = Inflector::underscore($this->modelClass);
-                $this->Component =& new Component();
+                $this->Component = new Component();
 
                 $childMethods = get_class_methods($this);
@@ -748 +748 @@
                 }
 
-                $View =& new $viewClass($this);
+                $View = new $viewClass($this);
 
                 if (!empty($this->modelNames)) {

trunk/server/www/cake/libs/debugger.php

@@ -97 +97 @@
                 if (!empty($class)) {
                         if (!$instance || strtolower($class) != strtolower(get_class($instance[0]))) {
-                                $instance[0] = & new $class();
+                                $instance[0] = new $class();
                                 if (Configure::read() > 0) {
                                         Configure::version(); // Make sure the core config is loaded
@@ -106 +106 @@
 
                 if (!$instance) {
-                        $instance[0] =& new Debugger();
+                        $instance[0] = new Debugger();
                         if (Configure::read() > 0) {
                                 Configure::version(); // Make sure the core config is loaded

trunk/server/www/cake/libs/error.php

@@ -87 +87 @@
                 if ($__previousError != array($method, $messages)) {
                         $__previousError = array($method, $messages);
-                        $this->controller =& new CakeErrorController();
+                        $this->controller = new CakeErrorController();
                 } else {
-                        $this->controller =& new Controller();
+                        $this->controller = new Controller();
                         $this->controller->viewPath = 'errors';
                 }

trunk/server/www/cake/libs/file.php

@@ -94 +94 @@
         function __construct($path, $create = false, $mode = 0755) {
                 parent::__construct();
-                $this->Folder =& new Folder(dirname($path), $create, $mode);
+                $this->Folder = new Folder(dirname($path), $create, $mode);
                 if (!is_dir($path)) {
                         $this->name = basename($path);

trunk/server/www/cake/libs/i18n.php

@@ -105 +105 @@
                 static $instance = array();
                 if (!$instance) {
-                        $instance[0] =& new I18n();
-                        $instance[0]->l10n =& new L10n();
+                        $instance[0] = new I18n();
+                        $instance[0]->l10n = new L10n();
                 }
                 return $instance[0];

trunk/server/www/cake/libs/inflector.php

@@ -129 +129 @@
 
                 if (!$instance) {
-                        $instance[0] =& new Inflector();
+                        $instance[0] = new Inflector();
                         if (file_exists(CONFIGS.'inflections.php')) {
                                 include(CONFIGS.'inflections.php');

trunk/server/www/cake/libs/magic_db.php

@@ -54 +54 @@
                         $data = $magicDb;
                 } else {
-                        $File =& new File($magicDb);
+                        $File = new File($magicDb);
                         if (!$File->exists()) {
                                 return false;
@@ -159 +159 @@
 
                 $matches = array();
-                $MagicFileResource =& new MagicFileResource($file);
+                $MagicFileResource = new MagicFileResource($file);
                 foreach ($this->db['database'] as $format) {
                         $magic = $format[0];
@@ -203 +203 @@
         function __construct($file) {
                 if (file_exists($file)) {
-                        $this->resource =& new File($file);
+                        $this->resource = new File($file);
                 } else {
                         $this->resource = $file;

trunk/server/www/cake/libs/model/behavior.php

@@ -277 +277 @@
                                 $this->{$name} = new $class;
                         } else {
-                                $this->{$name} =& new $class;
+                                $this->{$name} = new $class;
                         }
                 } elseif (isset($this->{$name}->settings) && isset($this->{$name}->settings[$this->modelName])) {

trunk/server/www/cake/libs/model/connection_manager.php

@@ -64 +64 @@
         function __construct() {
                 if (class_exists('DATABASE_CONFIG')) {
-                        $this->config =& new DATABASE_CONFIG();
+                        $this->config = new DATABASE_CONFIG();
                 }
         }
@@ -78 +78 @@
 
                 if (!$instance) {
-                        $instance[0] =& new ConnectionManager();
+                        $instance[0] = new ConnectionManager();
                 }
 
@@ -104 +104 @@
                         $class = $conn['classname'];
                         $_this->loadDataSource($name);
-                        $_this->_dataSources[$name] =& new $class($_this->config->{$name});
+                        $_this->_dataSources[$name] = new $class($_this->config->{$name});
                         $_this->_dataSources[$name]->configKeyName = $name;
                 } else {

trunk/server/www/cake/libs/model/schema.php

@@ -159 +159 @@
 
                 if (class_exists($class)) {
-                        $Schema =& new $class($options);
+                        $Schema = new $class($options);
                         return $Schema;
                 }
@@ -352 +352 @@
 
 
-                $File =& new File($path . DS . $file, true);
+                $File = new File($path . DS . $file, true);
                 $header = '$Id';
                 $content = "<?php \n/* SVN FILE: $header$ */\n/* ". $name ." schema generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n{$out}?>";

trunk/server/www/cake/libs/multibyte.php

@@ -275 +275 @@
 
                 if (!$instance) {
-                        $instance[0] =& new Multibyte();
+                        $instance[0] = new Multibyte();
                 }
                 return $instance[0];

trunk/server/www/cake/libs/router.php

@@ -171 +171 @@
 
                 if (!$instance) {
-                        $instance[0] =& new Router();
+                        $instance[0] = new Router();
                         $instance[0]->__admin = Configure::read('Routing.admin');
                 }

trunk/server/www/cake/libs/security.php

@@ -51 +51 @@
                 static $instance = array();
                 if (!$instance) {
-                        $instance[0] =& new Security;
+                        $instance[0] = new Security;
                 }
                 return $instance[0];

trunk/server/www/cake/libs/string.php

@@ -43 +43 @@
 
                 if (!$instance) {
-                        $instance[0] =& new String();
+                        $instance[0] = new String();
                 }
                 return $instance[0];

trunk/server/www/cake/libs/validation.php

@@ -120 +120 @@
 
                 if (!$instance) {
-                        $instance[0] =& new Validation();
+                        $instance[0] = new Validation();
                 }
                 return $instance[0];

trunk/server/www/cake/libs/view/helpers/cache.php

@@ -253 +253 @@
                 }
 
-                $file .= '$controller =& new ' . $this->controllerName . 'Controller();
+                $file .= '$controller = new ' . $this->controllerName . 'Controller();
                                 $controller->plugin = $this->plugin = \''.$this->plugin.'\';
                                 $controller->helpers = $this->helpers = unserialize(\'' . serialize($this->helpers) . '\');

trunk/server/www/cake/libs/view/helpers/js.php

@@ -137 +137 @@
 
                 $func .= "'" . Router::url($url) . "'";
-                $ajax =& new AjaxHelper();
+                $ajax = new AjaxHelper();
                 $func .= ", " . $ajax->__optionsForAjax($options) . ")";
 

trunk/server/www/cake/libs/view/helpers/xml.php

@@ -47 +47 @@
         function __construct() {
                 parent::__construct();
-                $this->Xml =& new Xml();
+                $this->Xml = new Xml();
                 $this->Xml->options(array('verifyNs' => false));
         }
@@ -153 +153 @@
  */
         function serialize($data, $options = array()) {
-                $data =& new Xml($data, array_merge(array('attributes' => false, 'format' => 'attributes'), $options));
+                $data = new Xml($data, array_merge(array('attributes' => false, 'format' => 'attributes'), $options));
                 return $data->toString(array_merge(array('header' => false), $options));
         }

trunk/server/www/cake/libs/view/view.php

@@ -742 +742 @@
                                         }
                                 }
-                                $loaded[$helper] =& new $helperCn($options);
+                                $loaded[$helper] = new $helperCn($options);
                                 $vars = array(
                                         'base', 'webroot', 'here', 'params', 'action', 'data', 'themeWeb', 'plugin'

trunk/server/www/cake/libs/xml.php

@@ -148 +148 @@
  */
         function &createNode($name = null, $value = null, $namespace = false) {
-                $node =& new XmlNode($name, $value, $namespace);
+                $node = new XmlNode($name, $value, $namespace);
                 $node->setParent($this);
                 return $node;
@@ -162 +162 @@
  */
         function &createElement($name = null, $value = null, $attributes = array(), $namespace = false) {
-                $element =& new XmlElement($name, $value, $attributes, $namespace);
+                $element = new XmlElement($name, $value, $attributes, $namespace);
                 $element->setParent($this);
                 return $element;
@@ -1362 +1362 @@
 
                 if (!$instance) {
-                        $instance[0] =& new XmlManager();
+                        $instance[0] = new XmlManager();
                 }
                 return $instance[0];

trunk/server/www/cake/tests/lib/cake_test_case.php

@@ -195 +195 @@
 
                                 foreach ($models as $model) {
-                                        $fixture =& new CakeTestFixture($this->db);
+                                        $fixture = new CakeTestFixture($this->db);
 
                                         $fixture->name = $model['model'] . 'Test';
@@ -283 +283 @@
                 $params = array_diff_key($params, array('data' => null, 'method' => null, 'return' => null));
 
-                $dispatcher =& new CakeTestDispatcher();
+                $dispatcher = new CakeTestDispatcher();
                 $dispatcher->testCase($this);
 
@@ -729 +729 @@
                                 require_once($fixtureFile);
                                 $fixtureClass = Inflector::camelize($fixture) . 'Fixture';
-                                $this->_fixtures[$this->fixtures[$index]] =& new $fixtureClass($this->db);
+                                $this->_fixtures[$this->fixtures[$index]] = new $fixtureClass($this->db);
                                 $this->_fixtureClassMap[Inflector::camelize($fixture)] = $this->fixtures[$index];
                         }

trunk/server/www/cake/tests/lib/cake_test_fixture.php

@@ -77 +77 @@
                                 ClassRegistry::flush();
                         } elseif (isset($import['table'])) {
-                                $model =& new Model(null, $import['table'], $import['connection']);
+                                $model = new Model(null, $import['table'], $import['connection']);
                                 $db =& ConnectionManager::getDataSource($import['connection']);
                                 $db->cacheSources = false;

trunk/server/www/cake/tests/lib/code_coverage_manager.php

@@ -79 +79 @@
                 static $instance = array();
                 if (!$instance) {
-                        $instance[0] =& new CodeCoverageManager();
+                        $instance[0] = new CodeCoverageManager();
                 }
                 return $instance[0];
@@ -477 +477 @@
                         }
                 }
-                $testManager =& new TestManager();
+                $testManager = new TestManager();
                 $testFile = str_replace(array('/', $testManager->_testExtension), array(DS, '.php'), $file);
 
-                $folder =& new Folder();
+                $folder = new Folder();
                 $folder->cd(ROOT . DS . CAKE_TESTS_LIB);
                 $contents = $folder->ls();
@@ -506 +506 @@
         function __testObjectFilesFromGroupFile($groupFile, $isApp = true) {
                 $manager = CodeCoverageManager::getInstance();
-                $testManager =& new TestManager();
+                $testManager = new TestManager();
 
                 $path = TESTS . 'groups';

trunk/server/www/cake/tests/lib/test_manager.php

@@ -78 +78 @@
  */
         function runAllTests(&$reporter, $testing = false) {
-                $manager =& new TestManager();
+                $manager = new TestManager();
 
                 $testCases =& $manager->_getTestFileList($manager->_getTestsPath());
                 if ($manager->appTest) {
-                        $test =& new GroupTest('All App Tests');
+                        $test = new GroupTest('All App Tests');
                 } else if ($manager->pluginTest) {
-                        $test =& new GroupTest('All ' . Inflector::humanize($manager->pluginTest) . ' Plugin Tests');
+                        $test = new GroupTest('All ' . Inflector::humanize($manager->pluginTest) . ' Plugin Tests');
                 } else {
-                        $test =& new GroupTest('All Core Tests');
+                        $test = new GroupTest('All Core Tests');
                 }
 
@@ -108 +108 @@
  */
         function runTestCase($testCaseFile, &$reporter, $testing = false) {
-                $manager =& new TestManager();
+                $manager = new TestManager();
 
                 $testCaseFileWithPath = $manager->_getTestsPath() . DS . $testCaseFile;
@@ -121 +121 @@
                 }
 
-                $test =& new GroupTest("Individual test case: " . $testCaseFile);
+                $test = new GroupTest("Individual test case: " . $testCaseFile);
                 $test->addTestFile($testCaseFileWithPath);
                 return $test->run($reporter);
@@ -134 +134 @@
  */
         function runGroupTest($groupTestName, &$reporter) {
-                $manager =& new TestManager();
+                $manager = new TestManager();
                 $filePath = $manager->_getTestsPath('groups') . DS . strtolower($groupTestName) . $manager->_groupExtension;
 
@@ -142 +142 @@
 
                 require_once $filePath;
-                $test =& new GroupTest($groupTestName . ' group test');
+                $test = new GroupTest($groupTestName . ' group test');
                 foreach ($manager->_getGroupTestClassNames($filePath) as $groupTest) {
                         $testCase = new $groupTest();
@@ -161 +161 @@
  */
         function addTestCasesFromDirectory(&$groupTest, $directory = '.') {
-                $manager =& new TestManager();
+                $manager = new TestManager();
                 $testCases =& $manager->_getTestFileList($directory);
                 foreach ($testCases as $testCase) {
@@ -176 +176 @@
  */
         function addTestFile(&$groupTest, $file) {
-                $manager =& new TestManager();
+                $manager = new TestManager();
 
                 if (file_exists($file.'.test.php')) {
@@ -191 +191 @@
  */
         function &getTestCaseList() {
-                $manager =& new TestManager();
+                $manager = new TestManager();
                 $return = $manager->_getTestCaseList($manager->_getTestsPath());
                 return $return;
@@ -223 +223 @@
  */
         function &getGroupTestList() {
-                $manager =& new TestManager();
+                $manager = new TestManager();
                 $return = $manager->_getTestGroupList($manager->_getTestsPath('groups'));
                 return $return;
@@ -359 +359 @@
  */
         function getExtension($type = 'test') {
-                $manager =& new TestManager();
+                $manager = new TestManager();
                 if ($type == 'test') {
                         return $manager->_testExtension;
@@ -379 +379 @@
  */
         function &getGroupTestList() {
-                $manager =& new CliTestManager();
+                $manager = new CliTestManager();
                 $groupTests =& $manager->_getTestGroupList($manager->_getTestsPath('groups'));
                 $buffer = "Available Group Test:\n";
@@ -394 +394 @@
  */
         function &getTestCaseList() {
-                $manager =& new CliTestManager();
+                $manager = new CliTestManager();
                 $testCases =& $manager->_getTestCaseList($manager->_getTestsPath());
                 $buffer = "Available Test Cases:\n";
@@ -437 +437 @@
  */
         function &getGroupTestList() {
-                $manager =& new TextTestManager();
+                $manager = new TextTestManager();
                 $groupTests =& $manager->_getTestGroupList($manager->_getTestsPath('groups'));
 
@@ -464 +464 @@
  */
         function &getTestCaseList() {
-                $manager =& new TextTestManager();
+                $manager = new TextTestManager();
                 $testCases =& $manager->_getTestCaseList($manager->_getTestsPath());
 
@@ -525 +525 @@
         function &getGroupTestList() {
                 $urlExtra = '';
-                $manager =& new HtmlTestManager();
+                $manager = new HtmlTestManager();
                 $groupTests =& $manager->_getTestGroupList($manager->_getTestsPath('groups'));
 
@@ -553 +553 @@
         function &getTestCaseList() {
                 $urlExtra = '';
-                $manager =& new HtmlTestManager();
+                $manager = new HtmlTestManager();
                 $testCases =& $manager->_getTestCaseList($manager->_getTestsPath());
 
@@ -598 +598 @@
                                 case CAKE_TEST_OUTPUT_HTML:
                                         require_once CAKE_TESTS_LIB . 'cake_reporter.php';
-                                        $Reporter =& new CakeHtmlReporter();
+                                        $Reporter = new CakeHtmlReporter();
                                         break;
                                 default:
-                                        $Reporter =& new TextReporter();
+                                        $Reporter = new TextReporter();
                                         break;
                         }
@@ -731 +731 @@
                                         require CAKE . 'dispatcher.php';
                                 }
-                                $dispatch =& new Dispatcher();
+                                $dispatch = new Dispatcher();
                                 $dispatch->baseUrl();
                                 define('BASE', $dispatch->webroot);