Merge pull request #29416 from nextcloud/backport/27440/stable21

[stable21] Handle files with `is_file` instead of `file_exists`
nextcloud · Oct 29, 2021 · e250aef · e250aef
2 parents 81b3e65 + 8610099
commit e250aef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php
@@ -391,7 +391,7 @@ public function fopen($path, $mode) {
 		if ($this->util->isExcluded($fullPath) === false) {
 			$size = $unencryptedSize = 0;
 			$realFile = $this->util->stripPartialFileExtension($path);
-			$targetExists = $this->file_exists($realFile) || $this->file_exists($path);
+			$targetExists = $this->is_file($realFile) || $this->file_exists($path);
 			$targetIsEncrypted = false;
 			if ($targetExists) {
 				// in case the file exists we require the explicit module as
@@ -855,7 +855,7 @@ protected function getFullPath($path) {
 	 */
 	protected function readFirstBlock($path) {
 		$firstBlock = '';
-		if ($this->storage->file_exists($path)) {
+		if ($this->storage->is_file($path)) {
 			$handle = $this->storage->fopen($path, 'r');
 			$firstBlock = fread($handle, $this->util->getHeaderSize());
 			fclose($handle);
@@ -872,7 +872,7 @@ protected function readFirstBlock($path) {
 	protected function getHeaderSize($path) {
 		$headerSize = 0;
 		$realFile = $this->util->stripPartialFileExtension($path);
-		if ($this->storage->file_exists($realFile)) {
+		if ($this->storage->is_file($realFile)) {
 			$path = $realFile;
 		}
 		$firstBlock = $this->readFirstBlock($path);
@@ -920,7 +920,7 @@ protected function parseRawHeader($rawHeader) {
 	 */
 	protected function getHeader($path) {
 		$realFile = $this->util->stripPartialFileExtension($path);
-		$exists = $this->storage->file_exists($realFile);
+		$exists = $this->storage->is_file($realFile);
 		if ($exists) {
 			$path = $realFile;
 		}

diff --git a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php b/tests/lib/Files/Storage/Wrapper/EncryptionTest.php
@@ -624,7 +624,7 @@ public function testGetHeader($path, $strippedPathExists, $strippedPath) {
 		$util->expects($this->once())->method('stripPartialFileExtension')
 			->with($path)->willReturn($strippedPath);
 		$sourceStorage->expects($this->once())
-			->method('file_exists')
+			->method('is_file')
 			->with($strippedPath)
 			->willReturn($strippedPathExists);
 
@@ -652,7 +652,7 @@ public function testGetHeaderAddLegacyModule($header, $isEncrypted, $exists, $ex
 			->disableOriginalConstructor()->getMock();
 
 		$sourceStorage->expects($this->once())
-			->method('file_exists')
+			->method('is_file')
 			->willReturn($exists);
 
 		$util = $this->getMockBuilder('\OC\Encryption\Util')