adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing E_STRICT errors from connection manager

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-11-08 22:37:34 -04:30
parent 2fa653d2f3
commit afa5ee6885
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cake/libs/model/connection_manager.php
View file

@ -60,7 +60,7 @@ class ConnectionManager {
*/ */
function __construct() { function __construct() {
if (class_exists('DATABASE_CONFIG')) { if (class_exists('DATABASE_CONFIG')) {
$this->config =& new DATABASE_CONFIG(); $this->config = new DATABASE_CONFIG();
$this->_getConnectionObjects(); $this->_getConnectionObjects();
} }
} }
@ -74,7 +74,7 @@ class ConnectionManager {
static $instance = array(); static $instance = array();
if (!$instance) { if (!$instance) {
$instance[0] =& new ConnectionManager(); $instance[0] = new ConnectionManager();
} }
return $instance[0]; return $instance[0];
@ -87,10 +87,10 @@ class ConnectionManager {
* @return object Instance * @return object Instance
*/ */
public static function &getDataSource($name) { public static function &getDataSource($name) {
$_this =& ConnectionManager::getInstance(); $_this = ConnectionManager::getInstance();
if (!empty($_this->_dataSources[$name])) { if (!empty($_this->_dataSources[$name])) {
$return =& $_this->_dataSources[$name]; $return = $_this->_dataSources[$name];
return $return; return $return;
} }
@ -107,10 +107,10 @@ class ConnectionManager {
$null = null; $null = null;
return $null; return $null;
} }
$_this->_dataSources[$name] =& new $class($_this->config->{$name}); $_this->_dataSources[$name] = new $class($_this->config->{$name});
$_this->_dataSources[$name]->configKeyName = $name; $_this->_dataSources[$name]->configKeyName = $name;
$return =& $_this->_dataSources[$name]; $return = $_this->_dataSources[$name];
return $return; return $return;
} }
@ -120,7 +120,7 @@ class ConnectionManager {
* @return array List of available connections * @return array List of available connections
*/ */
public static function sourceList() { public static function sourceList() {
$_this =& ConnectionManager::getInstance(); $_this = ConnectionManager::getInstance();
return array_keys($_this->_dataSources); return array_keys($_this->_dataSources);
} }
@ -134,7 +134,7 @@ class ConnectionManager {
* in the ConnectionManager. * in the ConnectionManager.
*/ */
public static function getSourceName(&$source) { public static function getSourceName(&$source) {
$_this =& ConnectionManager::getInstance(); $_this = ConnectionManager::getInstance();
foreach ($_this->_dataSources as $name => $ds) { foreach ($_this->_dataSources as $name => $ds) {
if ($ds == $source) { if ($ds == $source) {
return $name; return $name;
@ -152,7 +152,7 @@ class ConnectionManager {
* @return boolean True on success, null on failure or false if the class is already loaded * @return boolean True on success, null on failure or false if the class is already loaded
*/ */
public static function loadDataSource($connName) { public static function loadDataSource($connName) {
$_this =& ConnectionManager::getInstance(); $_this = ConnectionManager::getInstance();
if (is_array($connName)) { if (is_array($connName)) {
$conn = $connName; $conn = $connName;
@ -185,7 +185,7 @@ class ConnectionManager {
* (as defined in Connections), and the value is an array with keys 'filename' and 'classname'. * (as defined in Connections), and the value is an array with keys 'filename' and 'classname'.
*/ */
public static function enumConnectionObjects() { public static function enumConnectionObjects() {
$_this =& ConnectionManager::getInstance(); $_this = ConnectionManager::getInstance();
return $_this->_connectionsEnum; return $_this->_connectionsEnum;
} }
@ -197,7 +197,7 @@ class ConnectionManager {
* @return object A reference to the DataSource object, or null if creation failed * @return object A reference to the DataSource object, or null if creation failed
*/ */
public static function &create($name = '', $config = array()) { public static function &create($name = '', $config = array()) {
$_this =& ConnectionManager::getInstance(); $_this = ConnectionManager::getInstance();
if (empty($name) || empty($config) || array_key_exists($name, $_this->_connectionsEnum)) { if (empty($name) || empty($config) || array_key_exists($name, $_this->_connectionsEnum)) {
$null = null; $null = null;
@ -205,7 +205,7 @@ class ConnectionManager {
} }
$_this->config->{$name} = $config; $_this->config->{$name} = $config;
$_this->_connectionsEnum[$name] = $_this->__connectionData($config); $_this->_connectionsEnum[$name] = $_this->__connectionData($config);
$return =& $_this->getDataSource($name); $return = $_this->getDataSource($name);
return $return; return $return;
} }