diff --git a/lib/private/Files/SimpleFS/SimpleFile.php b/lib/private/Files/SimpleFS/SimpleFile.php index 52b7819694..7b83e9372f 100644 --- a/lib/private/Files/SimpleFS/SimpleFile.php +++ b/lib/private/Files/SimpleFS/SimpleFile.php @@ -148,13 +148,25 @@ class SimpleFile implements ISimpleFile { } /** - * Open the file as stream, resulting resource can be operated as stream like the result from php's own fopen + * Open the file as stream for reading, resulting resource can be operated as stream like the result from php's own fopen * * @return resource * @throws \OCP\Files\NotPermittedException * @since 14.0.0 */ - public function fopen(string $mode) { - return $this->file->fopen($mode); + public function read() { + return $this->file->fopen('r'); } + + /** + * Open the file as stream for writing, resulting resource can be operated as stream like the result from php's own fopen + * + * @return resource + * @throws \OCP\Files\NotPermittedException + * @since 14.0.0 + */ + public function write() { + return $this->file->fopen('w'); + } + } diff --git a/lib/public/Files/SimpleFS/ISimpleFile.php b/lib/public/Files/SimpleFS/ISimpleFile.php index c417db6354..a3cd3245cc 100644 --- a/lib/public/Files/SimpleFS/ISimpleFile.php +++ b/lib/public/Files/SimpleFS/ISimpleFile.php @@ -101,11 +101,20 @@ interface ISimpleFile { public function getMimeType(); /** - * Open the file as stream, resulting resource can be operated as stream like the result from php's own fopen + * Open the file as stream for reading, resulting resource can be operated as stream like the result from php's own fopen * * @return resource * @throws \OCP\Files\NotPermittedException * @since 14.0.0 */ - public function fopen(string $mode); + public function read(); + + /** + * Open the file as stream for writing, resulting resource can be operated as stream like the result from php's own fopen + * + * @return resource + * @throws \OCP\Files\NotPermittedException + * @since 14.0.0 + */ + public function write(); } diff --git a/tests/lib/Files/SimpleFS/SimpleFileTest.php b/tests/lib/Files/SimpleFS/SimpleFileTest.php index aec5052cb4..c1c53b15ec 100644 --- a/tests/lib/Files/SimpleFS/SimpleFileTest.php +++ b/tests/lib/Files/SimpleFS/SimpleFileTest.php @@ -124,11 +124,19 @@ class SimpleFileTest extends \Test\TestCase { $this->simpleFile->getContent(); } - public function testFopen() { + public function testRead() { $this->file->expects($this->once()) ->method('fopen') - ->with('r+'); + ->with('r'); - $this->simpleFile->fopen('r+'); + $this->simpleFile->read(); + } + + public function testWrite() { + $this->file->expects($this->once()) + ->method('fopen') + ->with('w'); + + $this->simpleFile->write(); } }