Move streamwrappers to seperate files and put them in a namespace

1 files changed, 38 insertions, 38 deletions

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);
 		}
 	}