summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2015-05-06 12:14:18 +0200
committerJoas Schilling <nickvergessen@owncloud.com>2015-05-06 14:31:10 +0200
commitaea734aaf15d38f8b1f819fc2f693ec24236cad3 (patch)
treed0d6537745cc36dc5587b851c6fd14d8cb84c76a
parente4829a23585069aaed7260ad69c041c1848b0342 (diff)
downloadnextcloud-server-aea734aaf15d38f8b1f819fc2f693ec24236cad3.tar.gz
nextcloud-server-aea734aaf15d38f8b1f819fc2f693ec24236cad3.zip
Fix missing types on doc block and deduplicate the method name
-rw-r--r--lib/private/files/storage/wrapper/encryption.php8
-rw-r--r--tests/lib/files/storage/wrapper/encryption.php2
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index c2a29bdb0ce..c0c4c6979c2 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -413,10 +413,10 @@ class Encryption extends Wrapper {
* copy file between two storages
*
* @param \OCP\Files\Storage $sourceStorage
- * @param $sourceInternalPath
- * @param $targetInternalPath
- * @param $preserveMtime
- * @param $isRename
+ * @param string $sourceInternalPath
+ * @param string $targetInternalPath
+ * @param bool $preserveMtime
+ * @param bool $isRename
* @return bool
*/
private function copyBetweenStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime, $isRename) {
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index bc803f5f875..d4492e00928 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -199,7 +199,7 @@ class Encryption extends \Test\Files\Storage\Storage {
* @param boolean $copyKeysReturn
* @param boolean $shouldUpdate
*/
- public function testCopy($source,
+ public function testCopyEncryption($source,
$target,
$encryptionEnabled,
$copyKeysReturn,