Completed
Pull Request — master (#28212)
by Tom
10:01
created
apps/files_trashbin/lib/Trashbin.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -218,6 +218,9 @@  discard block
 block discarded – undo
218 218
 
219 219
 	/**
220 220
 	 *
221
+	 * @param string $targetFilename
222
+	 * @param string $targetLocation
223
+	 * @param integer $timestamp
221 224
 	 */
222 225
 	public static function insertTrashEntry($user, $targetFilename, $targetLocation, $timestamp) {
223 226
 		$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)");
@@ -330,6 +333,7 @@  discard block
 block discarded – undo
330 333
 	 * @param string $ownerPath path relative to the owner's home storage
331 334
 	 * @param integer $timestamp when the file was deleted
332 335
 	 * @param bool $forceCopy true to only make a copy of the versions into the trashbin
336
+	 * @param \OC\Files\Storage\Storage $sourceStorage
333 337
 	 */
334 338
 	private static function retainVersions($filename, $owner, $ownerPath, $timestamp, $sourceStorage = null, $forceCopy = false) {
335 339
 		if (\OCP\App::isEnabled('files_versions') && !empty($ownerPath)) {
@@ -780,7 +784,7 @@  discard block
 block discarded – undo
780 784
 	 * if the size limit for the trash bin is reached, we delete the oldest
781 785
 	 * files in the trash bin until we meet the limit again
782 786
 	 *
783
-	 * @param array $files
787
+	 * @param \OCP\Files\FileInfo[] $files
784 788
 	 * @param string $user
785 789
 	 * @param int $availableSpace available disc space
786 790
 	 * @return int size of deleted files
@@ -808,7 +812,7 @@  discard block
 block discarded – undo
808 812
 	/**
809 813
 	 * delete files older then max storage time
810 814
 	 *
811
-	 * @param array $files list of files sorted by mtime
815
+	 * @param \OCP\Files\FileInfo[] $files list of files sorted by mtime
812 816
 	 * @param string $user
813 817
 	 * @return integer[] size of deleted files and number of deleted files
814 818
 	 */
Please login to merge, or discard this patch.
core/Command/Security/ListRoutes.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -122,6 +122,9 @@
 block discarded – undo
122 122
 		}
123 123
 	}
124 124
 
125
+	/**
126
+	 * @param integer $name
127
+	 */
125 128
 	private function buildController($name) {
126 129
 		$parts = explode('.', $name);
127 130
 		if (count($parts) === 4 && $parts[0] === 'ocs') {
Please login to merge, or discard this patch.
lib/private/Repair/RepairMismatchFileCachePath.php 2 patches
Doc Comments   +14 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	 * @param string $wrongPath wrong path of the entry to fix
98 98
 	 * @param int $correctStorageNumericId numeric idea of the correct storage
99 99
 	 * @param string $correctPath value to which to set the path of the entry 
100
-	 * @return bool true for success
100
+	 * @return boolean|null true for success
101 101
 	 */
102 102
 	private function fixEntryPath(IOutput $out, $fileId, $wrongPath, $correctStorageNumericId, $correctPath) {
103 103
 		// delete target if exists
@@ -122,6 +122,9 @@  discard block
 block discarded – undo
122 122
 		$out->advance(1, $text);
123 123
 	}
124 124
 
125
+	/**
126
+	 * @param IQueryBuilder $qb
127
+	 */
125 128
 	private function addQueryConditionsParentIdWrongPath($qb) {
126 129
 		// thanks, VicDeo!
127 130
 		if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
@@ -161,6 +164,9 @@  discard block
 block discarded – undo
161 164
 		}
162 165
 	}
163 166
 
167
+	/**
168
+	 * @param IQueryBuilder $qb
169
+	 */
164 170
 	private function addQueryConditionsNonExistingParentIdEntry($qb, $storageNumericId = null) {
165 171
 		// Subquery for parent existence
166 172
 		$qbe = $this->connection->getQueryBuilder();
@@ -190,6 +196,9 @@  discard block
 block discarded – undo
190 196
 		}
191 197
 	}
192 198
 
199
+	/**
200
+	 * @param integer $storageNumericId
201
+	 */
193 202
 	private function countResultsToProcessParentIdWrongPath($storageNumericId = null) {
194 203
 		$qb = $this->connection->getQueryBuilder();
195 204
 		$qb->select($qb->createFunction('COUNT(*)'));
@@ -200,6 +209,9 @@  discard block
 block discarded – undo
200 209
 		return $count;
201 210
 	}
202 211
 
212
+	/**
213
+	 * @param integer $storageNumericId
214
+	 */
203 215
 	private function countResultsToProcessNonExistingParentIdEntry($storageNumericId = null) {
204 216
 		$qb = $this->connection->getQueryBuilder();
205 217
 		$qb->select($qb->createFunction('COUNT(*)'));
@@ -350,6 +362,7 @@  discard block
 block discarded – undo
350 362
 	 *
351 363
 	 * @param int $storageId storage id
352 364
 	 * @param string $path path for which to create the parent entry
365
+	 * @param integer $reuseFileId
353 366
 	 * @return int file id of the newly created parent
354 367
 	 */
355 368
 	private function getOrCreateEntry($storageId, $path, $reuseFileId = null) {
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -21,8 +21,6 @@
 block discarded – undo
21 21
 
22 22
 namespace OC\Repair;
23 23
 
24
-use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
25
-use OCP\DB\QueryBuilder\IQueryBuilder;
26 24
 use OCP\Migration\IOutput;
27 25
 use OCP\Migration\IRepairStep;
28 26
 use Doctrine\DBAL\Platforms\MySqlPlatform;
Please login to merge, or discard this patch.
core/Command/User/SyncBackend.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 	 * @param SyncService $syncService
158 158
 	 * @param UserInterface $backend
159 159
 	 * @param string $missingAccountsAction
160
-	 * @param array $validActions
160
+	 * @param string[] $validActions
161 161
 	 */
162 162
 	private function syncMultipleUsers (
163 163
 		InputInterface $input,
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	 * @param SyncService $syncService
207 207
 	 * @param UserInterface $backend
208 208
 	 * @param string $missingAccountsAction
209
-	 * @param array $validActions
209
+	 * @param string[] $validActions
210 210
 	 */
211 211
 	private function syncSingleUser(
212 212
 		$uid,
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 	}
252 252
 
253 253
 	/**
254
-	 * @param array $uids a list of uids to the the action
254
+	 * @param string[] $uids a list of uids to the the action
255 255
 	 * @param callable $callbackExists the callback used if the account for the uid exists. The
256 256
 	 * uid and the specific account will be passed as parameter to the callback in that order
257 257
 	 * @param callable $callbackMissing the callback used if the account doesn't exists. The uid (not
Please login to merge, or discard this patch.
core/Migrations/Version20170221114437.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace OC\Migrations;
3 3
 
4
-use OC\Migration\OutputAdapter;
5
-use OC\Migration\SimpleOutput;
6 4
 use OC\User\AccountMapper;
7 5
 use OC\User\AccountTermMapper;
8 6
 use OC\User\Database;
Please login to merge, or discard this patch.
lib/private/Repair.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -159,7 +159,7 @@
 block discarded – undo
159 159
 	 * Returns expensive repair steps to be run on the
160 160
 	 * command line with a special option.
161 161
 	 *
162
-	 * @return IRepairStep[]
162
+	 * @return OldGroupMembershipShares[]
163 163
 	 */
164 164
 	public static function getExpensiveRepairSteps() {
165 165
 		return [
Please login to merge, or discard this patch.
lib/private/User/AccountMapper.php 1 patch
Doc Comments   +10 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 
47 47
 	/**
48 48
 	 * Delegate to term mapper to avoid needing to inject term mapper
49
-	 * @param $account_id
49
+	 * @param integer $account_id
50 50
 	 * @param array $terms
51 51
 	 */
52 52
 	public function setTermsForAccount($account_id, array $terms) {
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
 	/**
57 57
 	 * Delegate to term mapper to avoid needing to inject term mapper
58
-	 * @param $account_id
58
+	 * @param integer $account_id
59 59
 	 * @return AccountTerm[] $terms
60 60
 	 */
61 61
 	public function findByAccountId($account_id) {
@@ -176,6 +176,9 @@  discard block
 block discarded – undo
176 176
 		return $this->findEntities($qb->getSQL(), $qb->getParameters(), $limit, $offset);
177 177
 	}
178 178
 
179
+	/**
180
+	 * @param boolean $hasLoggedIn
181
+	 */
179 182
 	public function getUserCountPerBackend($hasLoggedIn) {
180 183
 		$qb = $this->db->getQueryBuilder();
181 184
 		$qb->select(['backend', $qb->createFunction('count(*) as `count`')])
@@ -218,6 +221,11 @@  discard block
 block discarded – undo
218 221
 		return (int) $data['count'];
219 222
 	}
220 223
 
224
+	/**
225
+	 * @param \Closure $callback
226
+	 * @param string $search
227
+	 * @param boolean $onlySeen
228
+	 */
221 229
 	public function callForAllUsers($callback, $search, $onlySeen) {
222 230
 		$qb = $this->db->getQueryBuilder();
223 231
 		$qb->select(['*'])
Please login to merge, or discard this patch.
lib/private/User/SyncServiceCallback.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
 namespace OC\User;
23 23
 
24
-use OCP\Migration\IOutput;
24
+use OCP\Migration\IOutput;
25 25
 use OCP\Util;
26 26
 
27 27
 class SyncServiceCallback {
Please login to merge, or discard this patch.
lib/private/Files/Storage/Wrapper/Encryption.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
651 651
 	 * Set the flag to true, so that the file would be
652 652
 	 * in the decrypted state.
653 653
 	 *
654
-	 * @param $isDisabled bool
654
+	 * @param boolean $isDisabled bool
655 655
 	 */
656 656
 	public static function setDisableWriteEncryption($isDisabled) {
657 657
 		self::$disableWriteEncryption = $isDisabled;
@@ -1043,7 +1043,7 @@  discard block
 block discarded – undo
1043 1043
 	/**
1044 1044
 	 * check if path points to a files version
1045 1045
 	 *
1046
-	 * @param $path
1046
+	 * @param string $path
1047 1047
 	 * @return bool
1048 1048
 	 */
1049 1049
 	protected function isVersion($path) {
Please login to merge, or discard this patch.