mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22289 from nextcloud/techdebt/noid/fix-encryption-stream-invalid-scalar-arguments 

Cast float to int to avoid invalid scalar argument warning
This commit is contained in:
Morris Jobke 2020-08-19 22:08:15 +02:00 committed by GitHub
parent d3a53d6f39 560ccf5d83
commit d8bdb439a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/psalm-baseline.xml
View File

@ -4849,11 +4849,6 @@
</InvalidReturnType>
</file>
<file src="lib/private/Files/Stream/Encryption.php">
<InvalidScalarArgument occurrences="3">
<code>$newFilePosition</code>
<code>$newFilePosition</code>
<code>$position</code>
</InvalidScalarArgument>
<UndefinedInterfaceMethod occurrences="1">
<code>$cacheEntry</code>
</UndefinedInterfaceMethod>

2
lib/private/Files/Stream/Encryption.php
View File

@ -416,7 +416,7 @@ class Encryption extends Wrapper {
return $return;
}
$newFilePosition = floor($newPosition / $this->unencryptedBlockSize)
$newFilePosition = (int)floor($newPosition / $this->unencryptedBlockSize)
* $this->util->getBlockSize() + $this->headerSize;
$oldFilePosition = parent::stream_tell();