| @@ -148,7 +148,7 @@ | ||
| 148 | 148 | continue; | 
| 149 | 149 | } | 
| 150 | 150 | |
| 151 | - $level = (int) $row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER; | |
| 151 | + $level = (int)$row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER; | |
| 152 | 152 | |
| 153 | 153 |  			if ($level === Member::LEVEL_OWNER) { | 
| 154 | 154 |  				if (isset($this->circleHasAdmin[$this->circlesById[$row['group_id']]])) { | 
| @@ -93,7 +93,7 @@ | ||
| 93 | 93 | |
| 94 | 94 | $update = $this->connection->getQueryBuilder(); | 
| 95 | 95 |  			$update->update('circles_circles') | 
| 96 | -				   ->set('unique_id', $update->createNamedParameter('d' . $uniqueId)) | |
| 96 | +				   ->set('unique_id', $update->createNamedParameter('d'.$uniqueId)) | |
| 97 | 97 | ->where( | 
| 98 | 98 | $update->expr() | 
| 99 | 99 |  							  ->eq('id', $update->createNamedParameter($itemId)) | 
| @@ -282,7 +282,7 @@ | ||
| 282 | 282 | * generateEvent() | 
| 283 | 283 | * Create an Activity Event with the basic settings for the app. | 
| 284 | 284 | * | 
| 285 | - * @param $type | |
| 285 | + * @param string $type | |
| 286 | 286 | * | 
| 287 | 287 | * @return \OCP\Activity\IEvent | 
| 288 | 288 | */ | 
| @@ -107,7 +107,7 @@ | ||
| 107 | 107 | * limit the request to the children of a share | 
| 108 | 108 | * | 
| 109 | 109 | * @param IQueryBuilder $qb | 
| 110 | - * @param $userId | |
| 110 | + * @param string $userId | |
| 111 | 111 | * @param int $parentId | 
| 112 | 112 | */ | 
| 113 | 113 |  	protected function limitToShareChildren(IQueryBuilder &$qb, $userId, $parentId = -1) { | 
| @@ -252,7 +252,7 @@ | ||
| 252 | 252 | 'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX( | 
| 253 | 253 | $expr->eq( | 
| 254 | 254 | 'mo.circle_id', | 
| 255 | -        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') | |
| 255 | +		$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') | |
| 256 | 256 |  			), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)), | 
| 257 | 257 |  			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER)) | 
| 258 | 258 | ) | 
| @@ -76,7 +76,7 @@ discard block | ||
| 76 | 76 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; | 
| 77 | 77 | $qb->andWhere( | 
| 78 | 78 | $expr->in( | 
| 79 | - $pf . 'share_with', | |
| 79 | + $pf.'share_with', | |
| 80 | 80 | $qb->createNamedParameter($circleUniqueIds, IQueryBuilder::PARAM_STR_ARRAY) | 
| 81 | 81 | ) | 
| 82 | 82 | ); | 
| @@ -93,7 +93,7 @@ discard block | ||
| 93 | 93 | $expr = $qb->expr(); | 
| 94 | 94 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; | 
| 95 | 95 | |
| 96 | - $qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId))); | |
| 96 | + $qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId))); | |
| 97 | 97 | } | 
| 98 | 98 | |
| 99 | 99 | |
| @@ -142,8 +142,8 @@ discard block | ||
| 142 | 142 | /** @noinspection PhpMethodParametersCountMismatchInspection */ | 
| 143 | 143 | $qb->andWhere( | 
| 144 | 144 | $expr->orX( | 
| 145 | - $expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)), | |
| 146 | - $expr->eq($pf . 'id', $qb->createNamedParameter($circleId)) | |
| 145 | + $expr->eq($pf.'parent', $qb->createNamedParameter($circleId)), | |
| 146 | + $expr->eq($pf.'id', $qb->createNamedParameter($circleId)) | |
| 147 | 147 | ) | 
| 148 | 148 | ); | 
| 149 | 149 | } | 
| @@ -165,7 +165,7 @@ discard block | ||
| 165 | 165 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; | 
| 166 | 166 | $qb->andWhere( | 
| 167 | 167 | $expr->in( | 
| 168 | - $pf . 'file_source', | |
| 168 | + $pf.'file_source', | |
| 169 | 169 | $qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY) | 
| 170 | 170 | ) | 
| 171 | 171 | ); | 
| @@ -198,13 +198,13 @@ discard block | ||
| 198 | 198 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; | 
| 199 | 199 | |
| 200 | 200 |  		if ($reShares === false) { | 
| 201 | - $qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))); | |
| 201 | + $qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))); | |
| 202 | 202 |  		} else { | 
| 203 | 203 | /** @noinspection PhpMethodParametersCountMismatchInspection */ | 
| 204 | 204 | $qb->andWhere( | 
| 205 | 205 | $expr->orX( | 
| 206 | - $expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)), | |
| 207 | - $expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)) | |
| 206 | + $expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)), | |
| 207 | + $expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)) | |
| 208 | 208 | ) | 
| 209 | 209 | ); | 
| 210 | 210 | } | 
| @@ -226,7 +226,7 @@ discard block | ||
| 226 | 226 | |
| 227 | 227 | $tmpOrX = $expr->eq( | 
| 228 | 228 | 's.share_with', | 
| 229 | -			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') | |
| 229 | +			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')') | |
| 230 | 230 | ); | 
| 231 | 231 | |
| 232 | 232 |  		if ($shareId === -1) { | 
| @@ -257,7 +257,7 @@ discard block | ||
| 257 | 257 | 'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX( | 
| 258 | 258 | $expr->eq( | 
| 259 | 259 | 'mo.circle_id', | 
| 260 | -        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') | |
| 260 | +        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')') | |
| 261 | 261 |  			), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)), | 
| 262 | 262 |  			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER)) | 
| 263 | 263 | ) | 
| @@ -313,7 +313,7 @@ discard block | ||
| 313 | 313 | return $qb->expr()->andX( | 
| 314 | 314 | $expr->in( | 
| 315 | 315 | $qb->createFunction( | 
| 316 | - 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' | |
| 316 | + 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' | |
| 317 | 317 | ), | 
| 318 | 318 | $qb->createFunction($subQb->getSQL()) | 
| 319 | 319 | ) | 
| @@ -351,7 +351,7 @@ discard block | ||
| 351 | 351 | return $qb->expr()->andX( | 
| 352 | 352 | $expr->in( | 
| 353 | 353 | $qb->createFunction( | 
| 354 | - 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' | |
| 354 | + 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' | |
| 355 | 355 | ), | 
| 356 | 356 | $qb->createFunction($subQb->getSQL()) | 
| 357 | 357 | ) | 
| @@ -86,7 +86,7 @@ discard block | ||
| 86 | 86 | * @param string $circleUniqueId | 
| 87 | 87 | * @param string $groupId | 
| 88 | 88 | * | 
| 89 | - * @return array | |
| 89 | + * @return Member[] | |
| 90 | 90 | * @throws \Exception | 
| 91 | 91 | */ | 
| 92 | 92 |  	public function linkGroup($circleUniqueId, $groupId) { | 
| @@ -112,8 +112,8 @@ discard block | ||
| 112 | 112 | /** | 
| 113 | 113 | * Check if a fresh member can be generated (by linkGroup) | 
| 114 | 114 | * | 
| 115 | - * @param $circleId | |
| 116 | - * @param $groupId | |
| 115 | + * @param string $circleId | |
| 116 | + * @param string $groupId | |
| 117 | 117 | * | 
| 118 | 118 | * @return null|Member | 
| 119 | 119 | * @throws MemberAlreadyExistsException | 
| @@ -148,7 +148,7 @@ discard block | ||
| 148 | 148 | * @param string $groupId | 
| 149 | 149 | * @param int $level | 
| 150 | 150 | * | 
| 151 | - * @return array | |
| 151 | + * @return Member[] | |
| 152 | 152 | * @throws \Exception | 
| 153 | 153 | */ | 
| 154 | 154 |  	public function levelGroup($circleUniqueId, $groupId, $level) { | 
| @@ -186,7 +186,7 @@ discard block | ||
| 186 | 186 | /** | 
| 187 | 187 | * @param Circle $circle | 
| 188 | 188 | * @param Member $group | 
| 189 | - * @param $level | |
| 189 | + * @param integer $level | |
| 190 | 190 | * | 
| 191 | 191 | * @throws \Exception | 
| 192 | 192 | */ | 
| @@ -213,7 +213,7 @@ discard block | ||
| 213 | 213 | * @param string $circleUniqueId | 
| 214 | 214 | * @param string $groupId | 
| 215 | 215 | * | 
| 216 | - * @return array | |
| 216 | + * @return Member[] | |
| 217 | 217 | * @throws \Exception | 
| 218 | 218 | */ | 
| 219 | 219 |  	public function unlinkGroup($circleUniqueId, $groupId) { | 
| @@ -149,6 +149,9 @@ | ||
| 149 | 149 | } | 
| 150 | 150 | |
| 151 | 151 | |
| 152 | + /** | |
| 153 | + * @param string $display | |
| 154 | + */ | |
| 152 | 155 |  	public function setDisplayName($display) { | 
| 153 | 156 | $this->displayName = $display; | 
| 154 | 157 | |
| @@ -88,7 +88,7 @@ | ||
| 88 | 88 | $searcher = \OC::$server->query((string)$container); | 
| 89 | 89 | |
| 90 | 90 |  			if (!($searcher instanceof ISearch)) { | 
| 91 | -				$this->miscService->log('Search ' . $container . ' is not compatible exception'); | |
| 91 | +				$this->miscService->log('Search '.$container.' is not compatible exception'); | |
| 92 | 92 | continue; | 
| 93 | 93 | } | 
| 94 | 94 | |
| @@ -184,7 +184,7 @@ | ||
| 184 | 184 | if ((!$this->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0) | 
| 185 | 185 | && strpos($remote, 'https://') !== 0 | 
| 186 | 186 |  		) { | 
| 187 | - $remote = 'https://' . $remote; | |
| 187 | + $remote = 'https://'.$remote; | |
| 188 | 188 | } | 
| 189 | 189 | |
| 190 | 190 | return rtrim($remote, '/'); | 
| @@ -189,8 +189,8 @@ discard block | ||
| 189 | 189 | |
| 190 | 190 | |
| 191 | 191 | /** | 
| 192 | - * @param $circleUniqueId | |
| 193 | - * @param $remote | |
| 192 | + * @param string $circleUniqueId | |
| 193 | + * @param string $remote | |
| 194 | 194 | * | 
| 195 | 195 | * @return FederatedLink | 
| 196 | 196 | */ | 
| @@ -281,7 +281,7 @@ discard block | ||
| 281 | 281 | * | 
| 282 | 282 | * Will parse the error reason returned by requestLink() and throw an Exception | 
| 283 | 283 | * | 
| 284 | - * @param $reason | |
| 284 | + * @param string $reason | |
| 285 | 285 | * | 
| 286 | 286 | * @throws Exception | 
| 287 | 287 | * @throws FederatedRemoteDoesNotAllowException |