allow writing content directly when creating new SimpleFile

Signed-off-by: Robin Appelman <robin@icewind.nl>

2 files changed, 9 insertions, 4 deletions

diff --git a/lib/private/Files/SimpleFS/NewSimpleFile.php b/lib/private/Files/SimpleFS/NewSimpleFile.php
index 02dde1d2f88..2c74a16fa92 100644
--- a/lib/private/Files/SimpleFS/NewSimpleFile.php
+++ b/lib/private/Files/SimpleFS/NewSimpleFile.php
@@ -123,7 +123,7 @@ class NewSimpleFile implements ISimpleFile {
 	public function putContent($data) {
 		try {
 			if ($this->file) {
-				return $this->file->putContent($data);
+				$this->file->putContent($data);
 			} else {
 				$this->file = $this->parentFolder->newFile($this->name, $data);
 			}
diff --git a/lib/private/Files/SimpleFS/SimpleFolder.php b/lib/private/Files/SimpleFS/SimpleFolder.php
index 76f6a198e25..a4ebc6b4e53 100644
--- a/lib/private/Files/SimpleFS/SimpleFolder.php
+++ b/lib/private/Files/SimpleFS/SimpleFolder.php
@@ -80,8 +80,13 @@ class SimpleFolder implements ISimpleFolder   {
 		return new SimpleFile($file);
 	}
 
-	public function newFile($name) {
-		// delay creating the file until it's written to
-		return new NewSimpleFile($this->folder, $name);
+	public function newFile($name, $content = null) {
+		if ($content === null) {
+			// delay creating the file until it's written to
+			return new NewSimpleFile($this->folder, $name);
+		} else {
+			$file = $this->folder->newFile($name, $content);
+			return new SimpleFile($file);
+		}
 	}
 }