From fe2eea65635a384913528d10ef0237169ce9ef10 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Mon, 21 Sep 2009 00:12:39 -0400
Subject: [PATCH] remove static-only Horde_Db class (should replace with
 dependency injection)

---
 framework/Db/lib/Horde/Db.php | 48 -------------------------------------------
 framework/Db/package.xml      |  3 ---
 2 files changed, 51 deletions(-)
 delete mode 100644 framework/Db/lib/Horde/Db.php

diff --git a/framework/Db/lib/Horde/Db.php b/framework/Db/lib/Horde/Db.php
deleted file mode 100644
index 01f1e9b2f..000000000
--- a/framework/Db/lib/Horde/Db.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright 2006-2009 The Horde Project (http://www.horde.org/)
- *
- * @author   Chuck Hagenbuch <chuck@horde.org>
- * @license  http://opensource.org/licenses/bsd-license.php BSD
- * @category Horde
- * @package  Horde_Db
- */
-
-/**
- * Horde_Db namespace - holds constants and global Db functions.
- *
- * @author   Chuck Hagenbuch <chuck@horde.org>
- * @license  http://opensource.org/licenses/bsd-license.php BSD
- * @category Horde
- * @package  Horde_Db
- */
-class Horde_Db
-{
-    /**
-     * Global adapter object.
-     *
-     * @var Horde_Db_Adapter
-     */
-    protected static $_adapter;
-
-    /**
-     * Get the global adapter object.
-     *
-     * @return Horde_Db_Adapter
-     */
-    public static function getAdapter()
-    {
-        return self::$_adapter;
-    }
-
-    /**
-     * Set a global database adapter.
-     *
-     * @param Horde_Db_Adapter $adapter
-     */
-    public static function setAdapter($adapter)
-    {
-        self::$_adapter = $adapter;
-    }
-
-}
diff --git a/framework/Db/package.xml b/framework/Db/package.xml
index 260c2f471..594b2ee82 100644
--- a/framework/Db/package.xml
+++ b/framework/Db/package.xml
@@ -82,7 +82,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
       <file name="Exception.php" role="php" />
       <file name="StatementParser.php" role="php" />
      </dir> <!-- /lib/Horde/Db -->
-     <file name="Db.php" role="php" />
     </dir> <!-- /lib/Horde -->
    </dir> <!-- /lib -->
   </dir> <!-- / -->
@@ -134,8 +133,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install name="lib/Horde/Db/Adapter.php" as="Horde/Db/Adapter.php" />
    <install name="lib/Horde/Db/Exception.php" as="Horde/Db/Exception.php" />
    <install name="lib/Horde/Db/StatementParser.php" as="Horde/Db/StatementParser.php" />
-
-   <install name="lib/Horde/Db.php" as="Horde/Db.php" />
   </filelist>
  </phprelease>
 </package>
-- 
2.11.0