remove IDb interface from core class usage

diff --git a/lib/private/server.php b/lib/private/server.php
index a1e99274c7fb009f422764a9b34f91fbf76842b5..bc9d11404a6c51b4333f33d60a0b52811ca53097 100644 (file)
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -77,7 +77,7 @@ class Server extends SimpleContainer implements IServerContainer {
                        return new PreviewManager();
                });
                $this->registerService('TagMapper', function(Server $c) {
-                       return new TagMapper($c->getDb());
+                       return new TagMapper($c->getDatabaseConnection());
                });
                $this->registerService('TagManager', function (Server $c) {
                        $tagMapper = $c->query('TagMapper');

diff --git a/lib/private/tagging/tagmapper.php b/lib/private/tagging/tagmapper.php
index dbeb55265248818d4967536cb868f4d1dd87c662..ed9b8af25d256717b0d30cdc07a4050b76b5b2b3 100644 (file)
--- a/lib/private/tagging/tagmapper.php
+++ b/lib/private/tagging/tagmapper.php
@@ -22,7 +22,7 @@ namespace OC\Tagging;
 
 use \OCP\AppFramework\Db\Mapper,
     \OCP\AppFramework\Db\DoesNotExistException,
-    \OCP\IDb;
+    \OCP\IDBConnection;
 
 /**
  * Mapper for Tag entity
@@ -32,9 +32,9 @@ class TagMapper extends Mapper {
        /**
        * Constructor.
        *
-       * @param IDb $db Instance of the Db abstraction layer.
+       * @param IDBConnection $db Instance of the Db abstraction layer.
        */
-       public function __construct(IDb $db) {
+       public function __construct(IDBConnection $db) {
                parent::__construct($db, 'vcategory', 'OC\Tagging\Tag');
        }
 

diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index a50855c88f306662f765a8c1c0daf3418d1e739a..1a13d64679d7e77234a8c3e4e2d93f436298f73c 100644 (file)
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -49,7 +49,7 @@ class Test_Tags extends \Test\TestCase {
                        ->will($this->returnValue($this->user));
 
                $this->objectType = $this->getUniqueID('type_');
-               $this->tagMapper = new OC\Tagging\TagMapper(\OC::$server->getDb());
+               $this->tagMapper = new OC\Tagging\TagMapper(\OC::$server->getDatabaseConnection());
                $this->tagMgr = new OC\TagManager($this->tagMapper, $this->userSession);
 
        }