From a7c70915d592cd3cc06c6dc86ba3d2707d000871 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 28 Jun 2013 18:18:12 +0200
Subject: [PATCH] fix storage wrapper namespaces
---
lib/files/storage/wrapper/wrapper.php | 2 +-
tests/lib/files/mount/mount.php | 4 ++--
tests/lib/files/storage/wrapper.php | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/files/storage/wrapper/wrapper.php b/lib/files/storage/wrapper/wrapper.php
index 802c8ea049..4feb0520f1 100644
--- 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 aa98db856f..b057204ad3 100644
--- 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 8452949a72..2794a0a626 100644
--- 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() {
--
GitLab