MINOR Changed the way DatabaseAdapterRegistry accepts databases

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100898 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2010-03-11 05:36:33 +00:00 committed by Sam Minnee
parent 65a2ee710a
commit cac5cd0c84

View File

@ -9,6 +9,7 @@
* @author Tom Rix
*/
class DatabaseAdapterRegistry {
/**
* Internal array of registered database adapters
*/
@ -16,25 +17,22 @@ class DatabaseAdapterRegistry {
/**
* Add new adapter to the registry
*
* @param string $class classname of the adapter
* @param string $title friendly name for the adapter
* @param string $helperPath path to the DatabaseConfigurationHelper for the adapter
* @param boolean $supported whether or not php has the required functions
* @param array $config Associative array of configuration details
*/
static function register($class, $title, $helperPath, $supported, $missingModuleText = null, $missingExtensionText = null) {
self::$adapters[$class] = array(
'title' => $title,
'helperPath' => $helperPath,
'supported' => $supported
);
if (!$missingExtensionText) $missingExtensionText = 'The PHP extension is missing, please enable or install it.';
if (!$missingModuleText) {
$moduleName = array_shift(explode('/', $helperPath));
$missingModuleText = 'The SilverStripe module, '.$moduleName.', is missing or incomplete. Please <a href="http://silverstripe.org/modules">download it</a>.';
}
self::$adapters[$class]['missingModuleText'] = $missingModuleText;
self::$adapters[$class]['missingExtensionText'] = $missingExtensionText;
static function register($config) {
$missingExtensionText = isset($config['missingExtensionText'])
? $config['missingExtensionText']
: 'The PHP extension is missing, please enable or install it.';
$moduleName = array_shift(explode('/', $config['helperPath']));
$missingModuleText = isset($config['missingModuleText'])
? $config['missingModuleText']
: 'The SilverStripe module, '.$moduleName.', is missing or incomplete. Please <a href="http://silverstripe.org/modules">download it</a>.';
$config['missingModuleText'] = $missingModuleText;
$config['missingExtensionText'] = $missingExtensionText;
self::$adapters[$config['class']] = $config;
}
static function autodiscover() {
@ -43,7 +41,8 @@ class DatabaseAdapterRegistry {
}
}
static function adapters() {
static function get_adapters() {
return self::$adapters;
}
}