From bd834220959bf7edcc4cce4bfe6c77e0a4649b8b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 7 Sep 2012 18:30:48 +0200
Subject: put filestorages in a namespace

---
 apps/files_external/lib/dropbox.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'apps/files_external/lib/dropbox.php')

diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index bb86894e55e..746364668f0 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -22,7 +22,9 @@
 
 require_once 'Dropbox/autoload.php';
 
-class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
+namespace OC\Files\Storage;
+
+class Dropbox extends \OC\Files\Storage\Common {
 
 	private $dropbox;
 	private $metaData = array();
@@ -31,11 +33,11 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 
 	public function __construct($params) {
 		if (isset($params['configured']) && $params['configured'] == 'true' && isset($params['app_key']) && isset($params['app_secret']) && isset($params['token']) && isset($params['token_secret'])) {
-			$oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
+			$oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
 			$oauth->setToken($params['token'], $params['token_secret']);
-			$this->dropbox = new Dropbox_API($oauth, 'dropbox');
+			$this->dropbox = new \Dropbox_API($oauth, 'dropbox');
 		} else {
-			throw new Exception('Creating OC_Filestorage_Dropbox storage failed');
+			throw new \Exception('Creating \OC\Files\Storage\Dropbox storage failed');
 		}
 	}
 
@@ -95,7 +97,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 			foreach ($contents as $file) {
 				$files[] = basename($file['path']);
 			}
-			OC_FakeDirStream::$dirs['dropbox'.$path] = $files;
+			\OC_FakeDirStream::$dirs['dropbox'.$path] = $files;
 			return opendir('fakedir://dropbox'.$path);
 		}
 		return false;
