hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove use of databox singleton

Browse Source
This commit is contained in:
Romain Neutron
2012-07-26 12:28:41 +02:00
parent 0deed1fc7b
commit fb95aad718
20 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/classes/databox.class.php
View File

@@ -100,13 +100,11 @@ class databox extends base
protected $connection;
protected $registry;
/**
*
* @param int $sbas_id
* @return databox
*/
protected function __construct($sbas_id)
public function __construct($sbas_id)
{
assert(is_int($sbas_id));
assert($sbas_id > 0);
$this->registry = registry::get_instance();
$this->connection = connection::getPDOConnection($sbas_id);
$this->Core = \bootstrap::getCore();
@@ -187,22 +185,6 @@ class databox extends base
return phrasea::sbas_names($this->get_sbas_id());
}
/**
*
* @param int $sbas_id
* @return databox
*/
public static function get_instance($sbas_id)
{
assert(is_int($sbas_id));
assert($sbas_id > 0);
if ( ! array_key_exists($sbas_id, self::$_instances)) {
self::$_instances[$sbas_id] = new self($sbas_id);
}
return self::$_instances[$sbas_id];
}
/**
*
* @return databox_status