| @@ -49,6 +49,7 @@ discard block | ||
| 49 | 49 | * @param $target_item_guid string The shared item GUID | 
| 50 | 50 | * @param $request_array array | 
| 51 | 51 | * @param $permissions integer Must be created with a bitmask from options on the ShareRequest class | 
| 52 | + * @param string $credential_owner | |
| 52 | 53 | * @return array Array of sharing requests | 
| 53 | 54 | */ | 
| 54 | 55 |  	public function createBulkRequests($target_item_id, $target_item_guid, $request_array, $permissions, $credential_owner) { | 
| @@ -253,7 +254,6 @@ discard block | ||
| 253 | 254 | /** | 
| 254 | 255 | * Delete ACL | 
| 255 | 256 | * | 
| 256 | - * @param ShareRequest $request | |
| 257 | 257 | * @return \OCA\Passman\Db\ShareRequest[] | 
| 258 | 258 | */ | 
| 259 | 259 |  	public function deleteShareACL(SharingACL $ACL) { | 
| @@ -277,7 +277,6 @@ discard block | ||
| 277 | 277 | /** | 
| 278 | 278 | * Get pending share requests by guid and uid | 
| 279 | 279 | * | 
| 280 | - * @param ShareRequest $request | |
| 281 | 280 | * @return \OCA\Passman\Db\ShareRequest[] | 
| 282 | 281 | */ | 
| 283 | 282 |  	public function getPendingShareRequestsForCredential($item_guid, $user_id) { | 
| @@ -110,7 +110,7 @@ | ||
| 110 | 110 | /** | 
| 111 | 111 | * Check if an setting is enabled (value of 1) | 
| 112 | 112 | * | 
| 113 | - * @param $setting | |
| 113 | + * @param string $setting | |
| 114 | 114 | * @return bool | 
| 115 | 115 | */ | 
| 116 | 116 |  	public function isEnabled($setting) { | 
| @@ -205,6 +205,10 @@ discard block | ||
| 205 | 205 | return array($cipherKey, $macKey, $iv); | 
| 206 | 206 | } | 
| 207 | 207 | |
| 208 | + /** | |
| 209 | + * @param string $a | |
| 210 | + * @param string $b | |
| 211 | + */ | |
| 208 | 212 |  	protected function hash_equals($a, $b) { | 
| 209 | 213 |  		if (function_exists('random_bytes')) { | 
| 210 | 214 | $key = random_bytes(128); | 
| @@ -246,7 +250,7 @@ discard block | ||
| 246 | 250 | /** | 
| 247 | 251 | * Pad the data with a random char chosen by the pad amount. | 
| 248 | 252 | * | 
| 249 | - * @param $data | |
| 253 | + * @param string $data | |
| 250 | 254 | * @return string | 
| 251 | 255 | */ | 
| 252 | 256 |  	protected function pad($data) { | 
| @@ -262,8 +266,8 @@ discard block | ||
| 262 | 266 | /** | 
| 263 | 267 | * Unpad the the data | 
| 264 | 268 | * | 
| 265 | - * @param $data | |
| 266 | - * @return bool|string | |
| 269 | + * @param string $data | |
| 270 | + * @return false|string | |
| 267 | 271 | */ | 
| 268 | 272 |  	protected function unpad($data) { | 
| 269 | 273 | $length = $this->getKeySize(); | 
| @@ -280,7 +284,7 @@ discard block | ||
| 280 | 284 | * Encrypt a credential | 
| 281 | 285 | * | 
| 282 | 286 | * @param Credential|array $credential the credential to decrypt | 
| 283 | - * @return Credential|array | |
| 287 | + * @return string | |
| 284 | 288 | */ | 
| 285 | 289 |  	public function decryptCredential($credential) { | 
| 286 | 290 | return $this->handleCredential($credential, EncryptService::OP_DECRYPT); | 
| @@ -353,7 +357,7 @@ discard block | ||
| 353 | 357 | /** | 
| 354 | 358 | * Decrypt a file | 
| 355 | 359 | * | 
| 356 | - * @param File|array $file | |
| 360 | + * @param File $file | |
| 357 | 361 | * @return File|array | 
| 358 | 362 | */ | 
| 359 | 363 | |
| @@ -148,7 +148,7 @@ | ||
| 148 | 148 | * Update a credential | 
| 149 | 149 | * | 
| 150 | 150 | * @param $raw_credential array An array containing all the credential fields | 
| 151 | - * @param $useRawUser bool | |
| 151 | + * @param boolean $useRawUser bool | |
| 152 | 152 | * @return Credential The updated credential | 
| 153 | 153 | */ | 
| 154 | 154 |  	public function updateCredential($raw_credential, $useRawUser) { |