From: Björn Schießle Date: Wed, 22 Apr 2015 09:32:21 +0000 (+0200) Subject: Merge pull request #15757 from owncloud/enc-fixfeofforlastblock X-Git-Tag: v8.1.0alpha2~6 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=570718fb6bbad4dfd721b1ef451580749e9e0bdd;p=nextcloud-server.git Merge pull request #15757 from owncloud/enc-fixfeofforlastblock Fix encryption feof to not return too early --- 570718fb6bbad4dfd721b1ef451580749e9e0bdd diff --cc tests/lib/files/stream/encryption.php index 4d932abfa39,ae67d9a9026..25e7e54335e --- a/tests/lib/files/stream/encryption.php +++ b/tests/lib/files/stream/encryption.php @@@ -8,13 -8,11 +8,13 @@@ use OCA\Encryption_Dummy\DummyModule class Encryption extends \Test\TestCase { /** + * @param string $fileName * @param string $mode - * @param integer $limit + * @param integer $unencryptedSize + * @return resource */ protected function getStream($fileName, $mode, $unencryptedSize) { - + clearstatcache(); $size = filesize($fileName); $source = fopen($fileName, $mode); $internalPath = $fileName;