Merge pull request #24594 from kofemann/dcache

Author: juliusknorr

lib/private/Files/ObjectStore/ObjectStoreStorage.php

@@ -439,9 +439,9 @@ public function needsPartFile() {
 
 	public function file_put_contents($path, $data) {
 		$handle = $this->fopen($path, 'w+');
-		fwrite($handle, $data);
+		$result = fwrite($handle, $data);
 		fclose($handle);
-		return true;
+		return $result;
 	}
 
 	public function writeStream(string $path, $stream, int $size = null): int {

lib/private/Files/Storage/DAV.php

@@ -486,8 +486,8 @@ public function touch($path, $mtime = null) {
 
 	/**
 	 * @param string $path
-	 * @param string $data
-	 * @return int
+	 * @param mixed $data
+	 * @return int|false
 	 */
 	public function file_put_contents($path, $data) {
 		$path = $this->cleanPath($path);

lib/private/Files/Storage/Flysystem.php

@@ -73,7 +73,11 @@ public function file_get_contents($path) {
 	 * {@inheritdoc}
 	 */
 	public function file_put_contents($path, $data) {
-		return $this->flysystem->put($this->buildPath($path), $data);
+		$result = $this->flysystem->put($this->buildPath($path), $data);
+		if ($result === true) {
+			return strlen($data);
+		}
+		return $result;
 	}
 
 	/**

lib/private/Files/Storage/Local.php

@@ -557,7 +557,7 @@ public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
 	}
 
 	public function writeStream(string $path, $stream, int $size = null): int {
-		$result = file_put_contents($this->getSourcePath($path), $stream);
+		$result = $this->file_put_contents($path, $stream);
 		if ($result === false) {
 			throw new GenericFileException("Failed write steam to $path");
 		} else {

lib/private/Files/Storage/Wrapper/Encoding.php

@@ -309,8 +309,8 @@ public function file_get_contents($path) {
 	 * see http://php.net/manual/en/function.file_put_contents.php
 	 *
 	 * @param string $path
-	 * @param string $data
-	 * @return bool
+	 * @param mixed $data
+	 * @return int|false
 	 */
 	public function file_put_contents($path, $data) {
 		return $this->storage->file_put_contents($this->findPathToUse($path), $data);

lib/private/Files/Storage/Wrapper/Encryption.php

@@ -234,8 +234,8 @@ public function file_get_contents($path) {
 	 * see http://php.net/manual/en/function.file_put_contents.php
 	 *
 	 * @param string $path
-	 * @param string $data
-	 * @return bool
+	 * @param mixed $data
+	 * @return int|false
 	 */
 	public function file_put_contents($path, $data) {
 		// file put content will always be translated to a stream write

lib/private/Files/Storage/Wrapper/Jail.php

@@ -259,8 +259,8 @@ public function file_get_contents($path) {
 	 * see http://php.net/manual/en/function.file_put_contents.php
 	 *
 	 * @param string $path
-	 * @param string $data
-	 * @return bool
+	 * @param mixed $data
+	 * @return int|false
 	 */
 	public function file_put_contents($path, $data) {
 		return $this->getWrapperStorage()->file_put_contents($this->getUnjailedPath($path), $data);

lib/private/Files/Storage/Wrapper/Quota.php

@@ -122,8 +122,8 @@ public function free_space($path) {
 	 * see http://php.net/manual/en/function.file_put_contents.php
 	 *
 	 * @param string $path
-	 * @param string $data
-	 * @return bool
+	 * @param mixed $data
+	 * @return int|false
 	 */
 	public function file_put_contents($path, $data) {
 		$free = $this->free_space($path);

lib/private/Files/Storage/Wrapper/Wrapper.php

@@ -250,8 +250,8 @@ public function file_get_contents($path) {
 	 * see http://php.net/manual/en/function.file_put_contents.php
 	 *
 	 * @param string $path
-	 * @param string $data
-	 * @return bool
+	 * @param mixed $data
+	 * @return int|false
 	 */
 	public function file_put_contents($path, $data) {
 		return $this->getWrapperStorage()->file_put_contents($path, $data);

lib/public/Files/Storage.php

@@ -230,8 +230,8 @@ public function file_get_contents($path);
 	 * see http://php.net/manual/en/function.file_put_contents.php
 	 *
 	 * @param string $path
-	 * @param string $data
-	 * @return bool
+	 * @param mixed $data
+	 * @return int|false
 	 * @since 6.0.0
 	 */
 	public function file_put_contents($path, $data);