@@ -177,7 +179,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 		switch ($mode) {
 			case 'r':
 			case 'rb':
-				$tmpFile = OC_Helper::tmpFile();
+				$tmpFile = \OC_Helper::tmpFile();
 				try {
 					$data = $this->dropbox->getFile($path);
 					file_put_contents($tmpFile, $data);
@@ -203,8 +205,8 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 				} else {
 					$ext = '';
 				}
-				$tmpFile = OC_Helper::tmpFile($ext);
-				OC_CloseStreamWrapper::$callBacks[$tmpFile] = array($this, 'writeBack');
+				$tmpFile = \OC_Helper::tmpFile($ext);
+				\OC_CloseStreamWrapper::$callBacks[$tmpFile] = array($this, 'writeBack');
 				if ($this->file_exists($path)) {
 					$source = $this->fopen($path, 'r');
 					file_put_contents($tmpFile, $source);
-- 
cgit v1.2.3


From 542869114ad67295d61450e637b15a1f4d3ae209 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 11 Oct 2012 23:06:57 +0200
Subject: implement getId for the external storage providers

---
 apps/files_external/lib/amazons3.php | 6 ++++++
 apps/files_external/lib/dropbox.php  | 6 ++++++
 apps/files_external/lib/ftp.php      | 4 ++++
 apps/files_external/lib/google.php   | 7 ++++++-
 apps/files_external/lib/smb.php      | 4 ++++
 apps/files_external/lib/swift.php    | 7 +++++++
 apps/files_external/lib/webdav.php   | 4 ++++
 7 files changed, 37 insertions(+), 1 deletion(-)

(limited to 'apps/files_external/lib/dropbox.php')

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index a17a70ed38b..2f7c8b35bec 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -29,12 +29,14 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 	private $s3;
 	private $bucket;
 	private $objects = array();
+	private $id;
 
 	private static $tempFiles = array();
 
 	// TODO options: storage class, encryption server side, encrypt before upload?
 
 	public function __construct($params) {
+		$this->id = 'amazon::'.$params['key'] . md5($params['secret']);
 		$this->s3 = new \AmazonS3(array('key' => $params['key'], 'secret' => $params['secret']));
 		$this->bucket = $params['bucket'];
 	}
@@ -59,6 +61,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		return false;
 	}
 
+	public function getId(){
+		return $this->id;
+	}
+
 	public function mkdir($path) {
 		// Folders in Amazon S3 are 0 byte objects with a '/' at the end of the name
 		if (substr($path, -1) != '/') {
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 86dbdab9caa..351a2840d90 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -28,12 +28,14 @@ class Dropbox extends \OC\Files\Storage\Common {
 
 	private $dropbox;
 	private $root;
+	private $id;
 	private $metaData = array();
 
 	private static $tempFiles = array();
 
 	public function __construct($params) {
 		if (isset($params['configured']) && $params['configured'] == 'true' && isset($params['app_key']) && isset($params['app_secret']) && isset($params['token']) && isset($params['token_secret'])) {
+			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $params['root'];
 			$this->root=isset($params['root'])?$params['root']:'';
 			$oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
 			$oauth->setToken($params['token'], $params['token_secret']);
@@ -81,6 +83,10 @@ class Dropbox extends \OC\Files\Storage\Common {
 		}
 	}
 
+	public function getId(){
+		return $this->id;
+	}
+
 	public function mkdir($path) {
 		$path = $this->root.$path;
 		try {
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 140a21ffe13..731581dacc6 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -32,6 +32,10 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 		}
 	}
 
+	public function getId(){
+		return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
+	}
+
 	/**
 	 * construct the ftp url
 	 * @param string path
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 51c5d219aae..e4be4de5a09 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -30,6 +30,7 @@ class Google extends \OC\Files\Storage\Common {
 	private $oauth_token;
 	private $sig_method;
 	private $entries;
+	private $id;
 
 	private static $tempFiles = array();
 
@@ -37,6 +38,7 @@ class Google extends \OC\Files\Storage\Common {
 		if (isset($params['configured']) && $params['configured'] == 'true' && isset($params['token']) && isset($params['token_secret'])) {
 			$consumer_key = isset($params['consumer_key']) ? $params['consumer_key'] : 'anonymous';
 			$consumer_secret = isset($params['consumer_secret']) ? $params['consumer_secret'] : 'anonymous';
+			$this->id = 'google::' . $consumer_key . $consumer_secret;
 			$this->consumer = new \OAuthConsumer($consumer_key, $consumer_secret);
 			$this->oauth_token = new \OAuthToken($params['token'], $params['token_secret']);
 			$this->sig_method = new \OAuthSignatureMethod_HMAC_SHA1();
@@ -177,6 +179,9 @@ class Google extends \OC\Files\Storage\Common {
 		}
 	}
 
+	public function getId(){
+		return $this->id;
+	}
 
 	public function mkdir($path) {
 		$collection = dirname($path);
@@ -539,4 +544,4 @@ class Google extends \OC\Files\Storage\Common {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 8fcdd1f722f..71c7a91ec93 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -42,6 +42,10 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 		}
 	}
 
+	public function getId(){
+		return 'smb::' . $this->user . '@' . $this->host . '/' . $this->share . '/' . $this->root;
+	}
+
 	public function constructUrl($path) {
 		if(substr($path,-1)=='/') {
 			$path=substr($path,0,-1);
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 8d402b25212..61f58766e8e 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -11,6 +11,7 @@ require_once 'php-cloudfiles/cloudfiles.php';
 namespace OC\Files\Storage;
 
 class SWIFT extends \OC\Files\Storage\Common{
+	private $id;
 	private $host;
 	private $root;
 	private $user;
@@ -274,6 +275,8 @@ class SWIFT extends \OC\Files\Storage\Common{
 		$this->user=$params['user'];
 		$this->root=isset($params['root'])?$params['root']:'/';
 		$this->secure=isset($params['secure'])?(bool)$params['secure']:true;
+
+		$this->id = 'swift::' . $this->user . '@' . $this->host . '/' . $this->root;
 		if(!$this->root || $this->root[0]!='/') {
 			$this->root='/'.$this->root;
 		}
@@ -289,6 +292,10 @@ class SWIFT extends \OC\Files\Storage\Common{
 		}
 	}
 
+	public function getId(){
+		return $this->id;
+	}
+
 
 	public function mkdir($path) {
 		if($this->containerExists($path)) {
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 7c61d06a018..6ed93e9035b 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -56,6 +56,10 @@ class DAV extends \OC\Files\Storage\Common{
 		$this->mkdir('');
 	}
 
+	public function getId(){
+		return 'webdav::' . $this->user . '@' . $this->host . '/' . $this->root;
+	}
+
 	private function createBaseUri() {
 		$baseUri='http';
 		if($this->secure) {
-- 
cgit v1.2.3


From 141ff806c6cfbd349ffa232502a89a620882c409 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 11 Oct 2012 23:17:59 +0200
Subject: fix namespace problems for external storage backends

---
 apps/files_external/lib/amazons3.php |  4 +--
 apps/files_external/lib/dropbox.php  |  4 +--
 apps/files_external/lib/ftp.php      |  7 ++--
 apps/files_external/lib/google.php   | 12 +++----
 apps/files_external/lib/smb.php      |  5 +--
 apps/files_external/lib/swift.php    | 69 ++++++++++++++++++------------------
 apps/files_external/lib/webdav.php   | 32 +++++++----------
 apps/files_external/tests/config.php |  2 +-
 8 files changed, 65 insertions(+), 70 deletions(-)

(limited to 'apps/files_external/lib/dropbox.php')

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 2f7c8b35bec..832127d3e79 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -20,10 +20,10 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-require_once 'aws-sdk/sdk.class.php';
-
 namespace OC\Files\Storage;
 
+require_once 'aws-sdk/sdk.class.php';
+
 class AmazonS3 extends \OC\Files\Storage\Common {
 
 	private $s3;
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 351a2840d90..0f7593162e4 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -20,10 +20,10 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-require_once 'Dropbox/autoload.php';
-
 namespace OC\Files\Storage;
 
+require_once 'Dropbox/autoload.php';
+
 class Dropbox extends \OC\Files\Storage\Common {
 
 	private $dropbox;
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 731581dacc6..dea44728f3c 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -26,7 +26,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 		if(!$this->root || $this->root[0]!='/') {
 			$this->root='/'.$this->root;
 		}
-		//create the root folder if necesary
+		//create the root folder if necessary
 		if (!$this->is_dir('')) {
 			$this->mkdir('');
 		}
@@ -38,7 +38,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 
 	/**
 	 * construct the ftp url
-	 * @param string path
+	 * @param string $path
 	 * @return string
 	 */
 	public function constructUrl($path) {
@@ -74,7 +74,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 				}else{
 					$ext='';
 				}
-				$tmpFile=OCP\Files::tmpFile($ext);
+				$tmpFile=\OCP\Files::tmpFile($ext);
 				\OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
 				if($this->file_exists($path)) {
 					$this->getFile($path,$tmpFile);
@@ -82,6 +82,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 				self::$tempFiles[$tmpFile]=$path;
 				return fopen('close://'.$tmpFile,$mode);
 		}
+		return false;
 	}
 
 	public function writeBack($tmpFile) {
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index e4be4de5a09..141fc619e35 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -20,10 +20,10 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-require_once 'Google/common.inc.php';
-
 namespace OC\Files\Storage;
 
+require_once 'Google/common.inc.php';
+
 class Google extends \OC\Files\Storage\Common {
 
 	private $consumer;
@@ -62,7 +62,7 @@ class Google extends \OC\Files\Storage\Common {
 			$tempStr .= '&' . urlencode($key) . '=' . urlencode($value);
 		}
 		$uri = preg_replace('/&/', '?', $tempStr, 1);
-		$request = OAuthRequest::from_consumer_and_token($this->consumer, $this->oauth_token, $httpMethod, $uri, $params);
+		$request = \OAuthRequest::from_consumer_and_token($this->consumer, $this->oauth_token, $httpMethod, $uri, $params);
 		$request->sign_request($this->sig_method, $this->consumer, $this->oauth_token);
 		$auth_header = $request->to_header();
 		$headers = array($auth_header, 'GData-Version: 3.0');
@@ -129,7 +129,7 @@ class Google extends \OC\Files\Storage\Common {
 	private function getFeed($feedUri, $httpMethod, $postData = null) {
 		$result = $this->sendRequest($feedUri, $httpMethod, $postData);
 		if ($result) {
-			$dom = new DOMDocument();
+			$dom = new \DOMDocument();
 			$dom->loadXML($result);
 			return $dom;
 		}
@@ -248,7 +248,7 @@ class Google extends \OC\Files\Storage\Common {
 				$this->entries[$name] = $entry;
 			}
 		}
-		OC_FakeDirStream::$dirs['google'.$path] = $files;
+		\OC_FakeDirStream::$dirs['google'.$path] = $files;
 		return opendir('fakedir://google'.$path);
 	}
 
@@ -407,7 +407,7 @@ class Google extends \OC\Files\Storage\Common {
 					$ext = '';
 				}
 				$tmpFile = \OC_Helper::tmpFile($ext);
-				OC_CloseStreamWrapper::$callBacks[$tmpFile] = array($this, 'writeBack');
+				\OC_CloseStreamWrapper::$callBacks[$tmpFile] = array($this, 'writeBack');
 				if ($this->file_exists($path)) {
 					$source = $this->fopen($path, 'r');
 					file_put_contents($tmpFile, $source);
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 71c7a91ec93..dfba3105ecb 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -6,10 +6,10 @@
  * See the COPYING-README file.
  */
 
-require_once 'smb4php/smb.php';
-
 namespace OC\Files\Storage;
 
+require_once 'smb4php/smb.php';
+
 class SMB extends \OC\Files\Storage\StreamWrapper{
 	private $password;
 	private $user;
@@ -70,6 +70,7 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 
 	/**
 	 * check if a file or folder has been updated since $time
+	 * @param string $path
 	 * @param int $time
 	 * @return bool
 	 */
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 61f58766e8e..4b3f38166dc 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -6,10 +6,10 @@
  * See the COPYING-README file.
  */
 
-require_once 'php-cloudfiles/cloudfiles.php';
-
 namespace OC\Files\Storage;
 
+require_once 'php-cloudfiles/cloudfiles.php';
+
 class SWIFT extends \OC\Files\Storage\Common{
 	private $id;
 	private $host;
@@ -18,15 +18,15 @@ class SWIFT extends \OC\Files\Storage\Common{
 	private $token;
 	private $secure;
 	/**
-	 * @var CF_Authentication auth
+	 * @var \CF_Authentication auth
 	 */
 	private $auth;
 	/**
-	 * @var CF_Connection conn
+	 * @var \CF_Connection conn
 	 */
 	private $conn;
 	/**
-	 * @var CF_Container rootContainer
+	 * @var \CF_Container rootContainer
 	 */
 	private $rootContainer;
 
@@ -38,7 +38,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	/**
 	 * translate directory path to container name
-	 * @param string path
+	 * @param string $path
 	 * @return string
 	 */
 	private function getContainerName($path) {
@@ -48,8 +48,8 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	/**
 	 * get container by path
-	 * @param string path
-	 * @return CF_Container
+	 * @param string $path
+	 * @return \CF_Container
 	 */
 	private function getContainer($path) {
 		if($path=='' or $path=='/') {
@@ -62,15 +62,15 @@ class SWIFT extends \OC\Files\Storage\Common{
 			$container=$this->conn->get_container($this->getContainerName($path));
 			$this->containers[$path]=$container;
 			return $container;
-		}catch(NoSuchContainerException $e) {
+		}catch(\NoSuchContainerException $e) {
 			return null;
 		}
 	}
 
 	/**
 	 * create container
-	 * @param string path
-	 * @return CF_Container
+	 * @param string $path
+	 * @return \CF_Container
 	 */
 	private function createContainer($path) {
 		if($path=='' or $path=='/' or $path=='.') {
@@ -92,8 +92,8 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	/**
 	 * get object by path
-	 * @param string path
-	 * @return CF_Object
+	 * @param string $path
+	 * @return \CF_Object
 	 */
 	private function getObject($path) {
 		if(isset($this->objects[$path])) {
@@ -110,7 +110,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 				$obj=$container->get_object(basename($path));
 				$this->objects[$path]=$obj;
 				return $obj;
-			}catch(NoSuchObjectException $e) {
+			}catch(\NoSuchObjectException $e) {
 				return null;
 			}
 		}
@@ -135,8 +135,8 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	/**
 	 * create object
-	 * @param string path
-	 * @return CF_Object
+	 * @param string $path
+	 * @return \CF_Object
 	 */
 	private function createObject($path) {
 		$container=$this->getContainer(dirname($path));
@@ -157,7 +157,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	/**
 	 * check if container for path exists
-	 * @param string path
+	 * @param string $path
 	 * @return bool
 	 */
 	private function containerExists($path) {
@@ -166,15 +166,15 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	/**
 	 * get the list of emulated sub containers
-	 * @param CF_Container container
+	 * @param \CF_Container $container
 	 * @return array
 	 */
 	private function getSubContainers($container) {
-		$tmpFile=OCP\Files::tmpFile();
+		$tmpFile=\OCP\Files::tmpFile();
 		$obj=$this->getSubContainerFile($container);
 		try{
 			$obj->save_to_filename($tmpFile);
-		}catch(Exception $e) {
+		}catch(\Exception $e) {
 			return array();
 		}
 		$obj->save_to_filename($tmpFile);
@@ -188,15 +188,15 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	/**
 	 * add an emulated sub container
-	 * @param CF_Container container
-	 * @param string name
+	 * @param CF_Container $container
+	 * @param string $name
 	 * @return bool
 	 */
 	private function addSubContainer($container,$name) {
 		if(!$name) {
 			return false;
 		}
-		$tmpFile=OCP\Files::tmpFile();
+		$tmpFile=\OCP\Files::tmpFile();
 		$obj=$this->getSubContainerFile($container);
 		try{
 			$obj->save_to_filename($tmpFile);
@@ -211,8 +211,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 				$fh=fopen($tmpFile,'a');
 				fwrite($fh,$name."\n");
 			}
-		}catch(Exception $e) {
-			$containers=array();
+		}catch(\Exception $e) {
 			file_put_contents($tmpFile,$name."\n");
 		}
 
@@ -223,20 +222,20 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	/**
 	 * remove an emulated sub container
-	 * @param CF_Container container
-	 * @param string name
+	 * @param CF_Container $container
+	 * @param string $name
 	 * @return bool
 	 */
 	private function removeSubContainer($container,$name) {
 		if(!$name) {
 			return false;
 		}
-		$tmpFile=OCP\Files::tmpFile();
+		$tmpFile=\OCP\Files::tmpFile();
 		$obj=$this->getSubContainerFile($container);
 		try{
 			$obj->save_to_filename($tmpFile);
 			$containers=file($tmpFile);
-		}catch(Exception $e) {
+		}catch(\Exception $e) {
 			return false;
 		}
 		foreach($containers as &$sub) {
@@ -258,13 +257,13 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	/**
 	 * ensure a subcontainer file exists and return it's object
-	 * @param CF_Container container
-	 * @return CF_Object
+	 * @param \CF_Container $container
+	 * @return \CF_Object
 	 */
 	private function getSubContainerFile($container) {
 		try{
 			return $container->get_object(self::SUBCONTAINER_FILE);
-		}catch(NoSuchObjectException $e) {
+		}catch(\NoSuchObjectException $e) {
 			return $container->create_object(self::SUBCONTAINER_FILE);
 		}
 	}
@@ -526,11 +525,11 @@ class SWIFT extends \OC\Files\Storage\Common{
 	private function getTmpFile($path) {
 		$obj=$this->getObject($path);
 		if(!is_null($obj)) {
-			$tmpFile=OCP\Files::tmpFile();
+			$tmpFile=\OCP\Files::tmpFile();
 			$obj->save_to_filename($tmpFile);
 			return $tmpFile;
 		}else{
-			return OCP\Files::tmpFile();
+			return \OCP\Files::tmpFile();
 		}
 	}
 
@@ -545,7 +544,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	/**
 	 * remove custom mtime metadata
-	 * @param CF_Object obj
+	 * @param \CF_Object $obj
 	 */
 	private function resetMTime($obj) {
 		if(isset($obj->metadata['Mtime'])) {
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 6ed93e9035b..73231b6ad81 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -15,7 +15,7 @@ class DAV extends \OC\Files\Storage\Common{
 	private $secure;
 	private $root;
 	/**
-	 * @var Sabre_DAV_Client
+	 * @var \Sabre_DAV_Client
 	 */
 	private $client;
 
@@ -92,7 +92,7 @@ class DAV extends \OC\Files\Storage\Common{
 				\OC_FakeDirStream::$dirs[$id][]=$file;
 			}
 			return opendir('fakedir://'.$id);
-		}catch(Exception $e) {
+		}catch(\Exception $e) {
 			return false;
 		}
 	}
@@ -103,7 +103,7 @@ class DAV extends \OC\Files\Storage\Common{
 			$response=$this->client->propfind($path, array('{DAV:}resourcetype'));
 			$responseType=$response["{DAV:}resourcetype"]->resourceType;
 			return (count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
-		}catch(Exception $e) {
+		}catch(\Exception $e) {
 			error_log($e->getMessage());
 			\OCP\Util::writeLog("webdav client", \OCP\Util::sanitizeHTML($e->getMessage()), \OCP\Util::ERROR);
 			return false;
@@ -123,7 +123,7 @@ class DAV extends \OC\Files\Storage\Common{
 		try{
 			$this->client->propfind($path, array('{DAV:}resourcetype'));
 			return true;//no 404 exception
-		}catch(Exception $e) {
+		}catch(\Exception $e) {
 			return false;
 		}
 	}
@@ -169,7 +169,7 @@ class DAV extends \OC\Files\Storage\Common{
 				}else{
 					$ext='';
 				}
-				$tmpFile=OCP\Files::tmpFile($ext);
+				$tmpFile=\OCP\Files::tmpFile($ext);
 				\OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
 				if($this->file_exists($path)) {
 					$this->getFile($path,$tmpFile);
@@ -195,7 +195,7 @@ class DAV extends \OC\Files\Storage\Common{
 			}else{
 				return 0;
 			}
-		}catch(Exception $e) {
+		}catch(\Exception $e) {
 			return 0;
 		}
 	}
@@ -231,12 +231,9 @@ class DAV extends \OC\Files\Storage\Common{
 		$path1=$this->cleanPath($path1);
 		$path2=$this->root.$this->cleanPath($path2);
 		try{
-			$response=$this->client->request('MOVE',$path1,null,array('Destination'=>$path2));
+			$this->client->request('MOVE',$path1,null,array('Destination'=>$path2));
 			return true;
-		}catch(Exception $e) {
-			echo $e;
-			echo 'fail';
-			var_dump($response);
+		}catch(\Exception $e) {
 			return false;
 		}
 	}
@@ -245,12 +242,9 @@ class DAV extends \OC\Files\Storage\Common{
 		$path1=$this->cleanPath($path1);
 		$path2=$this->root.$this->cleanPath($path2);
 		try{
-			$response=$this->client->request('COPY',$path1,null,array('Destination'=>$path2));
+			$this->client->request('COPY',$path1,null,array('Destination'=>$path2));
 			return true;
-		}catch(Exception $e) {
-			echo $e;
-			echo 'fail';
-			var_dump($response);
+		}catch(\Exception $e) {
 			return false;
 		}
 	}
@@ -264,7 +258,7 @@ class DAV extends \OC\Files\Storage\Common{
 				'size'=>(int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
 				'ctime'=>-1,
 			);
-		}catch(Exception $e) {
+		}catch(\Exception $e) {
 			return array();
 		}
 	}
@@ -282,7 +276,7 @@ class DAV extends \OC\Files\Storage\Common{
 			}else{
 				return false;
 			}
-		}catch(Exception $e) {
+		}catch(\Exception $e) {
 			return false;
 		}
 	}
@@ -300,7 +294,7 @@ class DAV extends \OC\Files\Storage\Common{
 		try{
 			$response=$this->client->request($method,$path,$body);
 			return $response['statusCode']==$expected;
-		}catch(Exception $e) {
+		}catch(\Exception $e) {
 			return false;
 		}
 	}
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index ff16b1c1d8a..5af317675cb 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -8,7 +8,7 @@ return array(
 		'root'=>'/test',
 	),
 	'webdav'=>array(
-		'run'=>false,
+		'run'=>true,
 		'host'=>'localhost',
 		'user'=>'test',
 		'password'=>'test',
-- 
cgit v1.2.3


From cfa036eaa916c1adf38fb161a16c50cd050c0a3b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 20 Oct 2012 23:54:37 +0200
Subject: drop filectime from the filesystem api's

---
 apps/files_external/lib/amazons3.php     |  2 --
 apps/files_external/lib/dropbox.php      |  1 -
 apps/files_external/lib/google.php       |  2 --
 apps/files_external/lib/swift.php        |  2 --
 apps/files_external/lib/webdav.php       |  1 -
 apps/files_sharing/lib/sharedstorage.php | 22 ----------------------
 lib/files.php                            |  3 +--
 lib/files/filesystem.php                 |  4 ----
 lib/files/storage/common.php             |  4 ----
 lib/files/storage/local.php              |  3 ---
 lib/files/storage/storage.php            |  1 -
 lib/files/view.php                       |  4 ----
 lib/filesystem.php                       |  7 -------
 13 files changed, 1 insertion(+), 55 deletions(-)

(limited to 'apps/files_external/lib/dropbox.php')

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 832127d3e79..c3fa4651f64 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -115,12 +115,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			$stat['size'] = $this->s3->get_bucket_filesize($this->bucket);
 			$stat['atime'] = time();
 			$stat['mtime'] = $stat['atime'];
-			$stat['ctime'] = $stat['atime'];
 		} else if ($object = $this->getObject($path)) {
 			$stat['size'] = $object['Size'];
 			$stat['atime'] = time();
 			$stat['mtime'] = strtotime($object['LastModified']);
-			$stat['ctime'] = $stat['mtime'];
 		}
 		if (isset($stat)) {
 			return $stat;
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 0f7593162e4..0e82f80668f 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -119,7 +119,6 @@ class Dropbox extends \OC\Files\Storage\Common {
 			$stat['size'] = $metaData['bytes'];
 			$stat['atime'] = time();
 			$stat['mtime'] = (isset($metaData['modified'])) ? strtotime($metaData['modified']) : time();
-			$stat['ctime'] = $stat['mtime'];
 			return $stat;
 		}
 		return false;
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 141fc619e35..7ee5b97f8be 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -257,14 +257,12 @@ class Google extends \OC\Files\Storage\Common {
 			$stat['size'] = $this->free_space($path);
 			$stat['atime'] = time();
 			$stat['mtime'] = time();
-			$stat['ctime'] = time();
 		} else if ($entry = $this->getResource($path)) {
 			// NOTE: Native resources don't have a file size
 			$stat['size'] = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
 // 			if (isset($atime = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue))
 // 			$stat['atime'] = strtotime($entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue);
 			$stat['mtime'] = strtotime($entry->getElementsByTagName('updated')->item(0)->nodeValue);
-			$stat['ctime'] = strtotime($entry->getElementsByTagName('published')->item(0)->nodeValue);
 		}
 		if (isset($stat)) {
 			return $stat;
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 4b3f38166dc..c3578b0c23e 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -500,7 +500,6 @@ class SWIFT extends \OC\Files\Storage\Common{
 			return array(
 				'mtime'=>-1,
 				'size'=>$container->bytes_used,
-				'ctime'=>-1
 			);
 		}
 
@@ -518,7 +517,6 @@ class SWIFT extends \OC\Files\Storage\Common{
 		return array(
 			'mtime'=>$mtime,
 			'size'=>$obj->content_length,
-			'ctime'=>-1,
 		);
 	}
 
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 73231b6ad81..c9785f3eb11 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -256,7 +256,6 @@ class DAV extends \OC\Files\Storage\Common{
 			return array(
 				'mtime'=>strtotime($response['{DAV:}getlastmodified']),
 				'size'=>(int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
-				'ctime'=>-1,
 			);
 		}catch(\Exception $e) {
 			return array();
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index e12027a4f2b..521dfb69f2a 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -162,7 +162,6 @@ class Shared extends \OC\Files\Storage\Common {
 		if ($path == '' || $path == '/') {
 			$stat['size'] = $this->filesize($path);
 			$stat['mtime'] = $this->filemtime($path);
-			$stat['ctime'] = $this->filectime($path);
 			return $stat;
 		} else if ($source = $this->getSourcePath($path)) {
 			list($storage, $internalPath)=\OC\Files\Filesystem::resolvePath($source);
@@ -233,27 +232,6 @@ class Shared extends \OC\Files\Storage\Common {
 		return false;
 	}
 
-	public function filectime($path) {
-		if ($path == '' || $path == '/') {
-			$ctime = 0;
-			if ($dh = $this->opendir($path)) {
-				while (($filename = readdir($dh)) !== false) {
-					$tempctime = $this->filectime($filename);
-					if ($tempctime < $ctime) {
-						$ctime = $tempctime;
-					}
-				}
-			}
-			return $ctime;
-		} else {
-			$source = $this->getSourcePath($path);
-			if ($source) {
-				list($storage, $internalPath)=\OC\Files\Filesystem::resolvePath($source);
-				return $storage->filectime($internalPath);
-			}
-		}
-	}
-
 	public function filemtime($path) {
 		if ($path == '' || $path == '/') {
 			$mtime = 0;
diff --git a/lib/files.php b/lib/files.php
index 29322cf2d06..28c8d0b449f 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -30,13 +30,12 @@ class OC_Files {
 
 	/**
 	 * get the filesystem info
-	 * @param string path
+	 * @param string $path
 	 * @return array
 	 *
 	 * returns an associative array with the following keys:
 	 * - size
 	 * - mtime
-	 * - ctime
 	 * - mimetype
 	 * - encrypted
 	 * - versioned
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index e4c269257c2..94e8a562564 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -478,10 +478,6 @@ class Filesystem {
 		return self::$defaultInstance->file_exists($path);
 	}
 
-	static public function filectime($path) {
-		return self::$defaultInstance->filectime($path);
-	}
-
 	static public function filemtime($path) {
 		return self::$defaultInstance->filemtime($path);
 	}
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 3886a041829..17405845554 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -74,10 +74,6 @@ abstract class Common extends \OC\Files\Storage\Storage {
 		return $permissions;
 	}
 // 	abstract public function file_exists($path);
-	public function filectime($path) {
-		$stat = $this->stat($path);
-		return $stat['ctime'];
-	}
 	public function filemtime($path) {
 		$stat = $this->stat($path);
 		return $stat['mtime'];
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index 66ae5542e36..ccd69e3971c 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -66,9 +66,6 @@ class Local extends \OC\Files\Storage\Common{
 	public function file_exists($path) {
 		return file_exists($this->datadir.$path);
 	}
-	public function filectime($path) {
-		return filectime($this->datadir.$path);
-	}
 	public function filemtime($path) {
 		return filemtime($this->datadir.$path);
 	}
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index f149c61830c..941bc3b0779 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -29,7 +29,6 @@ abstract class Storage{
 	abstract public function isSharable($path);
 	abstract public function getPermissions($path);
 	abstract public function file_exists($path);
-	abstract public function filectime($path);
 	abstract public function filemtime($path);
 	abstract public function file_get_contents($path);
 	abstract public function file_put_contents($path,$data);
diff --git a/lib/files/view.php b/lib/files/view.php
index bffeb434f28..58e3ee6f051 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -236,10 +236,6 @@ class View {
 		return $this->basicOperation('file_exists', $path);
 	}
 
-	public function filectime($path) {
-		return $this->basicOperation('filectime', $path);
-	}
-
 	public function filemtime($path) {
 		return $this->basicOperation('filemtime', $path);
 	}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 587eb50d9e0..9ce75aaf8ce 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -306,13 +306,6 @@ class OC_Filesystem {
 		return \OC\Files\Filesystem::file_exists($path);
 	}
 
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function filectime($path) {
-		return \OC\Files\Filesystem::filectime($path);
-	}
-
 	/**
 	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
 	 */
-- 
cgit v1.2.3


From c9c919da5738f963247307ca3878e06beff87ade Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 28 Jan 2013 15:34:15 +0100
Subject: Move streamwrappers to seperate files and put them in a namespace

---
 apps/files_external/lib/amazons3.php     |  54 +++---
 apps/files_external/lib/dropbox.php      |   4 +-
 apps/files_external/lib/ftp.php          |   2 +-
 apps/files_external/lib/google.php       |   4 +-
 apps/files_external/lib/swift.php        |   4 +-
 apps/files_external/lib/webdav.php       |   6 +-
 apps/files_sharing/lib/sharedstorage.php |   2 +-
 lib/archive/tar.php                      |   2 +-
 lib/archive/zip.php                      |   2 +-
 lib/base.php                             |   7 +-
 lib/files/stream/close.php               | 100 ++++++++++
 lib/files/stream/dir.php                 |  47 +++++
 lib/files/stream/staticstream.php        | 191 ++++++++++++++++++++
 lib/streamwrappers.php                   | 301 -------------------------------
 tests/lib/streamwrappers.php             |  76 ++++----
 15 files changed, 420 insertions(+), 382 deletions(-)
 create mode 100644 lib/files/stream/close.php
 create mode 100644 lib/files/stream/dir.php
 create mode 100644 lib/files/stream/staticstream.php
 delete mode 100644 lib/streamwrappers.php

(limited to 'apps/files_external/lib/dropbox.php')

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index a209f0d0507..494885a1dd3 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -1,24 +1,24 @@
 <?php
 
 /**
-* ownCloud
-*
-* @author Michael Gapczynski
-* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * ownCloud
+ *
+ * @author Michael Gapczynski
+ * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 namespace OC\Files\Storage;
 
@@ -36,7 +36,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 	// TODO options: storage class, encryption server side, encrypt before upload?
 
 	public function __construct($params) {
-		$this->id = 'amazon::'.$params['key'] . md5($params['secret']);
+		$this->id = 'amazon::' . $params['key'] . md5($params['secret']);
 		$this->s3 = new \AmazonS3(array('key' => $params['key'], 'secret' => $params['secret']));
 		$this->bucket = $params['bucket'];
 	}
@@ -51,7 +51,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				return $response;
 				// This object could be a folder, a '/' must be at the end of the path
 			} else if (substr($path, -1) != '/') {
-				$response = $this->s3->get_object_metadata($this->bucket, $path.'/');
+				$response = $this->s3->get_object_metadata($this->bucket, $path . '/');
 				if ($response) {
 					$this->objects[$path] = $response;
 					return $response;
@@ -61,7 +61,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		return false;
 	}
 
-	public function getId(){
+	public function getId() {
 		return $this->id;
 	}
 
@@ -104,8 +104,8 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			foreach ($response->body->CommonPrefixes as $object) {
 				$files[] = basename($object->Prefix);
 			}
-			\OC_FakeDirStream::$dirs['amazons3'.$path] = $files;
-			return opendir('fakedir://amazons3'.$path);
+			\OC\Files\Stream\Dir::register('amazons3' . $path, $files);
+			return opendir('fakedir://amazons3' . $path);
 		}
 		return false;
 	}
@@ -194,13 +194,13 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 					$ext = '';
 				}
 				$tmpFile = \OC_Helper::tmpFile($ext);
-				\OC_CloseStreamWrapper::$callBacks[$tmpFile] = array($this, 'writeBack');
+				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 				if ($this->file_exists($path)) {
 					$source = $this->fopen($path, 'r');
 					file_put_contents($tmpFile, $source);
 				}
 				self::$tempFiles[$tmpFile] = $path;
-				return fopen('close://'.$tmpFile, $mode);
+				return fopen('close://' . $tmpFile, $mode);
 		}
 		return false;
 	}
@@ -209,8 +209,8 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		if (isset(self::$tempFiles[$tmpFile])) {
 			$handle = fopen($tmpFile, 'r');
 			$response = $this->s3->create_object($this->bucket,
-												 self::$tempFiles[$tmpFile],
-												 array('fileUpload' => $handle));
+				self::$tempFiles[$tmpFile],
+				array('fileUpload' => $handle));
 			if ($response->isOK()) {
 				unlink($tmpFile);
 			}
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 9223b4ca87b..11644e4a2c8 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -114,7 +114,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 			foreach ($contents as $file) {
 				$files[] = basename($file['path']);
 			}
-			\OC_FakeDirStream::$dirs['dropbox'.$path] = $files;
+			\OC\Files\Stream\Dir::register('dropbox'.$path, $files);
 			return opendir('fakedir://dropbox'.$path);
 		}
 		return false;
@@ -232,7 +232,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 					$ext = '';
 				}
 				$tmpFile = \OC_Helper::tmpFile($ext);
-				\OC_CloseStreamWrapper::$callBacks[$tmpFile] = array($this, 'writeBack');
+				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 				if ($this->file_exists($path)) {
 					$source = $this->fopen($path, 'r');
 					file_put_contents($tmpFile, $source);
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 973b33fbfd7..9a27b63323a 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -84,7 +84,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 					$ext='';
 				}
 				$tmpFile=OCP\Files::tmpFile($ext);
-				OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
+				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 				if ($this->file_exists($path)) {
 					$this->getFile($path, $tmpFile);
 				}
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 4c485773e7b..7396c7e3f27 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -273,7 +273,7 @@ class Google extends \OC\Files\Storage\Common {
 				$this->entries[$name] = $entry;
 			}
 		}
-		\OC_FakeDirStream::$dirs['google'.$path] = $files;
+		\OC\Files\Stream\Dir::register('google'.$path, $files);
 		return opendir('fakedir://google'.$path);
 	}
 
@@ -450,7 +450,7 @@ class Google extends \OC\Files\Storage\Common {
 					$ext = '';
 				}
 				$tmpFile = \OC_Helper::tmpFile($ext);
-				\OC_CloseStreamWrapper::$callBacks[$tmpFile] = array($this, 'writeBack');
+				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 				if ($this->file_exists($path)) {
 					$source = $this->fopen($path, 'r');
 					file_put_contents($tmpFile, $source);
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index bd1f4c572a6..cbf2007052b 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -371,7 +371,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 		$subContainers=$this->getSubContainers($container);
 		$files=array_merge($files, $subContainers);
 		$id=$this->getContainerName($path);
-		\OC_FakeDirStream::$dirs[$id]=$files;
+		\OC\Files\Stream\Dir::register($id, $files);
 		return opendir('fakedir://'.$id);
 	}
 
@@ -465,7 +465,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 			case 'c':
 			case 'c+':
 				$tmpFile=$this->getTmpFile($path);
-				OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
+				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 				self::$tempFiles[$tmpFile]=$path;
 				return fopen('close://'.$tmpFile, $mode);
 		}
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 6d43a03058a..571b4d79ae2 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -104,13 +104,15 @@ class DAV extends \OC\Files\Storage\Common{
 		try {
 			$response=$this->client->propfind($path, array(), 1);
 			$id=md5('webdav'.$this->root.$path);
+			$content = array();
 			\OC_FakeDirStream::$dirs[$id]=array();
 			$files=array_keys($response);
 			array_shift($files);//the first entry is the current directory
 			foreach ($files as $file) {
 				$file = urldecode(basename($file));
-				\OC_FakeDirStream::$dirs[$id][]=$file;
+				$content[]=$file;
 			}
+			\OC\Files\Stream\Dir::register($id, $content);
 			return opendir('fakedir://'.$id);
 		} catch(\Exception $e) {
 			return false;
@@ -194,7 +196,7 @@ class DAV extends \OC\Files\Storage\Common{
 					$ext='';
 				}
 				$tmpFile = \OCP\Files::tmpFile($ext);
-				\OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
+				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 				if($this->file_exists($path)) {
 					$this->getFile($path, $tmpFile);
 				}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index b0be6843c56..ea28ca69b93 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -102,7 +102,7 @@ class Shared extends \OC\Files\Storage\Common {
 	public function opendir($path) {
 		if ($path == '' || $path == '/') {
 			$files = \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_Folder::FORMAT_OPENDIR);
-			\OC_FakeDirStream::$dirs['shared'] = $files;
+			\OC\Files\Stream\Dir::register('shared', $files);
 			return opendir('fakedir://shared');
 		} else if ($source = $this->getSourcePath($path)) {
 			list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source);
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index 0fa633c6038..117d88e5f42 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -308,7 +308,7 @@ class OC_Archive_TAR extends OC_Archive{
 		if($mode=='r' or $mode=='rb') {
 			return fopen($tmpFile, $mode);
 		}else{
-			OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
+			\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 			self::$tempFiles[$tmpFile]=$path;
 			return fopen('close://'.$tmpFile, $mode);
 		}
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index 1c967baa08f..8e31795ded1 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -171,7 +171,7 @@ class OC_Archive_ZIP extends OC_Archive{
 				$ext='';
 			}
 			$tmpFile=OCP\Files::tmpFile($ext);
-			OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
+			\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 			if($this->fileExists($path)) {
 				$this->extractFile($path, $tmpFile);
 			}
diff --git a/lib/base.php b/lib/base.php
index e3baa617c32..45e2f633cb7 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -421,10 +421,9 @@ class OC
 		}
 
 		// register the stream wrappers
-		require_once 'streamwrappers.php';
-		stream_wrapper_register("fakedir", "OC_FakeDirStream");
-		stream_wrapper_register('static', 'OC_StaticStreamWrapper');
-		stream_wrapper_register('close', 'OC_CloseStreamWrapper');
+		stream_wrapper_register('fakedir', 'OC\Files\Stream\Dir');
+		stream_wrapper_register('static', 'OC\Files\Stream\StaticStream');
+		stream_wrapper_register('close', 'OC\Files\Stream\Close');
 
 		self::checkConfig();
 		self::checkInstalled();
diff --git a/lib/files/stream/close.php b/lib/files/stream/close.php
new file mode 100644
index 00000000000..80de3497c36
--- /dev/null
+++ b/lib/files/stream/close.php
@@ -0,0 +1,100 @@
+<?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\Stream;
+
+/**
+ * stream wrapper that provides a callback on stream close
+ */
+class Close {
+	private static $callBacks = array();
+	private $path = '';
+	private $source;
+	private static $open = array();
+
+	public function stream_open($path, $mode, $options, &$opened_path) {
+		$path = substr($path, strlen('close://'));
+		$this->path = $path;
+		$this->source = fopen($path, $mode);
+		if (is_resource($this->source)) {
+			$this->meta = stream_get_meta_data($this->source);
+		}
+		self::$open[] = $path;
+		return is_resource($this->source);
+	}
+
+	public function stream_seek($offset, $whence = SEEK_SET) {
+		fseek($this->source, $offset, $whence);
+	}
+
+	public function stream_tell() {
+		return ftell($this->source);
+	}
+
+	public function stream_read($count) {
+		return fread($this->source, $count);
+	}
+
+	public function stream_write($data) {
+		return fwrite($this->source, $data);
+	}
+
+	public function stream_set_option($option, $arg1, $arg2) {
+		switch ($option) {
+			case STREAM_OPTION_BLOCKING:
+				stream_set_blocking($this->source, $arg1);
+				break;
+			case STREAM_OPTION_READ_TIMEOUT:
+				stream_set_timeout($this->source, $arg1, $arg2);
+				break;
+			case STREAM_OPTION_WRITE_BUFFER:
+				stream_set_write_buffer($this->source, $arg1, $arg2);
+		}
+	}
+
+	public function stream_stat() {
+		return fstat($this->source);
+	}
+
+	public function stream_lock($mode) {
+		flock($this->source, $mode);
+	}
+
+	public function stream_flush() {
+		return fflush($this->source);
+	}
+
+	public function stream_eof() {
+		return feof($this->source);
+	}
+
+	public function url_stat($path) {
+		$path = substr($path, strlen('close://'));
+		if (file_exists($path)) {
+			return stat($path);
+		} else {
+			return false;
+		}
+	}
+
+	public function stream_close() {
+		fclose($this->source);
+		if (isset(self::$callBacks[$this->path])) {
+			call_user_func(self::$callBacks[$this->path], $this->path);
+		}
+	}
+
+	public function unlink($path) {
+		$path = substr($path, strlen('close://'));
+		return unlink($path);
+	}
+
+	public static function registerCallback($path, $callback) {
+		self::$callBacks[$path] = $callback;
+	}
+}
diff --git a/lib/files/stream/dir.php b/lib/files/stream/dir.php
new file mode 100644
index 00000000000..6ca884fc994
--- /dev/null
+++ b/lib/files/stream/dir.php
@@ -0,0 +1,47 @@
+<?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\Stream;
+
+class Dir {
+	private static $dirs = array();
+	private $name;
+	private $index;
+
+	public function dir_opendir($path, $options) {
+		$this->name = substr($path, strlen('fakedir://'));
+		$this->index = 0;
+		if (!isset(self::$dirs[$this->name])) {
+			self::$dirs[$this->name] = array();
+		}
+		return true;
+	}
+
+	public function dir_readdir() {
+		if ($this->index >= count(self::$dirs[$this->name])) {
+			return false;
+		}
+		$filename = self::$dirs[$this->name][$this->index];
+		$this->index++;
+		return $filename;
+	}
+
+	public function dir_closedir() {
+		$this->name = '';
+		return true;
+	}
+
+	public function dir_rewinddir() {
+		$this->index = 0;
+		return true;
+	}
+
+	public static function register($path, $content) {
+		self::$dirs[$path] = $content;
+	}
+}
diff --git a/lib/files/stream/staticstream.php b/lib/files/stream/staticstream.php
new file mode 100644
index 00000000000..7725a6a5a04
--- /dev/null
+++ b/lib/files/stream/staticstream.php
@@ -0,0 +1,191 @@
+<?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\Stream;
+
+class StaticStream {
+	public $context;
+	protected static $data = array();
+
+	protected $path = '';
+	protected $pointer = 0;
+	protected $writable = false;
+
+	public function stream_close() {
+	}
+
+	public function stream_eof() {
+		return $this->pointer >= strlen(self::$data[$this->path]);
+	}
+
+	public function stream_flush() {
+	}
+
+	public function stream_open($path, $mode, $options, &$opened_path) {
+		switch ($mode[0]) {
+			case 'r':
+				if (!isset(self::$data[$path])) return false;
+				$this->path = $path;
+				$this->writable = isset($mode[1]) && $mode[1] == '+';
+				break;
+			case 'w':
+				self::$data[$path] = '';
+				$this->path = $path;
+				$this->writable = true;
+				break;
+			case 'a':
+				if (!isset(self::$data[$path])) self::$data[$path] = '';
+				$this->path = $path;
+				$this->writable = true;
+				$this->pointer = strlen(self::$data[$path]);
+				break;
+			case 'x':
+				if (isset(self::$data[$path])) return false;
+				$this->path = $path;
+				$this->writable = true;
+				break;
+			case 'c':
+				if (!isset(self::$data[$path])) self::$data[$path] = '';
+				$this->path = $path;
+				$this->writable = true;
+				break;
+			default:
+				return false;
+		}
+		$opened_path = $this->path;
+		return true;
+	}
+
+	public function stream_read($count) {
+		$bytes = min(strlen(self::$data[$this->path]) - $this->pointer, $count);
+		$data = substr(self::$data[$this->path], $this->pointer, $bytes);
+		$this->pointer += $bytes;
+		return $data;
+	}
+
+	public function stream_seek($offset, $whence = SEEK_SET) {
+		$len = strlen(self::$data[$this->path]);
+		switch ($whence) {
+			case SEEK_SET:
+				if ($offset <= $len) {
+					$this->pointer = $offset;
+					return true;
+				}
+				break;
+			case SEEK_CUR:
+				if ($this->pointer + $offset <= $len) {
+					$this->pointer += $offset;
+					return true;
+				}
+				break;
+			case SEEK_END:
+				if ($len + $offset <= $len) {
+					$this->pointer = $len + $offset;
+					return true;
+				}
+				break;
+		}
+		return false;
+	}
+
+	public function stream_stat() {
+		$size = strlen(self::$data[$this->path]);
+		$time = time();
+		return array(
+			0 => 0,
+			'dev' => 0,
+			1 => 0,
+			'ino' => 0,
+			2 => 0777,
+			'mode' => 0777,
+			3 => 1,
+			'nlink' => 1,
+			4 => 0,
+			'uid' => 0,
+			5 => 0,
+			'gid' => 0,
+			6 => '',
+			'rdev' => '',
+			7 => $size,
+			'size' => $size,
+			8 => $time,
+			'atime' => $time,
+			9 => $time,
+			'mtime' => $time,
+			10 => $time,
+			'ctime' => $time,
+			11 => -1,
+			'blksize' => -1,
+			12 => -1,
+			'blocks' => -1,
+		);
+	}
+
+	public function stream_tell() {
+		return $this->pointer;
+	}
+
+	public function stream_write($data) {
+		if (!$this->writable) return 0;
+		$size = strlen($data);
+		if ($this->stream_eof()) {
+			self::$data[$this->path] .= $data;
+		} else {
+			self::$data[$this->path] = substr_replace(
+				self::$data[$this->path],
+				$data,
+				$this->pointer
+			);
+		}
+		$this->pointer += $size;
+		return $size;
+	}
+
+	public function unlink($path) {
+		if (isset(self::$data[$path])) {
+			unset(self::$data[$path]);
+		}
+		return true;
+	}
+
+	public function url_stat($path) {
+		if (isset(self::$data[$path])) {
+			$size = strlen(self::$data[$path]);
+			$time = time();
+			return array(
+				0 => 0,
+				'dev' => 0,
+				1 => 0,
+				'ino' => 0,
+				2 => 0777,
+				'mode' => 0777,
+				3 => 1,
+				'nlink' => 1,
+				4 => 0,
+				'uid' => 0,
+				5 => 0,
+				'gid' => 0,
+				6 => '',
+				'rdev' => '',
+				7 => $size,
+				'size' => $size,
+				8 => $time,
+				'atime' => $time,
+				9 => $time,
+				'mtime' => $time,
+				10 => $time,
+				'ctime' => $time,
+				11 => -1,
+				'blksize' => -1,
+				12 => -1,
+				'blocks' => -1,
+			);
+		}
+		return false;
+	}
+}
diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php
deleted file mode 100644
index 981c280f0dd..00000000000
--- a/lib/streamwrappers.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-
-class OC_FakeDirStream{
-	public static $dirs=array();
-	private $name;
-	private $index;
-
-	public function dir_opendir($path, $options) {
-		$this->name=substr($path, strlen('fakedir://'));
-		$this->index=0;
-		if(!isset(self::$dirs[$this->name])) {
-			self::$dirs[$this->name]=array();
-		}
-		return true;
-	}
-
-	public function dir_readdir() {
-		if($this->index>=count(self::$dirs[$this->name])) {
-			return false;
-		}
-		$filename=self::$dirs[$this->name][$this->index];
-		$this->index++;
-		return $filename;
-	}
-
-	public function dir_closedir() {
-		$this->name='';
-		return true;
-	}
-
-	public function dir_rewinddir() {
-		$this->index=0;
-		return true;
-	}
-}
-
-class OC_StaticStreamWrapper {
-	public $context;
-	protected static $data = array();
-
-	protected $path    = '';
-	protected $pointer = 0;
-	protected $writable = false;
-
-	public function stream_close() {}
-
-	public function stream_eof() {
-		return $this->pointer >= strlen(self::$data[$this->path]);
-	}
-
-	public function stream_flush() {}
-
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		switch ($mode[0]) {
-			case 'r':
-				if (!isset(self::$data[$path])) return false;
-				$this->path = $path;
-				$this->writable = isset($mode[1]) && $mode[1] == '+';
-				break;
-			case 'w':
-				self::$data[$path] = '';
-				$this->path = $path;
-				$this->writable = true;
-				break;
-			case 'a':
-				if (!isset(self::$data[$path])) self::$data[$path] = '';
-				$this->path = $path;
-				$this->writable = true;
-				$this->pointer = strlen(self::$data[$path]);
-				break;
-			case 'x':
-				if (isset(self::$data[$path])) return false;
-				$this->path = $path;
-				$this->writable = true;
-				break;
-			case 'c':
-				if (!isset(self::$data[$path])) self::$data[$path] = '';
-				$this->path = $path;
-				$this->writable = true;
-				break;
-			default:
-				return false;
-		}
-		$opened_path = $this->path;
-		return true;
-	}
-
-	public function stream_read($count) {
-		$bytes = min(strlen(self::$data[$this->path]) - $this->pointer, $count);
-		$data = substr(self::$data[$this->path], $this->pointer, $bytes);
-		$this->pointer += $bytes;
-		return $data;
-	}
-
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		$len = strlen(self::$data[$this->path]);
-		switch ($whence) {
-			case SEEK_SET:
-				if ($offset <= $len) {
-					$this->pointer = $offset;
-					return true;
-				}
-				break;
-			case SEEK_CUR:
-				if ($this->pointer + $offset <= $len) {
-					$this->pointer += $offset;
-					return true;
-				}
-				break;
-			case SEEK_END:
-				if ($len + $offset <= $len) {
-					$this->pointer = $len + $offset;
-					return true;
-				}
-				break;
-		}
-		return false;
-	}
-
-	public function stream_stat() {
-		$size = strlen(self::$data[$this->path]);
-		$time = time();
-		return array(
-			0 => 0,
-			'dev' => 0,
-			1 => 0,
-			'ino' => 0,
-			2 => 0777,
-			'mode' => 0777,
-			3 => 1,
-			'nlink' => 1,
-			4 => 0,
-			'uid' => 0,
-			5 => 0,
-			'gid' => 0,
-			6 => '',
-			'rdev' => '',
-			7 => $size,
-			'size' => $size,
-			8 => $time,
-			'atime' => $time,
-			9 => $time,
-			'mtime' => $time,
-			10 => $time,
-			'ctime' => $time,
-			11 => -1,
-			'blksize' => -1,
-			12 => -1,
-			'blocks' => -1,
-		);
-	}
-
-	public function stream_tell() {
-		return $this->pointer;
-	}
-
-	public function stream_write($data) {
-		if (!$this->writable) return 0;
-		$size = strlen($data);
-		if ($this->stream_eof()) {
-			self::$data[$this->path] .= $data;
-		} else {
-			self::$data[$this->path] = substr_replace(
-				self::$data[$this->path],
-				$data,
-				$this->pointer
-			);
-		}
-		$this->pointer += $size;
-		return $size;
-	}
-
-	public function unlink($path) {
-		if (isset(self::$data[$path])) {
-			unset(self::$data[$path]);
-		}
-		return true;
-	}
-
-	public function url_stat($path) {
-		if (isset(self::$data[$path])) {
-			$size = strlen(self::$data[$path]);
-			$time = time();
-			return array(
-				0 => 0,
-				'dev' => 0,
-				1 => 0,
-				'ino' => 0,
-				2 => 0777,
-				'mode' => 0777,
-				3 => 1,
-				'nlink' => 1,
-				4 => 0,
-				'uid' => 0,
-				5 => 0,
-				'gid' => 0,
-				6 => '',
-				'rdev' => '',
-				7 => $size,
-				'size' => $size,
-				8 => $time,
-				'atime' => $time,
-				9 => $time,
-				'mtime' => $time,
-				10 => $time,
-				'ctime' => $time,
-				11 => -1,
-				'blksize' => -1,
-				12 => -1,
-				'blocks' => -1,
-			);
-		}
-		return false;
-	}
-}
-
-/**
- * stream wrapper that provides a callback on stream close
- */
-class OC_CloseStreamWrapper{
-	public static $callBacks=array();
-	private $path='';
-	private $source;
-	private static $open=array();
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		$path=substr($path, strlen('close://'));
-		$this->path=$path;
-		$this->source=fopen($path, $mode);
-		if(is_resource($this->source)) {
-			$this->meta=stream_get_meta_data($this->source);
-		}
-		self::$open[]=$path;
-		return is_resource($this->source);
-	}
-
-	public function stream_seek($offset, $whence=SEEK_SET) {
-		fseek($this->source, $offset, $whence);
-	}
-
-	public function stream_tell() {
-		return ftell($this->source);
-	}
-
-	public function stream_read($count) {
-		return fread($this->source, $count);
-	}
-
-	public function stream_write($data) {
-		return fwrite($this->source, $data);
-	}
-
-	public function stream_set_option($option, $arg1, $arg2) {
-		switch($option) {
-			case STREAM_OPTION_BLOCKING:
-				stream_set_blocking($this->source, $arg1);
-				break;
-			case STREAM_OPTION_READ_TIMEOUT:
-				stream_set_timeout($this->source, $arg1, $arg2);
-				break;
-			case STREAM_OPTION_WRITE_BUFFER:
-				stream_set_write_buffer($this->source, $arg1, $arg2);
-		}
-	}
-
-	public function stream_stat() {
-		return fstat($this->source);
-	}
-
-	public function stream_lock($mode) {
-		flock($this->source, $mode);
-	}
-
-	public function stream_flush() {
-		return fflush($this->source);
-	}
-
-	public function stream_eof() {
-		return feof($this->source);
-	}
-
-	public function url_stat($path) {
-		$path=substr($path, strlen('close://'));
-		if(file_exists($path)) {
-			return stat($path);
-		}else{
-			return false;
-		}
-	}
-
-	public function stream_close() {
-		fclose($this->source);
-		if(isset(self::$callBacks[$this->path])) {
-			call_user_func(self::$callBacks[$this->path], $this->path);
-		}
-	}
-
-	public function unlink($path) {
-		$path=substr($path, strlen('close://'));
-		return unlink($path);
-	}
-}
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index aebbc93b902..e40f2e76128 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -1,41 +1,41 @@
 <?php
 /**
-* ownCloud
-*
-* @author Robin Appelman
-* @copyright 2012 Robin Appelman icewind@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Robin Appelman
+ * @copyright 2012 Robin Appelman icewind@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 class Test_StreamWrappers extends PHPUnit_Framework_TestCase {
 	public function testFakeDir() {
-		$items=array('foo', 'bar');
-		OC_FakeDirStream::$dirs['test']=$items;
-		$dh=opendir('fakedir://test');
-		$result=array();
-		while($file=readdir($dh)) {
-			$result[]=$file;
+		$items = array('foo', 'bar');
+		\OC\Files\Stream\Dir::register('test', $items);
+		$dh = opendir('fakedir://test');
+		$result = array();
+		while ($file = readdir($dh)) {
+			$result[] = $file;
 			$this->assertContains($file, $items);
 		}
 		$this->assertEquals(count($items), count($result));
 	}
 
 	public function testStaticStream() {
-		$sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
-		$staticFile='static://test';
+		$sourceFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
+		$staticFile = 'static://test';
 		$this->assertFalse(file_exists($staticFile));
 		file_put_contents($staticFile, file_get_contents($sourceFile));
 		$this->assertTrue(file_exists($staticFile));
@@ -47,27 +47,27 @@ class Test_StreamWrappers extends PHPUnit_Framework_TestCase {
 
 	public function testCloseStream() {
 		//ensure all basic stream stuff works
-		$sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
-		$tmpFile=OC_Helper::TmpFile('.txt');
-		$file='close://'.$tmpFile;
+		$sourceFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
+		$tmpFile = OC_Helper::TmpFile('.txt');
+		$file = 'close://' . $tmpFile;
 		$this->assertTrue(file_exists($file));
 		file_put_contents($file, file_get_contents($sourceFile));
 		$this->assertEquals(file_get_contents($sourceFile), file_get_contents($file));
 		unlink($file);
 		clearstatcache();
 		$this->assertFalse(file_exists($file));
-		
+
 		//test callback
-		$tmpFile=OC_Helper::TmpFile('.txt');
-		$file='close://'.$tmpFile;
-		OC_CloseStreamWrapper::$callBacks[$tmpFile]=array('Test_StreamWrappers', 'closeCallBack');
-		$fh=fopen($file, 'w');
+		$tmpFile = OC_Helper::TmpFile('.txt');
+		$file = 'close://' . $tmpFile;
+		\OC\Files\Stream\Close::registerCallback($tmpFile, array('Test_StreamWrappers', 'closeCallBack'));
+		$fh = fopen($file, 'w');
 		fwrite($fh, 'asd');
-		try{
+		try {
 			fclose($fh);
 			$this->fail('Expected exception');
-		}catch(Exception $e) {
-			$path=$e->getMessage();
+		} catch (Exception $e) {
+			$path = $e->getMessage();
 			$this->assertEquals($path, $tmpFile);
 		}
 	}
-- 
cgit v1.2.3