stick with Horde's convention of using factory()

diff --git a/framework/Db/lib/Horde/Db/Adapter.php b/framework/Db/lib/Horde/Db/Adapter.php
index 19db558..299f1cf 100644 (file)
--- a/framework/Db/lib/Horde/Db/Adapter.php
+++ b/framework/Db/lib/Horde/Db/Adapter.php
@@ -29,7 +29,7 @@ class Horde_Db_Adapter
      * Handle Horde-style configuration arrays, PEAR DB/MDB2 arrays or DSNs, or
      * PDO DSNS.
      */
-    public static function getInstance($config)
+    public static function factory($config)
     {
         $adapter = str_replace(' ', '_' , ucwords(str_replace('_', ' ', basename($config['adapter']))));
         $class = 'Horde_Db_Adapter_' . $adapter;

diff --git a/framework/Db/test/Horde/Db/Adapter/MysqliSuite.php b/framework/Db/test/Horde/Db/Adapter/MysqliSuite.php
index 45ba1ee..18cba26 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/MysqliSuite.php
+++ b/framework/Db/test/Horde/Db/Adapter/MysqliSuite.php
@@ -73,7 +73,7 @@ class Horde_Db_Adapter_MysqliSuite extends PHPUnit_Framework_TestSuite
         if (isset($_ENV['HORDE_DB_TEST_DSN_MYSQLI']))
             $config = array_merge($config, @json_decode($_ENV['HORDE_DB_TEST_DSN_MYSQLI'], true));
 
-        $conn = Horde_Db_Adapter::getInstance($config);
+        $conn = Horde_Db_Adapter::factory($config);
         return array($conn, $cache);
     }
 

diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php b/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php
index 009e7a3..d4e400d 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php
@@ -73,7 +73,7 @@ class Horde_Db_Adapter_Pdo_MysqlSuite extends PHPUnit_Framework_TestSuite
         if (isset($_ENV['HORDE_DB_TEST_DSN_PDO_MYSQL']))
             $config = array_merge($config, @json_decode($_ENV['HORDE_DB_TEST_DSN_PDO_MYSQL'], true));
 
-        $conn = Horde_Db_Adapter::getInstance($config);
+        $conn = Horde_Db_Adapter::factory($config);
         return array($conn, $cache);
     }
 

diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php b/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php
index 54273a0..8ad21dc 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php
@@ -72,7 +72,7 @@ class Horde_Db_Adapter_Pdo_PgsqlSuite extends PHPUnit_Framework_TestSuite
         if (isset($_ENV['HORDE_DB_TEST_DSN_PDO_PGSQL']))
             $config = array_merge($config, @json_decode($_ENV['HORDE_DB_TEST_DSN_PDO_PGSQL'], true));
 
-        $conn = Horde_Db_Adapter::getInstance($config);
+        $conn = Horde_Db_Adapter::factory($config);
         return array($conn, $cache);
     }
 

diff --git a/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteSuite.php b/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteSuite.php
index 1197549..cae6485 100644 (file)
--- a/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteSuite.php
+++ b/framework/Db/test/Horde/Db/Adapter/Pdo/SqliteSuite.php
@@ -62,7 +62,7 @@ class Horde_Db_Adapter_Pdo_SqliteSuite extends PHPUnit_Framework_TestSuite
         if (!class_exists('CacheMock')) eval('class CacheMock { function get($key) { return $this->$key; } function set($key, $val) { $this->$key = $val; } } ?>');
         $cache = new CacheMock;
 
-        $conn = Horde_Db_Adapter::getInstance(array(
+        $conn = Horde_Db_Adapter::factory(array(
             'adapter' => 'pdo_sqlite',
             'dbname' => ':memory:',
             'cache' => $cache,