owncloud / core

apps/files_encryption/lib/crypt.php

Doc Comments +5 added lines, -4 removed lines

@@ -185,7 +185,7 @@ 
 	 * @param string $plainContent

 	 * @param string $iv

 	 * @param string $passphrase

-	 * @param string $cypher used for encryption, currently we support AES-128-CFB and AES-256-CFB

+	 * @param string $cipher used for encryption, currently we support AES-128-CFB and AES-256-CFB

 	 * @return string encrypted file content

 	 * @throws \OCA\Files_Encryption\Exception\EncryptionException

 	 */

@@ -241,7 +241,7 @@ 
 	/**

 	 * Split concatenated data and IV into respective parts

 	 * @param string $catFile concatenated data to be split

-	 * @return array keys: encrypted, iv

+	 * @return string keys: encrypted, iv

 	 */

 	private static function splitIv($catFile) {

 

@@ -267,7 +267,7 @@ 
 	 * Symmetrically encrypts a string and returns keyfile content

 	 * @param string $plainContent content to be encrypted in keyfile

 	 * @param string $passphrase

-	 * @param string $cypher used for encryption, currently we support AES-128-CFB and AES-256-CFB

+	 * @param string $cipher used for encryption, currently we support AES-128-CFB and AES-256-CFB

 	 * @return false|string encrypted content combined with IV

 	 * @note IV need not be specified, as it will be stored in the returned keyfile

 	 * and remain accessible therein.

@@ -375,7 +375,7 @@ 
 	 * Create asymmetrically encrypted keyfile content using a generated key

 	 * @param string $plainContent content to be encrypted

 	 * @param array $publicKeys array keys must be the userId of corresponding user

-	 * @return array keys: keys (array, key = userId), data

+	 * @return string keys: keys (array, key = userId), data

 	 * @throws \OCA\Files_Encryption\Exception\MultiKeyEncryptException if encryption failed

 	 * @note symmetricDecryptFileContent() can decrypt files created using this method

 	 */

@@ -552,6 +552,7 @@ 
 	 *

 	 * @param array $header

 	 * @throws \OCA\Files_Encryption\Exception\EncryptionException

+	 * @return string
 	 */

 	public static function getCipher($header) {

 		$cipher = isset($header['cipher']) ? $header['cipher'] : 'AES-128-CFB';

apps/files_encryption/lib/util.php

Doc Comments +3 added lines, -3 removed lines

@@ -443,7 +443,7 @@ 
 	/**
 	 * get the file size of the unencrypted file
 	 * @param string $path absolute path
-	 * @return bool
+	 * @return string
 	 */
 	public function getFileSize($path) {
 
@@ -1000,7 +1000,7 @@ 
 	 * Decrypt a keyfile
 	 * @param string $filePath
 	 * @param string $privateKey
-	 * @return false|string
+	 * @return string
 	 */
 	private function decryptKeyfile($filePath, $privateKey) {
 
@@ -1222,7 +1222,7 @@ 
 
 	/**
 	 * check if files are already migrated to the encryption system
-	 * @return int|false migration status, false = in case of no record
+	 * @return integer migration status, false = in case of no record
 	 * @note If records are not being returned, check for a hidden space
 	 *       at the start of the uid in db
 	 */

apps/files_encryption/tests/hooks.php

Doc Comments +2 added lines

@@ -295,6 +295,7 @@ 
 
 	/**
 	 * test rename operation
+	 * @param string $filename
 	 */
 	function doTestRenameHook($filename) {
 		// check if keys exists
@@ -357,6 +358,7 @@ 
 
 	/**
 	 * test rename operation
+	 * @param string $filename
 	 */
 	function doTestCopyHook($filename) {
 		// check if keys exists

apps/files_sharing/lib/external/storage.php

Doc Comments +3 added lines

@@ -90,6 +90,9 @@
 		return $this->token;
 	}
 
+	/**
+	 * @return resource
+	 */
 	public function getPassword() {
 		return $this->password;
 	}

Unused Use Statements -1 removed lines

@@ -30,7 +30,6 @@
 namespace OCA\Files_Sharing\Controllers;
 
 use OC;
-use OC\Files\Filesystem;
 use OC_Files;
 use OC_Util;
 use OCP;

apps/files_sharing/lib/helper.php

Doc Comments +3 added lines

@@ -138,6 +138,9 @@
 		return true;
 	}
 
+	/**
+	 * @param string $target
+	 */
 	public static function getSharesFromItem($target) {
 		$result = array();
 		$owner = \OC\Files\Filesystem::getOwner($target);

apps/files_versions/tests/versions.php

Doc Comments -1 removed lines

@@ -620,7 +620,6 @@
 	/**
 	 * @param string $user
 	 * @param bool $create
-	 * @param bool $password
 	 */
 	public static function loginHelper($user, $create = false) {
 

apps/user_ldap/command/showconfig.php

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCertificates extends Base {

core/command/db/converttype.php

Unused Use Statements -1 removed lines

@@ -27,7 +27,6 @@
 use OCP\IUser;
 use OCP\ILogger;
 use OCP\Files\Folder;
-
 use OC\Share20\Exception\ShareNotFound;
 
 /**

lib/private/activitymanager.php

Doc Comments +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
 	}
 
 	/**
-	 * @param array $types
+	 * @param string[] $types
 	 * @param string $filter
 	 * @return array
 	 */
@@ -147,7 +147,7 @@ 
 	/**
 	 * @param string $app
 	 * @param string $text
-	 * @param array $params
+	 * @param string $params
 	 * @param boolean $stripPath
 	 * @param boolean $highlightParams
 	 * @param string $languageCode