summaryrefslogtreecommitdiffstats
path: root/lib/public
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-04-09 19:23:27 +0200
committerLukas Reschke <lukas@owncloud.com>2015-04-09 19:23:27 +0200
commit0bad8f644af1ca5b287d391cb7efdb392901b632 (patch)
tree0b116bdd30ec0bb7113f98f41c6a7d6f81118a3c /lib/public
parentde4a81f4623cf86fd77f56d8f9820742c52bd7e1 (diff)
parent06a5a9d0c21a6fa4df14d08829032453d6136029 (diff)
downloadnextcloud-server-0bad8f644af1ca5b287d391cb7efdb392901b632.tar.gz
nextcloud-server-0bad8f644af1ca5b287d391cb7efdb392901b632.zip
Merge pull request #15511 from owncloud/fix-typos
Fix typos and some other adjustments
Diffstat (limited to 'lib/public')
-rw-r--r--lib/public/encryption/exceptions/genericencryptionexception.php7
-rw-r--r--lib/public/encryption/iencryptionmodule.php4
-rw-r--r--lib/public/encryption/imanager.php2
3 files changed, 9 insertions, 4 deletions
diff --git a/lib/public/encryption/exceptions/genericencryptionexception.php b/lib/public/encryption/exceptions/genericencryptionexception.php
index 59ab25fd61d..c488d4df162 100644
--- a/lib/public/encryption/exceptions/genericencryptionexception.php
+++ b/lib/public/encryption/exceptions/genericencryptionexception.php
@@ -25,7 +25,12 @@ namespace OCP\Encryption\Exceptions;
class GenericEncryptionException extends \Exception {
- public function __construct($message = "", $code = 0, \Exception $previous = null) {
+ /**
+ * @param string $message
+ * @param int $code
+ * @param \Exception $previous
+ */
+ public function __construct($message = '', $code = 0, \Exception $previous = null) {
if (empty($message)) {
$message = 'Unspecified encryption exception';
}
diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php
index 2f5f5e8a807..c1ce7d99d78 100644
--- a/lib/public/encryption/iencryptionmodule.php
+++ b/lib/public/encryption/iencryptionmodule.php
@@ -49,7 +49,7 @@ interface IEncryptionModule {
* written to the header, in case of a write operation
* or if no additional data is needed return a empty array
*/
- public function begin($path, $user, $header, $accessList);
+ public function begin($path, $user, array $header, array $accessList);
/**
* last chunk received. This is the place where you can perform some final
@@ -86,7 +86,7 @@ interface IEncryptionModule {
* @param array $accessList who has access to the file contains the key 'users' and 'public'
* @return boolean
*/
- public function update($path, $uid, $accessList);
+ public function update($path, $uid, array $accessList);
/**
* should the file be encrypted or not
diff --git a/lib/public/encryption/imanager.php b/lib/public/encryption/imanager.php
index ec91e3580e5..3dcdbf5d03a 100644
--- a/lib/public/encryption/imanager.php
+++ b/lib/public/encryption/imanager.php
@@ -73,7 +73,7 @@ interface IManager {
* get default encryption module
*
* @return \OCP\Encryption\IEncryptionModule
- * @throws Exceptions\ModuleDoesNotExistsException
+ * @throws ModuleDoesNotExistsException
*/
public function getDefaultEncryptionModule();