Completed
Push — stable8 ( 8f80be...83db25 )
by
unknown
21:28
created
tests/lib/appframework/middleware/security/CORSMiddlewareTest.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,6 @@
 block discarded – undo
27 27
 use OCP\IUser;
28 28
 use OCP\ILogger;
29 29
 use OCP\Files\Folder;
30
-
31 30
 use OC\Share20\Exception\ShareNotFound;
32 31
 
33 32
 /**
Please login to merge, or discard this patch.
tests/lib/repair/cleantags.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -160,8 +160,8 @@
 block discarded – undo
160 160
 	}
161 161
 
162 162
 	/**
163
-	 * @param $tableName
164
-	 * @param $idName
163
+	 * @param string $tableName
164
+	 * @param string $idName
165 165
 	 * @return int
166 166
 	 */
167 167
 	protected function getLastInsertID($tableName, $idName) {
Please login to merge, or discard this patch.
apps/files/controller/apicontroller.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
 	 *
92 92
 	 * @NoAdminRequired
93 93
 	 *
94
-	 * @param array $tagName tag name to filter by
94
+	 * @param string[] $tagName tag name to filter by
95 95
 	 * @return DataResponse
96 96
 	 */
97 97
 	public function getFilesByTag($tagName) {
Please login to merge, or discard this patch.
apps/files/index.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,6 @@
 block discarded – undo
20 20
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
21 21
  *
22 22
  */
23
-use OCA\Files\Appinfo\Application;
24 23
 
25 24
 // Check if we are a user
26 25
 OCP\User::checkLoggedIn();
Please login to merge, or discard this patch.
apps/files/tests/controller/apicontrollertest.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,6 @@
 block discarded – undo
10 10
 
11 11
 use OC\Files\FileInfo;
12 12
 use OCP\AppFramework\Http;
13
-use OC\Preview;
14 13
 use OCP\Files\NotFoundException;
15 14
 use OCP\Files\StorageNotAvailableException;
16 15
 use Test\TestCase;
Please login to merge, or discard this patch.
apps/files_encryption/lib/crypt.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 	 * @param string $plainContent
186 186
 	 * @param string $iv
187 187
 	 * @param string $passphrase
188
-	 * @param string $cypher used for encryption, currently we support AES-128-CFB and AES-256-CFB
188
+	 * @param string $cipher used for encryption, currently we support AES-128-CFB and AES-256-CFB
189 189
 	 * @return string encrypted file content
190 190
 	 * @throws \OCA\Files_Encryption\Exception\EncryptionException
191 191
 	 */
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 	/**
242 242
 	 * Split concatenated data and IV into respective parts
243 243
 	 * @param string $catFile concatenated data to be split
244
-	 * @return array keys: encrypted, iv
244
+	 * @return string keys: encrypted, iv
245 245
 	 */
246 246
 	private static function splitIv($catFile) {
247 247
 
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 	 * Symmetrically encrypts a string and returns keyfile content
268 268
 	 * @param string $plainContent content to be encrypted in keyfile
269 269
 	 * @param string $passphrase
270
-	 * @param string $cypher used for encryption, currently we support AES-128-CFB and AES-256-CFB
270
+	 * @param string $cipher used for encryption, currently we support AES-128-CFB and AES-256-CFB
271 271
 	 * @return false|string encrypted content combined with IV
272 272
 	 * @note IV need not be specified, as it will be stored in the returned keyfile
273 273
 	 * and remain accessible therein.
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 	 * Create asymmetrically encrypted keyfile content using a generated key
376 376
 	 * @param string $plainContent content to be encrypted
377 377
 	 * @param array $publicKeys array keys must be the userId of corresponding user
378
-	 * @return array keys: keys (array, key = userId), data
378
+	 * @return string keys: keys (array, key = userId), data
379 379
 	 * @throws \OCA\Files_Encryption\Exception\MultiKeyEncryptException if encryption failed
380 380
 	 * @note symmetricDecryptFileContent() can decrypt files created using this method
381 381
 	 */
@@ -552,6 +552,7 @@  discard block
 block discarded – undo
552 552
 	 *
553 553
 	 * @param array $header
554 554
 	 * @throws \OCA\Files_Encryption\Exception\EncryptionException
555
+	 * @return string
555 556
 	 */
556 557
 	public static function getCipher($header) {
557 558
 		$cipher = isset($header['cipher']) ? $header['cipher'] : 'AES-128-CFB';
Please login to merge, or discard this patch.
apps/files_encryption/lib/hooks.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -421,6 +421,9 @@
 block discarded – undo
421 421
 		self::preRenameOrCopy($params, 'copy');
422 422
 	}
423 423
 
424
+	/**
425
+	 * @param string $operation
426
+	 */
424 427
 	private static function preRenameOrCopy($params, $operation) {
425 428
 		$user = \OCP\User::getUser();
426 429
 		$view = new \OC\Files\View('/');
Please login to merge, or discard this patch.
apps/files_encryption/lib/keymanager.php 1 patch
Doc Comments   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -323,6 +323,9 @@  discard block
 block discarded – undo
323 323
 		return $result;
324 324
 	}
325 325
 
326
+	/**
327
+	 * @param \OC\Files\View $view
328
+	 */
326 329
 	public static function publicShareKeyExists($view) {
327 330
 		$result = false;
328 331
 
@@ -424,7 +427,7 @@  discard block
 block discarded – undo
424 427
 	 *
425 428
 	 * @param \OC\Files\View $view relative to data/
426 429
 	 * @param array $userIds list of users we want to remove
427
-	 * @param string $keyPath
430
+	 * @param string $keysPath
428 431
 	 * @param string $owner the owner of the file
429 432
 	 * @param string $ownerPath the owners name of the file for which we want to remove the users relative to data/user/files
430 433
 	 */
@@ -474,7 +477,6 @@  discard block
 block discarded – undo
474 477
 	 *
475 478
 	 * @param \OC\Files\View $view
476 479
 	 * @param string $path relatvie to the views root
477
-	 * @param string $basePath
478 480
 	 */
479 481
 	protected static function keySetPreparation($view, $path) {
480 482
 		// If the file resides within a subdirectory, create it
Please login to merge, or discard this patch.
apps/files_encryption/lib/session.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -188,7 +188,7 @@
 block discarded – undo
188 188
 
189 189
 	/**
190 190
 	 * Gets public share private key from session
191
-	 * @return string $privateKey
191
+	 * @return boolean $privateKey
192 192
 	 *
193 193
 	 */
194 194
 	private static function getPublicSharePrivateKey() {
Please login to merge, or discard this patch.