merge from master

3 files changed, 68 insertions, 68 deletions

diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php
index a7bc2df0e12..0e119f55bea 100644
--- a/apps/files_encryption/tests/encryption.php
+++ b/apps/files_encryption/tests/encryption.php
@@ -11,46 +11,46 @@ class Test_Encryption extends UnitTestCase {
 		$key=uniqid();
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
 		$source=file_get_contents($file); //nice large text file
-		$encrypted=OC_Crypt::encrypt($source,$key);
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$encrypted=OC_Crypt::encrypt($source, $key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertNotEqual($encrypted,$source);
-		$this->assertEqual($decrypted,$source);
+		$this->assertNotEqual($encrypted, $source);
+		$this->assertEqual($decrypted, $source);
 
-		$chunk=substr($source,0,8192);
-		$encrypted=OC_Crypt::encrypt($chunk,$key);
+		$chunk=substr($source, 0, 8192);
+		$encrypted=OC_Crypt::encrypt($chunk, $key);
 		$this->assertEqual(strlen($chunk), strlen($encrypted));
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted,$chunk);
+		$this->assertEqual($decrypted, $chunk);
 
-		$encrypted=OC_Crypt::blockEncrypt($source,$key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
-		$this->assertNotEqual($encrypted,$source);
-		$this->assertEqual($decrypted,$source);
+		$encrypted=OC_Crypt::blockEncrypt($source, $key);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
+		$this->assertNotEqual($encrypted, $source);
+		$this->assertEqual($decrypted, $source);
 
 		$tmpFileEncrypted=OCP\Files::tmpFile();
-		OC_Crypt::encryptfile($file,$tmpFileEncrypted,$key);
+		OC_Crypt::encryptfile($file, $tmpFileEncrypted, $key);
 		$encrypted=file_get_contents($tmpFileEncrypted);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
-		$this->assertNotEqual($encrypted,$source);
-		$this->assertEqual($decrypted,$source);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
+		$this->assertNotEqual($encrypted, $source);
+		$this->assertEqual($decrypted, $source);
 
 		$tmpFileDecrypted=OCP\Files::tmpFile();
-		OC_Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key);
+		OC_Crypt::decryptfile($tmpFileEncrypted, $tmpFileDecrypted, $key);
 		$decrypted=file_get_contents($tmpFileDecrypted);
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
 		$file=OC::$SERVERROOT.'/core/img/weather-clear.png';
 		$source=file_get_contents($file); //binary file
-		$encrypted=OC_Crypt::encrypt($source,$key);
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$encrypted=OC_Crypt::encrypt($source, $key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
-		$encrypted=OC_Crypt::blockEncrypt($source,$key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
-		$this->assertEqual($decrypted,$source);
+		$encrypted=OC_Crypt::blockEncrypt($source, $key);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
+		$this->assertEqual($decrypted, $source);
 
 	}
 
@@ -59,14 +59,14 @@ class Test_Encryption extends UnitTestCase {
 
 		$file=__DIR__.'/binary';
 		$source=file_get_contents($file); //binary file
-		$encrypted=OC_Crypt::encrypt($source,$key);
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$encrypted=OC_Crypt::encrypt($source, $key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
-		$encrypted=OC_Crypt::blockEncrypt($source,$key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key, strlen($source));
-		$this->assertEqual($decrypted,$source);
+		$encrypted=OC_Crypt::blockEncrypt($source, $key);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key, strlen($source));
+		$this->assertEqual($decrypted, $source);
 	}
 }
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index c3c8f4a2db0..1c800bbc5f6 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -13,8 +13,8 @@ class Test_CryptProxy extends UnitTestCase {
 	public function setUp() {
 		$user=OC_User::getUser();
 
-		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
-		OCP\Config::setAppValue('files_encryption','enable_encryption','true');
+		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption', 'true');
+		OCP\Config::setAppValue('files_encryption', 'enable_encryption', 'true');
 		$this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null;
 
 
@@ -30,7 +30,7 @@ class Test_CryptProxy extends UnitTestCase {
 
 		//set up temporary storage
 		OC_Filesystem::clearMounts();
-		OC_Filesystem::mount('OC_Filestorage_Temporary', array(),'/');
+		OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/');
 
 		OC_Filesystem::init('/'.$user.'/files');
 
@@ -41,7 +41,7 @@ class Test_CryptProxy extends UnitTestCase {
 	}
 
 	public function tearDown() {
-		OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig);
+		OCP\Config::setAppValue('files_encryption', 'enable_encryption', $this->oldConfig);
 		if(!is_null($this->oldKey)) {
 			$_SESSION['enckey']=$this->oldKey;
 		}
@@ -51,16 +51,16 @@ class Test_CryptProxy extends UnitTestCase {
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
 		$original=file_get_contents($file);
 
-		OC_Filesystem::file_put_contents('/file',$original);
+		OC_Filesystem::file_put_contents('/file', $original);
 
 		OC_FileProxy::$enabled=false;
 		$stored=OC_Filesystem::file_get_contents('/file');
 		OC_FileProxy::$enabled=true;
 
 		$fromFile=OC_Filesystem::file_get_contents('/file');
-		$this->assertNotEqual($original,$stored);
+		$this->assertNotEqual($original, $stored);
 		$this->assertEqual(strlen($original), strlen($fromFile));
-		$this->assertEqual($original,$fromFile);
+		$this->assertEqual($original, $fromFile);
 
 	}
 
@@ -72,46 +72,46 @@ class Test_CryptProxy extends UnitTestCase {
 		$view=new OC_FilesystemView('/'.OC_User::getUser());
 		$userDir='/'.OC_User::getUser().'/files';
 
-		$rootView->file_put_contents($userDir.'/file',$original);
+		$rootView->file_put_contents($userDir.'/file', $original);
 
 		OC_FileProxy::$enabled=false;
 		$stored=$rootView->file_get_contents($userDir.'/file');
 		OC_FileProxy::$enabled=true;
 
-		$this->assertNotEqual($original,$stored);
+		$this->assertNotEqual($original, $stored);
 		$fromFile=$rootView->file_get_contents($userDir.'/file');
-		$this->assertEqual($original,$fromFile);
+		$this->assertEqual($original, $fromFile);
 
 		$fromFile=$view->file_get_contents('files/file');
-		$this->assertEqual($original,$fromFile);
+		$this->assertEqual($original, $fromFile);
 	}
 
 	public function testBinary() {
 		$file=__DIR__.'/binary';
 		$original=file_get_contents($file);
 
-		OC_Filesystem::file_put_contents('/file',$original);
+		OC_Filesystem::file_put_contents('/file', $original);
 
 		OC_FileProxy::$enabled=false;
 		$stored=OC_Filesystem::file_get_contents('/file');
 		OC_FileProxy::$enabled=true;
 
 		$fromFile=OC_Filesystem::file_get_contents('/file');
-		$this->assertNotEqual($original,$stored);
+		$this->assertNotEqual($original, $stored);
 		$this->assertEqual(strlen($original), strlen($fromFile));
-		$this->assertEqual($original,$fromFile);
+		$this->assertEqual($original, $fromFile);
 
 		$file=__DIR__.'/zeros';
 		$original=file_get_contents($file);
 
-		OC_Filesystem::file_put_contents('/file',$original);
+		OC_Filesystem::file_put_contents('/file', $original);
 
 		OC_FileProxy::$enabled=false;
 		$stored=OC_Filesystem::file_get_contents('/file');
 		OC_FileProxy::$enabled=true;
 
 		$fromFile=OC_Filesystem::file_get_contents('/file');
-		$this->assertNotEqual($original,$stored);
+		$this->assertNotEqual($original, $stored);
 		$this->assertEqual(strlen($original), strlen($fromFile));
 	}
 }
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 5ea0da48017..67b5e98ae67 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -10,27 +10,27 @@ class Test_CryptStream extends UnitTestCase {
 	private $tmpFiles=array();
 
 	function testStream() {
-		$stream=$this->getStream('test1','w', strlen('foobar'));
-		fwrite($stream,'foobar');
+		$stream=$this->getStream('test1', 'w', strlen('foobar'));
+		fwrite($stream, 'foobar');
 		fclose($stream);
 
-		$stream=$this->getStream('test1','r', strlen('foobar'));
-		$data=fread($stream,6);
+		$stream=$this->getStream('test1', 'r', strlen('foobar'));
+		$data=fread($stream, 6);
 		fclose($stream);
-		$this->assertEqual('foobar',$data);
+		$this->assertEqual('foobar', $data);
 
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-		$source=fopen($file,'r');
-		$target=$this->getStream('test2','w',0);
-		OCP\Files::streamCopy($source,$target);
+		$source=fopen($file, 'r');
+		$target=$this->getStream('test2', 'w', 0);
+		OCP\Files::streamCopy($source, $target);
 		fclose($target);
 		fclose($source);
 
-		$stream=$this->getStream('test2','r', filesize($file));
+		$stream=$this->getStream('test2', 'r', filesize($file));
 		$data=stream_get_contents($stream);
 		$original=file_get_contents($file);
 		$this->assertEqual(strlen($original), strlen($data));
-		$this->assertEqual($original,$data);
+		$this->assertEqual($original, $data);
 	}
 
 	/**
@@ -40,7 +40,7 @@ class Test_CryptStream extends UnitTestCase {
 	 * @param int size
 	 * @return resource
 	 */
-	function getStream($id,$mode,$size) {
+	function getStream($id, $mode, $size) {
 		if($id==='') {
 			$id=uniqid();
 		}
@@ -50,36 +50,36 @@ class Test_CryptStream extends UnitTestCase {
 		}else{
 			$file=$this->tmpFiles[$id];
 		}
-		$stream=fopen($file,$mode);
-		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size);
-		return fopen('crypt://streams/'.$id,$mode);
+		$stream=fopen($file, $mode);
+		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id, 'stream'=>$stream, 'size'=>$size);
+		return fopen('crypt://streams/'.$id, $mode);
 	}
 
 	function testBinary() {
 		$file=__DIR__.'/binary';
 		$source=file_get_contents($file);
 
-		$stream=$this->getStream('test','w', strlen($source));
-		fwrite($stream,$source);
+		$stream=$this->getStream('test', 'w', strlen($source));
+		fwrite($stream, $source);
 		fclose($stream);
 
-		$stream=$this->getStream('test','r', strlen($source));
+		$stream=$this->getStream('test', 'r', strlen($source));
 		$data=stream_get_contents($stream);
 		fclose($stream);
 		$this->assertEqual(strlen($data), strlen($source));
-		$this->assertEqual($source,$data);
+		$this->assertEqual($source, $data);
 
 		$file=__DIR__.'/zeros';
 		$source=file_get_contents($file);
 
-		$stream=$this->getStream('test2','w', strlen($source));
-		fwrite($stream,$source);
+		$stream=$this->getStream('test2', 'w', strlen($source));
+		fwrite($stream, $source);
 		fclose($stream);
 
-		$stream=$this->getStream('test2','r', strlen($source));
+		$stream=$this->getStream('test2', 'r', strlen($source));
 		$data=stream_get_contents($stream);
 		fclose($stream);
 		$this->assertEqual(strlen($data), strlen($source));
-		$this->assertEqual($source,$data);
+		$this->assertEqual($source, $data);
 	}
 }