owncloud / core

tests/lib/appframework/middleware/security/CORSMiddlewareTest.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;
 
 /**

tests/lib/repair/cleantags.php

Doc Comments +2 added lines, -2 removed lines

@@ -160,8 +160,8 @@
 	}
 
 	/**
-	 * @param $tableName
-	 * @param $idName
+	 * @param string $tableName
+	 * @param string $idName
 	 * @return int
 	 */
 	protected function getLastInsertID($tableName, $idName) {

apps/files/controller/apicontroller.php

Doc Comments +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 	 *
 	 * @NoAdminRequired
 	 *
-	 * @param array $tagName tag name to filter by
+	 * @param string[] $tagName tag name to filter by
 	 * @return DataResponse
 	 */
 	public function getFilesByTag($tagName) {

apps/files/index.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-use OCA\Files\Appinfo\Application;
 
 // Check if we are a user
 OCP\User::checkLoggedIn();

apps/files/tests/controller/apicontrollertest.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 
 use OC\Files\FileInfo;
 use OCP\AppFramework\Http;
-use OC\Preview;
 use OCP\Files\NotFoundException;
 use OCP\Files\StorageNotAvailableException;
 use Test\TestCase;

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/hooks.php

Doc Comments +3 added lines

@@ -421,6 +421,9 @@
 		self::preRenameOrCopy($params, 'copy');
 	}
 
+	/**
+	 * @param string $operation
+	 */
 	private static function preRenameOrCopy($params, $operation) {
 		$user = \OCP\User::getUser();
 		$view = new \OC\Files\View('/');

apps/files_encryption/lib/keymanager.php

Doc Comments +4 added lines, -2 removed lines

@@ -323,6 +323,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param \OC\Files\View $view
+	 */
 	public static function publicShareKeyExists($view) {
 		$result = false;
 
@@ -424,7 +427,7 @@ 
 	 *
 	 * @param \OC\Files\View $view relative to data/
 	 * @param array $userIds list of users we want to remove
-	 * @param string $keyPath
+	 * @param string $keysPath
 	 * @param string $owner the owner of the file
 	 * @param string $ownerPath the owners name of the file for which we want to remove the users relative to data/user/files
 	 */
@@ -474,7 +477,6 @@ 
 	 *
 	 * @param \OC\Files\View $view
 	 * @param string $path relatvie to the views root
-	 * @param string $basePath
 	 */
 	protected static function keySetPreparation($view, $path) {
 		// If the file resides within a subdirectory, create it

apps/files_encryption/lib/session.php

Doc Comments +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
 
 	/**
 	 * Gets public share private key from session
-	 * @return string $privateKey
+	 * @return boolean $privateKey
 	 *
 	 */
 	private static function getPublicSharePrivateKey() {