fix storage wrapper namespaces

diff --git a/lib/files/storage/wrapper/wrapper.php b/lib/files/storage/wrapper/wrapper.php
index 802c8ea04927a6661ab33543c5efcf0cece2d19e..4feb0520f12865bc5f5f6f6d4b5ece9390abb9ed 100644 (file)
--- a/lib/files/storage/wrapper/wrapper.php
+++ b/lib/files/storage/wrapper/wrapper.php
@@ -8,7 +8,7 @@
 
 namespace OC\Files\Storage\Wrapper;
 
-class Wrapper implements Storage {
+class Wrapper implements \OC\Files\Storage\Storage {
        /**
         * @var \OC\Files\Storage\Storage $storage
         */

diff --git a/tests/lib/files/mount/mount.php b/tests/lib/files/mount/mount.php
index aa98db856f4d2eacf8134263ebecec575f63cdc9..b057204ad3552929e7f932214e747cf55e6461a2 100644 (file)
--- a/tests/lib/files/mount/mount.php
+++ b/tests/lib/files/mount/mount.php
@@ -10,7 +10,7 @@ namespace Test\Files\Mount;
 
 
 use OC\Files\Storage\Loader;
-use OC\Files\Storage\Wrapper;
+use OC\Files\Storage\Wrapper\Wrapper;
 
 class Mount extends \PHPUnit_Framework_TestCase {
        public function testFromStorageObject() {
@@ -41,6 +41,6 @@ class Mount extends \PHPUnit_Framework_TestCase {
                        ->disableOriginalConstructor()
                        ->getMock();
                $mount = new \OC\Files\Mount\Mount($storage, '/foo', array(), $loader);
-               $this->assertInstanceOf('\OC\Files\Storage\Wrapper', $mount->getStorage());
+               $this->assertInstanceOf('\OC\Files\Storage\Wrapper\Wrapper', $mount->getStorage());
        }
 }

diff --git a/tests/lib/files/storage/wrapper.php b/tests/lib/files/storage/wrapper.php
index 8452949a72356a5e419a9ce439d93067d06c4d1a..2794a0a62631863b3c51d8b25958292218a44884 100644 (file)
--- a/tests/lib/files/storage/wrapper.php
+++ b/tests/lib/files/storage/wrapper.php
@@ -17,7 +17,7 @@ class Wrapper extends Storage {
        public function setUp() {
                $this->tmpDir = \OC_Helper::tmpFolder();
                $storage = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir));
-               $this->instance = new \OC\Files\Storage\Wrapper(array('storage' => $storage));
+               $this->instance = new \OC\Files\Storage\Wrapper\Wrapper(array('storage' => $storage));
        }
 
        public function tearDown() {