[Pkg-owncloud-commits] [owncloud] 102/122: Fix missing types on doc block and deduplicate the method name

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit aea734aaf15d38f8b1f819fc2f693ec24236cad3
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Wed May 6 12:14:18 2015 +0200

    Fix missing types on doc block and deduplicate the method name
---
 lib/private/files/storage/wrapper/encryption.php | 8 ++++----
 tests/lib/files/storage/wrapper/encryption.php   | 2 +-
 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 c2a29bd..c0c4c69 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 bc803f5..d4492e0 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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git