Removing reference operators in CakeTestFixture..

This commit is contained in:
Mark Story 2010-04-14 23:27:34 -04:00
parent 7705c404ee
commit 20b0b1ff58

View file

@ -24,7 +24,7 @@
* @package cake * @package cake
* @subpackage cake.cake.tests.lib * @subpackage cake.cake.tests.lib
*/ */
class CakeTestFixture extends Object { class CakeTestFixture {
/** /**
* Name of the object * Name of the object
@ -69,16 +69,16 @@ class CakeTestFixture extends Object {
if (isset($import['model']) && App::import('Model', $import['model'])) { if (isset($import['model']) && App::import('Model', $import['model'])) {
ClassRegistry::config(array('ds' => $import['connection'])); ClassRegistry::config(array('ds' => $import['connection']));
$model =& ClassRegistry::init($import['model']); $model = ClassRegistry::init($import['model']);
$db =& ConnectionManager::getDataSource($model->useDbConfig); $db = ConnectionManager::getDataSource($model->useDbConfig);
$db->cacheSources = false; $db->cacheSources = false;
$this->fields = $model->schema(true); $this->fields = $model->schema(true);
$this->fields[$model->primaryKey]['key'] = 'primary'; $this->fields[$model->primaryKey]['key'] = 'primary';
ClassRegistry::config(array('ds' => 'test_suite')); ClassRegistry::config(array('ds' => 'test_suite'));
ClassRegistry::flush(); ClassRegistry::flush();
} elseif (isset($import['table'])) { } 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 = ConnectionManager::getDataSource($import['connection']);
$db->cacheSources = false; $db->cacheSources = false;
$model->useDbConfig = $import['connection']; $model->useDbConfig = $import['connection'];
$model->name = Inflector::camelize(Inflector::singularize($import['table'])); $model->name = Inflector::camelize(Inflector::singularize($import['table']));