From 3bc9769a7925d80181b2e75302ed7596039e6b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Thu, 4 Nov 2021 14:23:36 +0100
Subject: [PATCH] Revert "Extra fixes needed for icewind/streams update to
 0.7.2"

---
 apps/dav/lib/Connector/Sabre/File.php         |  2 +-
 apps/files_external/lib/Lib/Storage/SMB.php   |  2 +-
 lib/composer/composer/installed.json          |  6 +---
 .../Files/ObjectStore/StorageObjectStore.php  |  7 ++--
 lib/private/Files/SimpleFS/NewSimpleFile.php  |  2 +-
 lib/private/Files/Storage/Common.php          |  5 ++-
 .../Files/Storage/Wrapper/Encoding.php        | 26 +++++++-------
 lib/private/Files/Storage/Wrapper/Jail.php    | 24 ++++++-------
 lib/private/Files/Storage/Wrapper/Quota.php   |  6 ++--
 lib/private/Files/Storage/Wrapper/Wrapper.php | 28 +++++++--------
 lib/private/Files/Stream/Encryption.php       | 35 +++++--------------
 lib/private/Files/Stream/Quota.php            |  2 +-
 .../Owncloud/MoveAvatarsBackgroundJob.php     |  3 +-
 lib/public/Files/SimpleFS/ISimpleFile.php     |  2 +-
 lib/public/Files/Storage.php                  | 28 +++++++--------
 lib/public/Files/Storage/IStorage.php         | 26 +++++++-------
 16 files changed, 89 insertions(+), 115 deletions(-)

diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
index 5732a6f27bcd2..6a2bf6fe3a7d4 100644
--- a/apps/dav/lib/Connector/Sabre/File.php
+++ b/apps/dav/lib/Connector/Sabre/File.php
@@ -494,7 +494,7 @@ public function getContentType() {
 	}
 
 	/**
-	 * @return array|bool
+	 * @return array|false
 	 */
 	public function getDirectDownload() {
 		if (\OCP\App::isEnabled('encryption')) {
diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php
index 049509fa21c0c..646ba53313aca 100644
--- a/apps/files_external/lib/Lib/Storage/SMB.php
+++ b/apps/files_external/lib/Lib/Storage/SMB.php
@@ -446,7 +446,7 @@ public function hasUpdated($path, $time) {
 	/**
 	 * @param string $path
 	 * @param string $mode
-	 * @return resource|bool
+	 * @return resource|false
 	 */
 	public function fopen($path, $mode) {
 		$fullPath = $this->buildPath($path);
diff --git a/lib/composer/composer/installed.json b/lib/composer/composer/installed.json
index f20a6c47c6d4f..fe51488c7066f 100644
--- a/lib/composer/composer/installed.json
+++ b/lib/composer/composer/installed.json
@@ -1,5 +1 @@
-{
-    "packages": [],
-    "dev": false,
-    "dev-package-names": []
-}
+[]
diff --git a/lib/private/Files/ObjectStore/StorageObjectStore.php b/lib/private/Files/ObjectStore/StorageObjectStore.php
index 2076bb3f88b1f..acf46758956b8 100644
--- a/lib/private/Files/ObjectStore/StorageObjectStore.php
+++ b/lib/private/Files/ObjectStore/StorageObjectStore.php
@@ -26,7 +26,6 @@
 
 use OCP\Files\ObjectStore\IObjectStore;
 use OCP\Files\Storage\IStorage;
-use function is_resource;
 
 /**
  * Object store that wraps a storage backend, mostly for testing purposes
@@ -58,11 +57,11 @@ public function getStorageId() {
 	 */
 	public function readObject($urn) {
 		$handle = $this->storage->fopen($urn, 'r');
-		if (is_resource($handle)) {
+		if ($handle) {
 			return $handle;
+		} else {
+			throw new \Exception();
 		}
-
-		throw new \Exception();
 	}
 
 	/**
diff --git a/lib/private/Files/SimpleFS/NewSimpleFile.php b/lib/private/Files/SimpleFS/NewSimpleFile.php
index fb4346aae0fcb..b8e50941e5f6c 100644
--- a/lib/private/Files/SimpleFS/NewSimpleFile.php
+++ b/lib/private/Files/SimpleFS/NewSimpleFile.php
@@ -208,7 +208,7 @@ 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|bool
+	 * @return resource
 	 * @throws \OCP\Files\NotPermittedException
 	 * @since 14.0.0
 	 */
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index 9b1c4c65ec1ba..e9af4ffb934b0 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -631,9 +631,8 @@ public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
 				}
 			}
 
-			if ($result && $preserveMtime) {
-				$mtime = $sourceStorage->filemtime($sourceInternalPath);
-				$this->touch($targetInternalPath, is_int($mtime) ? $mtime : null);
+			if ($result and $preserveMtime) {
+				$this->touch($targetInternalPath, $sourceStorage->filemtime($sourceInternalPath));
 			}
 
 			if (!$result) {
diff --git a/lib/private/Files/Storage/Wrapper/Encoding.php b/lib/private/Files/Storage/Wrapper/Encoding.php
index d9e30816c9f0c..7ba2f06a5bcfd 100644
--- a/lib/private/Files/Storage/Wrapper/Encoding.php
+++ b/lib/private/Files/Storage/Wrapper/Encoding.php
@@ -156,7 +156,7 @@ public function rmdir($path) {
 	 * see http://php.net/manual/en/function.opendir.php
 	 *
 	 * @param string $path
-	 * @return resource|bool
+	 * @return resource
 	 */
 	public function opendir($path) {
 		return $this->storage->opendir($this->findPathToUse($path));
@@ -187,7 +187,7 @@ public function is_file($path) {
 	 * only the following keys are required in the result: size and mtime
 	 *
 	 * @param string $path
-	 * @return array|bool
+	 * @return array
 	 */
 	public function stat($path) {
 		return $this->storage->stat($this->findPathToUse($path));
@@ -197,7 +197,7 @@ public function stat($path) {
 	 * see http://php.net/manual/en/function.filetype.php
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return bool
 	 */
 	public function filetype($path) {
 		return $this->storage->filetype($this->findPathToUse($path));
@@ -208,7 +208,7 @@ public function filetype($path) {
 	 * The result for filesize when called on a folder is required to be 0
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int
 	 */
 	public function filesize($path) {
 		return $this->storage->filesize($this->findPathToUse($path));
@@ -289,7 +289,7 @@ public function file_exists($path) {
 	 * see http://php.net/manual/en/function.filemtime.php
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int
 	 */
 	public function filemtime($path) {
 		return $this->storage->filemtime($this->findPathToUse($path));
@@ -299,7 +299,7 @@ public function filemtime($path) {
 	 * see http://php.net/manual/en/function.file_get_contents.php
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function file_get_contents($path) {
 		return $this->storage->file_get_contents($this->findPathToUse($path));
@@ -358,7 +358,7 @@ public function copy($path1, $path2) {
 	 *
 	 * @param string $path
 	 * @param string $mode
-	 * @return resource|bool
+	 * @return resource
 	 */
 	public function fopen($path, $mode) {
 		$result = $this->storage->fopen($this->findPathToUse($path), $mode);
@@ -373,7 +373,7 @@ public function fopen($path, $mode) {
 	 * The mimetype for a folder is required to be "httpd/unix-directory"
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function getMimeType($path) {
 		return $this->storage->getMimeType($this->findPathToUse($path));
@@ -385,7 +385,7 @@ public function getMimeType($path) {
 	 * @param string $type
 	 * @param string $path
 	 * @param bool $raw
-	 * @return string|bool
+	 * @return string
 	 */
 	public function hash($type, $path, $raw = false) {
 		return $this->storage->hash($type, $this->findPathToUse($path), $raw);
@@ -395,7 +395,7 @@ public function hash($type, $path, $raw = false) {
 	 * see http://php.net/manual/en/function.free_space.php
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int
 	 */
 	public function free_space($path) {
 		return $this->storage->free_space($this->findPathToUse($path));
@@ -405,7 +405,7 @@ public function free_space($path) {
 	 * search for occurrences of $query in file names
 	 *
 	 * @param string $query
-	 * @return array|bool
+	 * @return array
 	 */
 	public function search($query) {
 		return $this->storage->search($query);
@@ -428,7 +428,7 @@ public function touch($path, $mtime = null) {
 	 * The local version of the file can be temporary and doesn't have to be persistent across requests
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function getLocalFile($path) {
 		return $this->storage->getLocalFile($this->findPathToUse($path));
@@ -480,7 +480,7 @@ public function getScanner($path = '', $storage = null) {
 	 * get the ETag for a file or folder
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function getETag($path) {
 		return $this->storage->getETag($this->findPathToUse($path));
diff --git a/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php
index 926e77e5ed0d3..1025497c118b2 100644
--- a/lib/private/Files/Storage/Wrapper/Jail.php
+++ b/lib/private/Files/Storage/Wrapper/Jail.php
@@ -106,7 +106,7 @@ public function rmdir($path) {
 	 * see http://php.net/manual/en/function.opendir.php
 	 *
 	 * @param string $path
-	 * @return resource|bool
+	 * @return resource
 	 */
 	public function opendir($path) {
 		return $this->getWrapperStorage()->opendir($this->getUnjailedPath($path));
@@ -137,7 +137,7 @@ public function is_file($path) {
 	 * only the following keys are required in the result: size and mtime
 	 *
 	 * @param string $path
-	 * @return array|bool
+	 * @return array
 	 */
 	public function stat($path) {
 		return $this->getWrapperStorage()->stat($this->getUnjailedPath($path));
@@ -158,7 +158,7 @@ public function filetype($path) {
 	 * The result for filesize when called on a folder is required to be 0
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int
 	 */
 	public function filesize($path) {
 		return $this->getWrapperStorage()->filesize($this->getUnjailedPath($path));
@@ -239,7 +239,7 @@ public function file_exists($path) {
 	 * see http://php.net/manual/en/function.filemtime.php
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int
 	 */
 	public function filemtime($path) {
 		return $this->getWrapperStorage()->filemtime($this->getUnjailedPath($path));
@@ -249,7 +249,7 @@ public function filemtime($path) {
 	 * see http://php.net/manual/en/function.file_get_contents.php
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function file_get_contents($path) {
 		return $this->getWrapperStorage()->file_get_contents($this->getUnjailedPath($path));
@@ -303,7 +303,7 @@ public function copy($path1, $path2) {
 	 *
 	 * @param string $path
 	 * @param string $mode
-	 * @return resource|bool
+	 * @return resource
 	 */
 	public function fopen($path, $mode) {
 		return $this->getWrapperStorage()->fopen($this->getUnjailedPath($path), $mode);
@@ -314,7 +314,7 @@ public function fopen($path, $mode) {
 	 * The mimetype for a folder is required to be "httpd/unix-directory"
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function getMimeType($path) {
 		return $this->getWrapperStorage()->getMimeType($this->getUnjailedPath($path));
@@ -326,7 +326,7 @@ public function getMimeType($path) {
 	 * @param string $type
 	 * @param string $path
 	 * @param bool $raw
-	 * @return string|bool
+	 * @return string
 	 */
 	public function hash($type, $path, $raw = false) {
 		return $this->getWrapperStorage()->hash($type, $this->getUnjailedPath($path), $raw);
@@ -336,7 +336,7 @@ public function hash($type, $path, $raw = false) {
 	 * see http://php.net/manual/en/function.free_space.php
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int
 	 */
 	public function free_space($path) {
 		return $this->getWrapperStorage()->free_space($this->getUnjailedPath($path));
@@ -346,7 +346,7 @@ public function free_space($path) {
 	 * search for occurrences of $query in file names
 	 *
 	 * @param string $query
-	 * @return array|bool
+	 * @return array
 	 */
 	public function search($query) {
 		return $this->getWrapperStorage()->search($query);
@@ -369,7 +369,7 @@ public function touch($path, $mtime = null) {
 	 * The local version of the file can be temporary and doesn't have to be persistent across requests
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function getLocalFile($path) {
 		return $this->getWrapperStorage()->getLocalFile($this->getUnjailedPath($path));
@@ -432,7 +432,7 @@ public function getWatcher($path = '', $storage = null) {
 	 * get the ETag for a file or folder
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function getETag($path) {
 		return $this->getWrapperStorage()->getETag($this->getUnjailedPath($path));
diff --git a/lib/private/Files/Storage/Wrapper/Quota.php b/lib/private/Files/Storage/Wrapper/Quota.php
index c7adec1954059..406f0fd464927 100644
--- a/lib/private/Files/Storage/Wrapper/Quota.php
+++ b/lib/private/Files/Storage/Wrapper/Quota.php
@@ -94,7 +94,7 @@ protected function getSize($path, $storage = null) {
 	 * Get free space as limited by the quota
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int
 	 */
 	public function free_space($path) {
 		if ($this->quota < 0 || strpos($path, 'cache') === 0 || strpos($path, 'uploads') === 0) {
@@ -154,7 +154,7 @@ public function copy($source, $target) {
 	 *
 	 * @param string $path
 	 * @param string $mode
-	 * @return resource|bool
+	 * @return resource
 	 */
 	public function fopen($path, $mode) {
 		$source = $this->storage->fopen($path, $mode);
@@ -162,7 +162,7 @@ public function fopen($path, $mode) {
 		// don't apply quota for part files
 		if (!$this->isPartFile($path)) {
 			$free = $this->free_space($path);
-			if ($source && is_int($free) && $free >= 0 && $mode !== 'r' && $mode !== 'rb') {
+			if ($source && $free >= 0 && $mode !== 'r' && $mode !== 'rb') {
 				// only apply quota for files, not metadata, trash or others
 				if ($this->shouldApplyQuota($path)) {
 					return \OC\Files\Stream\Quota::wrap($source, $free);
diff --git a/lib/private/Files/Storage/Wrapper/Wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php
index 61e10262f8b71..b88931a1c35ef 100644
--- a/lib/private/Files/Storage/Wrapper/Wrapper.php
+++ b/lib/private/Files/Storage/Wrapper/Wrapper.php
@@ -97,7 +97,7 @@ public function rmdir($path) {
 	 * see http://php.net/manual/en/function.opendir.php
 	 *
 	 * @param string $path
-	 * @return resource|bool
+	 * @return resource
 	 */
 	public function opendir($path) {
 		return $this->getWrapperStorage()->opendir($path);
@@ -128,7 +128,7 @@ public function is_file($path) {
 	 * only the following keys are required in the result: size and mtime
 	 *
 	 * @param string $path
-	 * @return array|bool
+	 * @return array
 	 */
 	public function stat($path) {
 		return $this->getWrapperStorage()->stat($path);
@@ -138,7 +138,7 @@ public function stat($path) {
 	 * see http://php.net/manual/en/function.filetype.php
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return bool
 	 */
 	public function filetype($path) {
 		return $this->getWrapperStorage()->filetype($path);
@@ -149,7 +149,7 @@ public function filetype($path) {
 	 * The result for filesize when called on a folder is required to be 0
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int
 	 */
 	public function filesize($path) {
 		return $this->getWrapperStorage()->filesize($path);
@@ -230,7 +230,7 @@ public function file_exists($path) {
 	 * see http://php.net/manual/en/function.filemtime.php
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int
 	 */
 	public function filemtime($path) {
 		return $this->getWrapperStorage()->filemtime($path);
@@ -240,7 +240,7 @@ public function filemtime($path) {
 	 * see http://php.net/manual/en/function.file_get_contents.php
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function file_get_contents($path) {
 		return $this->getWrapperStorage()->file_get_contents($path);
@@ -294,7 +294,7 @@ public function copy($path1, $path2) {
 	 *
 	 * @param string $path
 	 * @param string $mode
-	 * @return resource|bool
+	 * @return resource
 	 */
 	public function fopen($path, $mode) {
 		return $this->getWrapperStorage()->fopen($path, $mode);
@@ -305,7 +305,7 @@ public function fopen($path, $mode) {
 	 * The mimetype for a folder is required to be "httpd/unix-directory"
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function getMimeType($path) {
 		return $this->getWrapperStorage()->getMimeType($path);
@@ -317,7 +317,7 @@ public function getMimeType($path) {
 	 * @param string $type
 	 * @param string $path
 	 * @param bool $raw
-	 * @return string|bool
+	 * @return string
 	 */
 	public function hash($type, $path, $raw = false) {
 		return $this->getWrapperStorage()->hash($type, $path, $raw);
@@ -327,7 +327,7 @@ public function hash($type, $path, $raw = false) {
 	 * see http://php.net/manual/en/function.free_space.php
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int
 	 */
 	public function free_space($path) {
 		return $this->getWrapperStorage()->free_space($path);
@@ -337,7 +337,7 @@ public function free_space($path) {
 	 * search for occurrences of $query in file names
 	 *
 	 * @param string $query
-	 * @return array|bool
+	 * @return array
 	 */
 	public function search($query) {
 		return $this->getWrapperStorage()->search($query);
@@ -360,7 +360,7 @@ public function touch($path, $mtime = null) {
 	 * The local version of the file can be temporary and doesn't have to be persistent across requests
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function getLocalFile($path) {
 		return $this->getWrapperStorage()->getLocalFile($path);
@@ -458,7 +458,7 @@ public function getStorageCache() {
 	 * get the ETag for a file or folder
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string
 	 */
 	public function getETag($path) {
 		return $this->getWrapperStorage()->getETag($path);
@@ -513,7 +513,7 @@ public function __call($method, $args) {
 	 * For now the returned array can hold the parameter url - in future more attributes might follow.
 	 *
 	 * @param string $path
-	 * @return array|bool
+	 * @return array
 	 */
 	public function getDirectDownload($path) {
 		return $this->getWrapperStorage()->getDirectDownload($path);
diff --git a/lib/private/Files/Stream/Encryption.php b/lib/private/Files/Stream/Encryption.php
index 2708ea6a7c324..3fade4d656bd2 100644
--- a/lib/private/Files/Stream/Encryption.php
+++ b/lib/private/Files/Stream/Encryption.php
@@ -34,8 +34,6 @@
 
 use Icewind\Streams\Wrapper;
 use OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException;
-use function is_array;
-use function stream_context_create;
 
 class Encryption extends Wrapper {
 
@@ -192,22 +190,17 @@ public static function wrap($source, $internalPath, $fullPath, array $header,
 	/**
 	 * add stream wrapper
 	 *
-	 * @param resource|int $source
-	 * @param resource|array $context
-	 * @param string|null $protocol
-	 * @param string|null $class
+	 * @param resource $source
 	 * @param string $mode
+	 * @param resource $context
+	 * @param string $protocol
+	 * @param string $class
 	 * @return resource
 	 * @throws \BadMethodCallException
 	 */
-	protected static function wrapSource($source, $context = [], $protocol = null, $class = null, $mode = 'r+') {
+	protected static function wrapSource($source, $context, $protocol, $class, $mode = 'r+') {
 		try {
-			if ($protocol === null) {
-				$protocol = self::getProtocol($class);
-			}
-
 			stream_wrapper_register($protocol, $class);
-			$context = self::buildContext($protocol, $context, $source);
 			if (self::isDirectoryHandle($source)) {
 				$wrapped = opendir($protocol . '://', $context);
 			} else {
@@ -221,26 +214,14 @@ protected static function wrapSource($source, $context = [], $protocol = null, $
 		return $wrapped;
 	}
 
-	/**
-	 * @todo this is a copy of \Icewind\Streams\WrapperHandler::buildContext -> combine to one shared method?
-	 */
-	private static function buildContext($protocol, $context, $source) {
-		if (is_array($context)) {
-			$context['source'] = $source;
-			return stream_context_create([$protocol => $context]);
-		}
-
-		return $context;
-	}
-
 	/**
 	 * Load the source from the stream context and return the context options
 	 *
-	 * @param string|null $name
+	 * @param string $name
 	 * @return array
 	 * @throws \BadMethodCallException
 	 */
-	protected function loadContext($name = null) {
+	protected function loadContext($name) {
 		$context = parent::loadContext($name);
 
 		foreach ($this->expectedContextProperties as $property) {
@@ -333,7 +314,7 @@ public function stream_read($count) {
 		}
 		return $result;
 	}
-
+	
 	/**
 	 * stream_read_block
 	 *
diff --git a/lib/private/Files/Stream/Quota.php b/lib/private/Files/Stream/Quota.php
index 483871c06dfed..3bf46264b837d 100644
--- a/lib/private/Files/Stream/Quota.php
+++ b/lib/private/Files/Stream/Quota.php
@@ -42,7 +42,7 @@ class Quota extends Wrapper {
 	/**
 	 * @param resource $stream
 	 * @param int $limit
-	 * @return bool|resource
+	 * @return resource
 	 */
 	public static function wrap($stream, $limit) {
 		$context = stream_context_create([
diff --git a/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php b/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php
index 458812bcc7307..ec076d116c53d 100644
--- a/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php
+++ b/lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php
@@ -32,7 +32,6 @@
 use OCP\IUser;
 use OCP\IUserManager;
 use Psr\Log\LoggerInterface;
-use function is_resource;
 
 class MoveAvatarsBackgroundJob extends QueuedJob {
 
@@ -79,7 +78,7 @@ private function moveAvatars(): void {
 			try {
 				$avatarPath = $path . '/avatar.' . $this->getExtension($path);
 				$resource = $this->owncloudAvatarStorage->fopen($avatarPath, 'r');
-				if (is_resource($resource)) {
+				if ($resource) {
 					$avatar->set($resource);
 					fclose($resource);
 				} else {
diff --git a/lib/public/Files/SimpleFS/ISimpleFile.php b/lib/public/Files/SimpleFS/ISimpleFile.php
index ad39460c4bfe8..06039d5397db5 100644
--- a/lib/public/Files/SimpleFS/ISimpleFile.php
+++ b/lib/public/Files/SimpleFS/ISimpleFile.php
@@ -114,7 +114,7 @@ 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|bool
+	 * @return resource
 	 * @throws \OCP\Files\NotPermittedException
 	 * @since 14.0.0
 	 */
diff --git a/lib/public/Files/Storage.php b/lib/public/Files/Storage.php
index 9438dedfb13d6..d642512641d35 100644
--- a/lib/public/Files/Storage.php
+++ b/lib/public/Files/Storage.php
@@ -92,7 +92,7 @@ public function rmdir($path);
 	 * see http://php.net/manual/en/function.opendir.php
 	 *
 	 * @param string $path
-	 * @return resource|bool
+	 * @return resource|false
 	 * @since 6.0.0
 	 */
 	public function opendir($path);
@@ -120,7 +120,7 @@ public function is_file($path);
 	 * only the following keys are required in the result: size and mtime
 	 *
 	 * @param string $path
-	 * @return array|bool
+	 * @return array|false
 	 * @since 6.0.0
 	 */
 	public function stat($path);
@@ -129,7 +129,7 @@ public function stat($path);
 	 * see http://php.net/manual/en/function.filetype.php
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 6.0.0
 	 */
 	public function filetype($path);
@@ -139,7 +139,7 @@ public function filetype($path);
 	 * The result for filesize when called on a folder is required to be 0
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int|false
 	 * @since 6.0.0
 	 */
 	public function filesize($path);
@@ -212,7 +212,7 @@ public function file_exists($path);
 	 * see http://php.net/manual/en/function.filemtime.php
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int|false
 	 * @since 6.0.0
 	 */
 	public function filemtime($path);
@@ -221,7 +221,7 @@ public function filemtime($path);
 	 * see http://php.net/manual/en/function.file_get_contents.php
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 6.0.0
 	 */
 	public function file_get_contents($path);
@@ -270,7 +270,7 @@ public function copy($path1, $path2);
 	 *
 	 * @param string $path
 	 * @param string $mode
-	 * @return resource|bool
+	 * @return resource|false
 	 * @since 6.0.0
 	 */
 	public function fopen($path, $mode);
@@ -280,7 +280,7 @@ public function fopen($path, $mode);
 	 * The mimetype for a folder is required to be "httpd/unix-directory"
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 6.0.0
 	 */
 	public function getMimeType($path);
@@ -291,7 +291,7 @@ public function getMimeType($path);
 	 * @param string $type
 	 * @param string $path
 	 * @param bool $raw
-	 * @return string|bool
+	 * @return string|false
 	 * @since 6.0.0
 	 */
 	public function hash($type, $path, $raw = false);
@@ -300,7 +300,7 @@ public function hash($type, $path, $raw = false);
 	 * see http://php.net/manual/en/function.free_space.php
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int|false
 	 * @since 6.0.0
 	 */
 	public function free_space($path);
@@ -309,7 +309,7 @@ public function free_space($path);
 	 * search for occurrences of $query in file names
 	 *
 	 * @param string $query
-	 * @return array|bool
+	 * @return array|false
 	 * @since 6.0.0
 	 */
 	public function search($query);
@@ -330,7 +330,7 @@ public function touch($path, $mtime = null);
 	 * The local version of the file can be temporary and doesn't have to be persistent across requests
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 6.0.0
 	 */
 	public function getLocalFile($path);
@@ -352,7 +352,7 @@ public function hasUpdated($path, $time);
 	 * get the ETag for a file or folder
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 6.0.0
 	 */
 	public function getETag($path);
@@ -384,7 +384,7 @@ public function instanceOfStorage($class);
 	 * For now the returned array can hold the parameter url - in future more attributes might follow.
 	 *
 	 * @param string $path
-	 * @return array|bool
+	 * @return array|false
 	 * @since 8.0.0
 	 */
 	public function getDirectDownload($path);
diff --git a/lib/public/Files/Storage/IStorage.php b/lib/public/Files/Storage/IStorage.php
index c1a466185ee43..f5073d1ad7362 100644
--- a/lib/public/Files/Storage/IStorage.php
+++ b/lib/public/Files/Storage/IStorage.php
@@ -88,7 +88,7 @@ public function rmdir($path);
 	 * see http://php.net/manual/en/function.opendir.php
 	 *
 	 * @param string $path
-	 * @return resource|bool
+	 * @return resource|false
 	 * @since 9.0.0
 	 */
 	public function opendir($path);
@@ -116,7 +116,7 @@ public function is_file($path);
 	 * only the following keys are required in the result: size and mtime
 	 *
 	 * @param string $path
-	 * @return array|bool
+	 * @return array|false
 	 * @since 9.0.0
 	 */
 	public function stat($path);
@@ -125,7 +125,7 @@ public function stat($path);
 	 * see http://php.net/manual/en/function.filetype.php
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 9.0.0
 	 */
 	public function filetype($path);
@@ -135,7 +135,7 @@ public function filetype($path);
 	 * The result for filesize when called on a folder is required to be 0
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int|false
 	 * @since 9.0.0
 	 */
 	public function filesize($path);
@@ -208,7 +208,7 @@ public function file_exists($path);
 	 * see http://php.net/manual/en/function.filemtime.php
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int|false
 	 * @since 9.0.0
 	 */
 	public function filemtime($path);
@@ -217,7 +217,7 @@ public function filemtime($path);
 	 * see http://php.net/manual/en/function.file_get_contents.php
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 9.0.0
 	 */
 	public function file_get_contents($path);
@@ -266,7 +266,7 @@ public function copy($path1, $path2);
 	 *
 	 * @param string $path
 	 * @param string $mode
-	 * @return resource|bool
+	 * @return resource|false
 	 * @since 9.0.0
 	 */
 	public function fopen($path, $mode);
@@ -276,7 +276,7 @@ public function fopen($path, $mode);
 	 * The mimetype for a folder is required to be "httpd/unix-directory"
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 9.0.0
 	 */
 	public function getMimeType($path);
@@ -287,7 +287,7 @@ public function getMimeType($path);
 	 * @param string $type
 	 * @param string $path
 	 * @param bool $raw
-	 * @return string|bool
+	 * @return string|false
 	 * @since 9.0.0
 	 */
 	public function hash($type, $path, $raw = false);
@@ -296,7 +296,7 @@ public function hash($type, $path, $raw = false);
 	 * see http://php.net/manual/en/function.free_space.php
 	 *
 	 * @param string $path
-	 * @return int|bool
+	 * @return int|false
 	 * @since 9.0.0
 	 */
 	public function free_space($path);
@@ -317,7 +317,7 @@ public function touch($path, $mtime = null);
 	 * The local version of the file can be temporary and doesn't have to be persistent across requests
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 9.0.0
 	 */
 	public function getLocalFile($path);
@@ -339,7 +339,7 @@ public function hasUpdated($path, $time);
 	 * get the ETag for a file or folder
 	 *
 	 * @param string $path
-	 * @return string|bool
+	 * @return string|false
 	 * @since 9.0.0
 	 */
 	public function getETag($path);
@@ -371,7 +371,7 @@ public function instanceOfStorage($class);
 	 * For now the returned array can hold the parameter url - in future more attributes might follow.
 	 *
 	 * @param string $path
-	 * @return array|bool
+	 * @return array|false
 	 * @since 9.0.0
 	 */
 	public function getDirectDownload($path);