From: Andreas Fischer <bantu@owncloud.com>
Date: Fri, 9 Jan 2015 16:01:17 +0000 (+0100)
Subject: HHVM Workaround: Do not use Exception from Stream.
X-Git-Tag: v8.0.0alpha2~12^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df849bb69a38617a038710afc8b63101202a1701;p=nextcloud-server.git

HHVM Workaround: Do not use Exception from Stream.

Works around https://github.com/facebook/hhvm/issues/2436#issuecomment-69351373
---

diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index 9a3b6bc9266..2a8c8676c16 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -48,20 +48,13 @@ class Test_StreamWrappers extends \Test\TestCase {
 		//test callback
 		$tmpFile = OC_Helper::TmpFile('.txt');
 		$file = 'close://' . $tmpFile;
-		\OC\Files\Stream\Close::registerCallback($tmpFile, array('Test_StreamWrappers', 'closeCallBack'));
+		$actual = false;
+		$callback = function($path) use (&$actual) { $actual = $path; };
+		\OC\Files\Stream\Close::registerCallback($tmpFile, $callback);
 		$fh = fopen($file, 'w');
 		fwrite($fh, 'asd');
-		try {
-			fclose($fh);
-			$this->fail('Expected exception');
-		} catch (Exception $e) {
-			$path = $e->getMessage();
-			$this->assertEquals($path, $tmpFile);
-		}
-	}
-
-	public static function closeCallBack($path) {
-		throw new Exception($path);
+		fclose($fh);
+		$this->assertSame($tmpFile, $actual);
 	}
 
 	public function testOC() {