From ba9db1964053be769b42452fee65ac4720489f81 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 7 May 2013 19:42:46 +0200
Subject: [PATCH 1/9] Add wrapper storage backend

---
 lib/files/storage/wrapper.php       | 420 ++++++++++++++++++++++++++++
 tests/lib/files/storage/wrapper.php |  26 ++
 2 files changed, 446 insertions(+)
 create mode 100644 lib/files/storage/wrapper.php
 create mode 100644 tests/lib/files/storage/wrapper.php

diff --git a/lib/files/storage/wrapper.php b/lib/files/storage/wrapper.php
new file mode 100644
index 0000000000..5939faec56
--- /dev/null
+++ b/lib/files/storage/wrapper.php
@@ -0,0 +1,420 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Storage;
+
+class Wrapper implements Storage {
+	/**
+	 * @var Storage $storage
+	 */
+	protected $storage;
+
+	/**
+	 * @param array $parameters
+	 */
+	public function __construct($parameters) {
+		$this->storage = $parameters['storage'];
+	}
+
+	/**
+	 * Get the identifier for the storage,
+	 * the returned id should be the same for every storage object that is created with the same parameters
+	 * and two storage objects with the same id should refer to two storages that display the same files.
+	 *
+	 * @return string
+	 */
+	public function getId() {
+		return $this->storage->getId();
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.mkdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function mkdir($path) {
+		return $this->storage->mkdir($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.rmdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function rmdir($path) {
+		return $this->storage->rmdir($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.opendir.php
+	 *
+	 * @param string $path
+	 * @return resource
+	 */
+	public function opendir($path) {
+		return $this->storage->opendir($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.is_dir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function is_dir($path) {
+		return $this->storage->is_dir($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.is_file.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function is_file($path) {
+		return $this->storage->is_file($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.stat.php
+	 * only the following keys are required in the result: size and mtime
+	 *
+	 * @param string $path
+	 * @return array
+	 */
+	public function stat($path) {
+		return $this->storage->stat($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.filetype.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function filetype($path) {
+		return $this->storage->filetype($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.filesize.php
+	 * The result for filesize when called on a folder is required to be 0
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function filesize($path) {
+		return $this->storage->filesize($path);
+	}
+
+	/**
+	 * check if a file can be created in $path
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isCreatable($path) {
+		return $this->storage->isCreatable($path);
+	}
+
+	/**
+	 * check if a file can be read
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isReadable($path) {
+		return $this->storage->isReadable($path);
+	}
+
+	/**
+	 * check if a file can be written to
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isUpdatable($path) {
+		return $this->storage->isUpdatable($path);
+	}
+
+	/**
+	 * check if a file can be deleted
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isDeletable($path) {
+		return $this->storage->isDeletable($path);
+	}
+
+	/**
+	 * check if a file can be shared
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isSharable($path) {
+		return $this->storage->isSharable($path);
+	}
+
+	/**
+	 * get the full permissions of a path.
+	 * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function getPermissions($path) {
+		return $this->storage->getPermissions($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_exists.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function file_exists($path) {
+		return $this->storage->file_exists($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.filemtime.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function filemtime($path) {
+		return $this->storage->filemtime($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_get_contents.php
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function file_get_contents($path) {
+		return $this->storage->file_get_contents($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_put_contents.php
+	 *
+	 * @param string $path
+	 * @param string $data
+	 * @return bool
+	 */
+	public function file_put_contents($path, $data) {
+		return $this->storage->file_put_contents($path, $data);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.unlink.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function unlink($path) {
+		return $this->storage->unlink($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.rename.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 */
+	public function rename($path1, $path2) {
+		return $this->storage->rename($path1, $path2);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.copy.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 */
+	public function copy($path1, $path2) {
+		return $this->storage->copy($path1, $path2);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.fopen.php
+	 *
+	 * @param string $path
+	 * @param string $mode
+	 * @return resource
+	 */
+	public function fopen($path, $mode) {
+		return $this->storage->fopen($path, $mode);
+	}
+
+	/**
+	 * get the mimetype for a file or folder
+	 * The mimetype for a folder is required to be "httpd/unix-directory"
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getMimeType($path) {
+		return $this->storage->getMimeType($path);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.hash.php
+	 *
+	 * @param string $type
+	 * @param string $path
+	 * @param bool $raw
+	 * @return string
+	 */
+	public function hash($type, $path, $raw = false) {
+		return $this->storage->hash($type, $path, $raw);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.free_space.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function free_space($path) {
+		return $this->storage->free_space($path);
+	}
+
+	/**
+	 * search for occurrences of $query in file names
+	 *
+	 * @param string $query
+	 * @return array
+	 */
+	public function search($query) {
+		return $this->storage->search($query);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.touch.php
+	 * If the backend does not support the operation, false should be returned
+	 *
+	 * @param string $path
+	 * @param int $mtime
+	 * @return bool
+	 */
+	public function touch($path, $mtime = null) {
+		return $this->storage->touch($path, $mtime);
+	}
+
+	/**
+	 * get the path to a local version of the file.
+	 * The local version of the file can be temporary and doesn't have to be persistent across requests
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getLocalFile($path) {
+		return $this->storage->getLocalFile($path);
+	}
+
+	/**
+	 * get the path to a local version of the folder.
+	 * The local version of the folder can be temporary and doesn't have to be persistent across requests
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getLocalFolder($path) {
+		return $this->storage->getLocalFolder($path);
+	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 *
+	 * @param string $path
+	 * @param int $time
+	 * @return bool
+	 *
+	 * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
+	 * returning true for other changes in the folder is optional
+	 */
+	public function hasUpdated($path, $time) {
+		return $this->storage->hasUpdated($path, $time);
+	}
+
+	/**
+	 * get a cache instance for the storage
+	 *
+	 * @param string $path
+	 * @return \OC\Files\Cache\Cache
+	 */
+	public function getCache($path = '') {
+		return $this->storage->getCache($path);
+	}
+
+	/**
+	 * get a scanner instance for the storage
+	 *
+	 * @param string $path
+	 * @return \OC\Files\Cache\Scanner
+	 */
+	public function getScanner($path = '') {
+		return $this->storage->getScanner($path);
+	}
+
+
+	/**
+	 * get the user id of the owner of a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getOwner($path) {
+		return $this->storage->getOwner($path);
+	}
+
+	/**
+	 * get a permissions cache instance for the cache
+	 *
+	 * @param string $path
+	 * @return \OC\Files\Cache\Permissions
+	 */
+	public function getPermissionsCache($path = '') {
+		return $this->storage->getPermissions($path);
+	}
+
+	/**
+	 * get a watcher instance for the cache
+	 *
+	 * @param string $path
+	 * @return \OC\Files\Cache\Watcher
+	 */
+	public function getWatcher($path = '') {
+		return $this->storage->getWatcher($path);
+	}
+
+	/**
+	 * @return \OC\Files\Cache\Storage
+	 */
+	public function getStorageCache() {
+		return $this->storage->getStorageCache();
+	}
+
+	/**
+	 * get the ETag for a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getETag($path) {
+		return $this->storage->getETag($path);
+	}
+}
diff --git a/tests/lib/files/storage/wrapper.php b/tests/lib/files/storage/wrapper.php
new file mode 100644
index 0000000000..8452949a72
--- /dev/null
+++ b/tests/lib/files/storage/wrapper.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Storage;
+
+class Wrapper extends Storage {
+	/**
+	 * @var string tmpDir
+	 */
+	private $tmpDir;
+
+	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));
+	}
+
+	public function tearDown() {
+		\OC_Helper::rmdirr($this->tmpDir);
+	}
+}

From d97ef0805ba5c5687e0642bb8f7c085966153ac9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 8 May 2013 22:35:10 +0200
Subject: [PATCH 2/9] Add mechanism to allow apps to wraper storage classes

---
 lib/files/mount/mount.php    | 26 +++++++++++++++++++++++++-
 lib/files/storage/loader.php | 17 +++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 lib/files/storage/loader.php

diff --git a/lib/files/mount/mount.php b/lib/files/mount/mount.php
index 69b8285ab4..d25a7b3be6 100644
--- a/lib/files/mount/mount.php
+++ b/lib/files/mount/mount.php
@@ -22,6 +22,11 @@ class Mount {
 	private $arguments = array();
 	private $mountPoint;
 
+	/**
+	 * @var callable[] $storageWrappers
+	 */
+	private $storageWrappers = array();
+
 	/**
 	 * @param string|\OC\Files\Storage\Storage $storage
 	 * @param string $mountpoint
@@ -62,7 +67,7 @@ class Mount {
 	private function createStorage() {
 		if (class_exists($this->class)) {
 			try {
-				return new $this->class($this->arguments);
+				return $this->loadStorage($this->class, $this->arguments);
 			} catch (\Exception $exception) {
 				\OC_Log::write('core', $exception->getMessage(), \OC_Log::ERROR);
 				return null;
@@ -73,6 +78,25 @@ class Mount {
 		}
 	}
 
+	/**
+	 * allow modifier storage behaviour by adding wrappers around storages
+	 *
+	 * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage
+	 *
+	 * @param callable $callback
+	 */
+	public function addStorageWrapper($callback) {
+		$this->storageWrappers[] = $callback;
+	}
+
+	private function loadStorage($class, $arguments) {
+		$storage = new $class($arguments);
+		foreach ($this->storageWrappers as $wrapper) {
+			$storage = $wrapper($this->mountPoint, $storage);
+		}
+		return $storage;
+	}
+
 	/**
 	 * @return \OC\Files\Storage\Storage
 	 */
diff --git a/lib/files/storage/loader.php b/lib/files/storage/loader.php
new file mode 100644
index 0000000000..7330cae4cc
--- /dev/null
+++ b/lib/files/storage/loader.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Storage;
+
+class Loader {
+	private function $wrappers
+
+	public function load($class, $arguments) {
+		return new $class($arguments);
+	}
+}

From bd675124096707a925faac2774516975ec7049c1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 7 Jun 2013 17:07:13 +0200
Subject: [PATCH 3/9] manage creating and wrapping storages in it's own class

---
 lib/files/filesystem.php     | 11 +++++++--
 lib/files/mount/mount.php    | 45 +++++++++++++-----------------------
 lib/files/storage/loader.php | 27 +++++++++++++++++++---
 3 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index eadd8a93fa..ce89c5c23f 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -30,6 +30,7 @@
 
 namespace OC\Files;
 
+use OC\Files\Storage\Loader;
 const FREE_SPACE_UNKNOWN = -2;
 const FREE_SPACE_UNLIMITED = -3;
 
@@ -142,6 +143,11 @@ class Filesystem {
 	 */
 	const signal_param_run = 'run';
 
+	/**
+	 * @var \OC\Files\Storage\Loader $loader
+	 */
+	private static $loader;
+
 	/**
 	 * get the mountpoint of the storage object for a path
 	 * ( note: because a storage is not always mounted inside the fakeroot, the
@@ -221,6 +227,7 @@ class Filesystem {
 		if (self::$defaultInstance) {
 			return false;
 		}
+		self::$loader = new Loader();
 		self::$defaultInstance = new View($root);
 		self::$mounts = new Mount\Manager();
 
@@ -232,7 +239,7 @@ class Filesystem {
 		return true;
 	}
 
-	static public function initMounts(){
+	static public function initMounts() {
 		self::$mounts = new Mount\Manager();
 	}
 
@@ -365,7 +372,7 @@ class Filesystem {
 	 * @param string $mountpoint
 	 */
 	static public function mount($class, $arguments, $mountpoint) {
-		$mount = new Mount\Mount($class, $mountpoint, $arguments);
+		$mount = new Mount\Mount($class, $mountpoint, $arguments, self::$loader);
 		self::$mounts->addMount($mount);
 	}
 
diff --git a/lib/files/mount/mount.php b/lib/files/mount/mount.php
index d25a7b3be6..17b0055ee8 100644
--- a/lib/files/mount/mount.php
+++ b/lib/files/mount/mount.php
@@ -9,10 +9,10 @@
 namespace OC\Files\Mount;
 
 use \OC\Files\Filesystem;
+use OC\Files\Storage\Loader;
+use OC\Files\Storage\Storage;
 
 class Mount {
-
-
 	/**
 	 * @var \OC\Files\Storage\Storage $storage
 	 */
@@ -23,24 +23,30 @@ class Mount {
 	private $mountPoint;
 
 	/**
-	 * @var callable[] $storageWrappers
+	 * @var \OC\Files\Storage\Loader $loader
 	 */
-	private $storageWrappers = array();
+	private $loader;
 
 	/**
-	 * @param string|\OC\Files\Storage\Storage $storage
+	 * @param string | \OC\Files\Storage\Storage $storage
 	 * @param string $mountpoint
-	 * @param array $arguments (optional)
+	 * @param array $arguments (optional)\
+	 * @param \OC\Files\Storage\Loader $loader
 	 */
-	public function __construct($storage, $mountpoint, $arguments = null) {
+	public function __construct($storage, $mountpoint, $arguments = null, $loader = null) {
 		if (is_null($arguments)) {
 			$arguments = array();
 		}
+		if (is_null($loader)) {
+			$this->loader = new Loader();
+		} else {
+			$this->loader = $loader;
+		}
 
 		$mountpoint = $this->formatPath($mountpoint);
-		if ($storage instanceof \OC\Files\Storage\Storage) {
+		if ($storage instanceof Storage) {
 			$this->class = get_class($storage);
-			$this->storage = $storage;
+			$this->storage = $this->loader->wrap($mountpoint, $storage);
 		} else {
 			// Update old classes to new namespace
 			if (strpos($storage, 'OC_Filestorage_') !== false) {
@@ -67,7 +73,7 @@ class Mount {
 	private function createStorage() {
 		if (class_exists($this->class)) {
 			try {
-				return $this->loadStorage($this->class, $this->arguments);
+				return $this->loader->load($this->mountPoint, $this->class, $this->arguments);
 			} catch (\Exception $exception) {
 				\OC_Log::write('core', $exception->getMessage(), \OC_Log::ERROR);
 				return null;
@@ -78,25 +84,6 @@ class Mount {
 		}
 	}
 
-	/**
-	 * allow modifier storage behaviour by adding wrappers around storages
-	 *
-	 * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage
-	 *
-	 * @param callable $callback
-	 */
-	public function addStorageWrapper($callback) {
-		$this->storageWrappers[] = $callback;
-	}
-
-	private function loadStorage($class, $arguments) {
-		$storage = new $class($arguments);
-		foreach ($this->storageWrappers as $wrapper) {
-			$storage = $wrapper($this->mountPoint, $storage);
-		}
-		return $storage;
-	}
-
 	/**
 	 * @return \OC\Files\Storage\Storage
 	 */
diff --git a/lib/files/storage/loader.php b/lib/files/storage/loader.php
index 7330cae4cc..2572ef443b 100644
--- a/lib/files/storage/loader.php
+++ b/lib/files/storage/loader.php
@@ -9,9 +9,30 @@
 namespace OC\Files\Storage;
 
 class Loader {
-	private function $wrappers
+	/**
+	 * @var callable[] $storageWrappers
+	 */
+	private $storageWrappers = array();
 
-	public function load($class, $arguments) {
-		return new $class($arguments);
+	/**
+	 * allow modifier storage behaviour by adding wrappers around storages
+	 *
+	 * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage
+	 *
+	 * @param callable $callback
+	 */
+	public function addStorageWrapper($callback) {
+		$this->storageWrappers[] = $callback;
+	}
+
+	public function load($mountPoint, $class, $arguments) {
+		return $this->wrap($mountPoint, new $class($arguments));
+	}
+
+	public function wrap($mountPoint, $storage) {
+		foreach ($this->storageWrappers as $wrapper) {
+			$storage = $wrapper($mountPoint, $storage);
+		}
+		return $storage;
 	}
 }

From 85a9b7f0949932b1def24f86ab7dc3df87933e6f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 7 Jun 2013 17:12:45 +0200
Subject: [PATCH 4/9] Storage wrapper: provide access to the wrapped storage

---
 lib/files/storage/wrapper.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/files/storage/wrapper.php b/lib/files/storage/wrapper.php
index 5939faec56..78892a564c 100644
--- a/lib/files/storage/wrapper.php
+++ b/lib/files/storage/wrapper.php
@@ -10,7 +10,7 @@ namespace OC\Files\Storage;
 
 class Wrapper implements Storage {
 	/**
-	 * @var Storage $storage
+	 * @var \OC\Files\Storage\Storage $storage
 	 */
 	protected $storage;
 
@@ -21,6 +21,13 @@ class Wrapper implements Storage {
 		$this->storage = $parameters['storage'];
 	}
 
+	/**
+	 * @return \OC\Files\Storage\Storage
+	 */
+	public function getWrapperStorage() {
+		return $this->storage;
+	}
+
 	/**
 	 * Get the identifier for the storage,
 	 * the returned id should be the same for every storage object that is created with the same parameters

From 2708ab09abf12321df97ed730a83c328d2b360fc Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 7 Jun 2013 17:40:19 +0200
Subject: [PATCH 5/9] storage loader needs to be accessible by apps

---
 lib/files/filesystem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 0daa863e79..a7b1da57c1 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -146,7 +146,7 @@ class Filesystem {
 	/**
 	 * @var \OC\Files\Storage\Loader $loader
 	 */
-	private static $loader;
+	public static $loader;
 
 	/**
 	 * get the mountpoint of the storage object for a path

From 31693d393749c94591dc0814cc502eac8d415e11 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 7 Jun 2013 17:40:38 +0200
Subject: [PATCH 6/9] add test cases for Mount

---
 tests/lib/files/mount/mount.php | 46 +++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 tests/lib/files/mount/mount.php

diff --git a/tests/lib/files/mount/mount.php b/tests/lib/files/mount/mount.php
new file mode 100644
index 0000000000..aa98db856f
--- /dev/null
+++ b/tests/lib/files/mount/mount.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Mount;
+
+
+use OC\Files\Storage\Loader;
+use OC\Files\Storage\Wrapper;
+
+class Mount extends \PHPUnit_Framework_TestCase {
+	public function testFromStorageObject() {
+		$storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
+			->disableOriginalConstructor()
+			->getMock();
+		$mount = new \OC\Files\Mount\Mount($storage, '/foo');
+		$this->assertInstanceOf('\OC\Files\Storage\Temporary', $mount->getStorage());
+	}
+
+	public function testFromStorageClassname() {
+		$mount = new \OC\Files\Mount\Mount('\OC\Files\Storage\Temporary', '/foo');
+		$this->assertInstanceOf('\OC\Files\Storage\Temporary', $mount->getStorage());
+	}
+
+	public function testWrapper() {
+		$test = $this;
+		$wrapper = function ($mountPoint, $storage) use (&$test) {
+			$test->assertEquals('/foo/', $mountPoint);
+			$test->assertInstanceOf('\OC\Files\Storage\Storage', $storage);
+			return new Wrapper(array('storage' => $storage));
+		};
+
+		$loader = new Loader();
+		$loader->addStorageWrapper($wrapper);
+
+		$storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
+			->disableOriginalConstructor()
+			->getMock();
+		$mount = new \OC\Files\Mount\Mount($storage, '/foo', array(), $loader);
+		$this->assertInstanceOf('\OC\Files\Storage\Wrapper', $mount->getStorage());
+	}
+}

From 94ca576c9ac30b7e5878c108a5efe2cad16faa94 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 7 Jun 2013 17:50:10 +0200
Subject: [PATCH 7/9] use a getter for the storage loader to ensure the
 instance is created

---
 lib/files/filesystem.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index a7b1da57c1..3d7d5abf8f 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -146,7 +146,14 @@ class Filesystem {
 	/**
 	 * @var \OC\Files\Storage\Loader $loader
 	 */
-	public static $loader;
+	private static $loader;
+
+	public static function getLoader(){
+		if (!self::$loader) {
+			self::$loader = new Loader();
+		}
+		return self::$loader;
+	}
 
 	/**
 	 * get the mountpoint of the storage object for a path
@@ -245,7 +252,7 @@ class Filesystem {
 		if (self::$defaultInstance) {
 			return false;
 		}
-		self::$loader = new Loader();
+		self::getLoader();
 		self::$defaultInstance = new View($root);
 
 		if (!self::$mounts) {
@@ -400,7 +407,7 @@ class Filesystem {
 		if (!self::$mounts) {
 			\OC_Util::setupFS();
 		}
-		$mount = new Mount\Mount($class, $mountpoint, $arguments, self::$loader);
+		$mount = new Mount\Mount($class, $mountpoint, $arguments, self::getLoader());
 		self::$mounts->addMount($mount);
 	}
 

From 125f9f4221d4c9c1d4ae653758f2bfa6b92ed9c1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 28 Jun 2013 15:34:25 +0200
Subject: [PATCH 8/9] move storage wrappers to their own namespace

---
 lib/files/storage/{ => wrapper}/wrapper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename lib/files/storage/{ => wrapper}/wrapper.php (99%)

diff --git a/lib/files/storage/wrapper.php b/lib/files/storage/wrapper/wrapper.php
similarity index 99%
rename from lib/files/storage/wrapper.php
rename to lib/files/storage/wrapper/wrapper.php
index 78892a564c..802c8ea049 100644
--- a/lib/files/storage/wrapper.php
+++ b/lib/files/storage/wrapper/wrapper.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Files\Storage;
+namespace OC\Files\Storage\Wrapper;
 
 class Wrapper implements Storage {
 	/**

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 9/9] 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() {