[Pkg-owncloud-commits] [owncloud] 35/457: Add missing import for the exception

[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 30d165ebf228f0803183bc772a988a4958356047
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Mon May 18 13:40:23 2015 +0200

    Add missing import for the exception
---
 apps/encryption/lib/crypto/encryption.php           | 2 ++
 apps/encryption/tests/lib/crypto/encryptionTest.php | 1 +
 2 files changed, 3 insertions(+)

diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 83ed1b5..df3f9a0 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -25,6 +25,7 @@
 namespace OCA\Encryption\Crypto;
 
 
+use OC\Encryption\Exceptions\DecryptionFailedException;
 use OCA\Encryption\Exceptions\PublicKeyMissingException;
 use OCA\Encryption\Util;
 use OCP\Encryption\IEncryptionModule;
@@ -274,6 +275,7 @@ class Encryption implements IEncryptionModule {
 	 *
 	 * @param string $data you want to decrypt
 	 * @return mixed decrypted data
+	 * @throws DecryptionFailedException
 	 */
 	public function decrypt($data) {
 		if (empty($this->fileKey)) {
diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php
index 509cd9db..d33aff8 100644
--- a/apps/encryption/tests/lib/crypto/encryptionTest.php
+++ b/apps/encryption/tests/lib/crypto/encryptionTest.php
@@ -231,6 +231,7 @@ class EncryptionTest extends TestCase {
 		);
 	}
 
+	/**
 	 * by default the encryption module should encrypt regular files, files in
 	 * files_versions and files in files_trashbin
 	 *

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