@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | * |
| 220 | 220 | * @param Circle $circle |
| 221 | 221 | * @param FederatedLink $link |
| 222 | - * @param $status |
|
| 222 | + * @param integer $status |
|
| 223 | 223 | * |
| 224 | 224 | * @return bool |
| 225 | 225 | */ |
@@ -277,8 +277,8 @@ discard block |
||
| 277 | 277 | |
| 278 | 278 | |
| 279 | 279 | /** |
| 280 | - * @param $circleUniqueId |
|
| 281 | - * @param $remote |
|
| 280 | + * @param string $circleUniqueId |
|
| 281 | + * @param string $remote |
|
| 282 | 282 | * |
| 283 | 283 | * @return FederatedLink |
| 284 | 284 | */ |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | * @return string |
| 307 | 307 | */ |
| 308 | 308 | private function generateLinkRemoteURL($remote) { |
| 309 | - return $this->configService->generateRemoteHost($remote) . Application::REMOTE_URL_LINK; |
|
| 309 | + return $this->configService->generateRemoteHost($remote).Application::REMOTE_URL_LINK; |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | * @return boolean |
| 321 | 321 | * @throws Exception |
| 322 | 322 | */ |
| 323 | - private function requestLink(Circle $circle, FederatedLink &$link) { |
|
| 323 | + private function requestLink(Circle $circle, FederatedLink & $link) { |
|
| 324 | 324 | $args = [ |
| 325 | 325 | 'apiVersion' => Circles::version(), |
| 326 | 326 | 'token' => $link->getToken(true), |
@@ -541,7 +541,7 @@ discard block |
||
| 541 | 541 | * @param Circle $circle |
| 542 | 542 | * @param FederatedLink $link |
| 543 | 543 | */ |
| 544 | - private function checkUpdateLinkFromRemoteLinkRequestSent(Circle $circle, FederatedLink &$link) { |
|
| 544 | + private function checkUpdateLinkFromRemoteLinkRequestSent(Circle $circle, FederatedLink & $link) { |
|
| 545 | 545 | |
| 546 | 546 | if ($link->getStatus() !== FederatedLink::STATUS_REQUEST_SENT) { |
| 547 | 547 | return; |
@@ -556,7 +556,7 @@ discard block |
||
| 556 | 556 | * @param Circle $circle |
| 557 | 557 | * @param FederatedLink $link |
| 558 | 558 | */ |
| 559 | - private function checkUpdateLinkFromRemoteLinkRequested(Circle $circle, FederatedLink &$link) { |
|
| 559 | + private function checkUpdateLinkFromRemoteLinkRequested(Circle $circle, FederatedLink & $link) { |
|
| 560 | 560 | |
| 561 | 561 | if ($link->getStatus() !== FederatedLink::STATUS_LINK_REQUESTED) { |
| 562 | 562 | return; |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | * @param Circle $circle |
| 572 | 572 | * @param FederatedLink $link |
| 573 | 573 | */ |
| 574 | - private function checkUpdateLinkFromRemoteLinkDown(Circle $circle, FederatedLink &$link) { |
|
| 574 | + private function checkUpdateLinkFromRemoteLinkDown(Circle $circle, FederatedLink & $link) { |
|
| 575 | 575 | |
| 576 | 576 | if ($link->getStatus() < FederatedLink::STATUS_LINK_DOWN) { |
| 577 | 577 | return; |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | * @return bool |
| 593 | 593 | * @throws Exception |
| 594 | 594 | */ |
| 595 | - public function updateLinkRemote(FederatedLink &$link) { |
|
| 595 | + public function updateLinkRemote(FederatedLink & $link) { |
|
| 596 | 596 | $args = [ |
| 597 | 597 | 'apiVersion' => Circles::version(), |
| 598 | 598 | 'token' => $link->getToken(true), |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | * |
| 631 | 631 | * @throws Exception |
| 632 | 632 | */ |
| 633 | - public function initiateLink(Circle $circle, FederatedLink &$link) { |
|
| 633 | + public function initiateLink(Circle $circle, FederatedLink & $link) { |
|
| 634 | 634 | |
| 635 | 635 | try { |
| 636 | 636 | $this->checkLinkRequestValidity($circle, $link); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | * @param IQueryBuilder $qb |
| 72 | 72 | * @param int $id |
| 73 | 73 | */ |
| 74 | - protected function limitToId(IQueryBuilder &$qb, $id) { |
|
| 74 | + protected function limitToId(IQueryBuilder & $qb, $id) { |
|
| 75 | 75 | $this->limitToDBField($qb, 'id', $id); |
| 76 | 76 | } |
| 77 | 77 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | * @param IQueryBuilder $qb |
| 83 | 83 | * @param int $uniqueId |
| 84 | 84 | */ |
| 85 | - protected function limitToUniqueId(IQueryBuilder &$qb, $uniqueId) { |
|
| 85 | + protected function limitToUniqueId(IQueryBuilder & $qb, $uniqueId) { |
|
| 86 | 86 | $this->limitToDBField($qb, 'unique_id', $uniqueId); |
| 87 | 87 | } |
| 88 | 88 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | * @param IQueryBuilder $qb |
| 94 | 94 | * @param string $token |
| 95 | 95 | */ |
| 96 | - protected function limitToToken(IQueryBuilder &$qb, $token) { |
|
| 96 | + protected function limitToToken(IQueryBuilder & $qb, $token) { |
|
| 97 | 97 | $this->limitToDBField($qb, 'token', $token); |
| 98 | 98 | } |
| 99 | 99 | |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | * |
| 107 | 107 | * @internal param int $circleId |
| 108 | 108 | */ |
| 109 | - protected function limitToUserId(IQueryBuilder &$qb, $userId) { |
|
| 109 | + protected function limitToUserId(IQueryBuilder & $qb, $userId) { |
|
| 110 | 110 | $this->limitToDBField($qb, 'user_id', $userId); |
| 111 | 111 | } |
| 112 | 112 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | * |
| 120 | 120 | * @internal param int $circleId |
| 121 | 121 | */ |
| 122 | - protected function limitToUserType(IQueryBuilder &$qb, $type) { |
|
| 122 | + protected function limitToUserType(IQueryBuilder & $qb, $type) { |
|
| 123 | 123 | $this->limitToDBField($qb, 'user_type', $type); |
| 124 | 124 | } |
| 125 | 125 | |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | * @param IQueryBuilder $qb |
| 131 | 131 | * @param string $circleUniqueId |
| 132 | 132 | */ |
| 133 | - protected function limitToCircleId(IQueryBuilder &$qb, $circleUniqueId) { |
|
| 133 | + protected function limitToCircleId(IQueryBuilder & $qb, $circleUniqueId) { |
|
| 134 | 134 | $this->limitToDBField($qb, 'circle_id', $circleUniqueId); |
| 135 | 135 | } |
| 136 | 136 | |
@@ -142,14 +142,14 @@ discard block |
||
| 142 | 142 | * @param string $circleUniqueId |
| 143 | 143 | * @param $length |
| 144 | 144 | */ |
| 145 | - protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId, $length) { |
|
| 145 | + protected function limitToShortenUniqueId(IQueryBuilder & $qb, $circleUniqueId, $length) { |
|
| 146 | 146 | $expr = $qb->expr(); |
| 147 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`' . $this->default_select_alias . '`.' : ''; |
|
| 147 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`'.$this->default_select_alias.'`.' : ''; |
|
| 148 | 148 | |
| 149 | 149 | $qb->andWhere( |
| 150 | 150 | $expr->eq( |
| 151 | 151 | $qb->createNamedParameter($circleUniqueId), |
| 152 | - $qb->createFunction('SUBSTR(' . $pf . '`unique_id`' . ', 1, ' . $length . ')') |
|
| 152 | + $qb->createFunction('SUBSTR('.$pf.'`unique_id`'.', 1, '.$length.')') |
|
| 153 | 153 | ) |
| 154 | 154 | ); |
| 155 | 155 | |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | * @param IQueryBuilder $qb |
| 163 | 163 | * @param int $groupId |
| 164 | 164 | */ |
| 165 | - protected function limitToGroupId(IQueryBuilder &$qb, $groupId) { |
|
| 165 | + protected function limitToGroupId(IQueryBuilder & $qb, $groupId) { |
|
| 166 | 166 | $this->limitToDBField($qb, 'group_id', $groupId); |
| 167 | 167 | } |
| 168 | 168 | |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | * @param IQueryBuilder $qb |
| 174 | 174 | * @param string $name |
| 175 | 175 | */ |
| 176 | - protected function limitToName(IQueryBuilder &$qb, $name) { |
|
| 176 | + protected function limitToName(IQueryBuilder & $qb, $name) { |
|
| 177 | 177 | $this->limitToDBField($qb, 'name', $name); |
| 178 | 178 | } |
| 179 | 179 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | * @param IQueryBuilder $qb |
| 185 | 185 | * @param string $name |
| 186 | 186 | */ |
| 187 | - protected function limitToStatus(IQueryBuilder &$qb, $name) { |
|
| 187 | + protected function limitToStatus(IQueryBuilder & $qb, $name) { |
|
| 188 | 188 | $this->limitToDBFieldOrGreater($qb, 'status', $name); |
| 189 | 189 | } |
| 190 | 190 | |
@@ -198,12 +198,12 @@ discard block |
||
| 198 | 198 | * @param int $level |
| 199 | 199 | * @param string|array $pf |
| 200 | 200 | */ |
| 201 | - protected function limitToLevel(IQueryBuilder &$qb, $level, $pf = '') { |
|
| 201 | + protected function limitToLevel(IQueryBuilder & $qb, $level, $pf = '') { |
|
| 202 | 202 | $expr = $qb->expr(); |
| 203 | 203 | |
| 204 | 204 | if ($pf === '') { |
| 205 | - $p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 206 | - $qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level))); |
|
| 205 | + $p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 206 | + $qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level))); |
|
| 207 | 207 | |
| 208 | 208 | return; |
| 209 | 209 | } |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) { |
| 232 | 232 | continue; |
| 233 | 233 | } |
| 234 | - $orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level))); |
|
| 234 | + $orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level))); |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | return $orX; |
@@ -243,15 +243,15 @@ discard block |
||
| 243 | 243 | * |
| 244 | 244 | * @param IQueryBuilder $qb |
| 245 | 245 | */ |
| 246 | - protected function limitToMembersAndAlmost(IQueryBuilder &$qb) { |
|
| 246 | + protected function limitToMembersAndAlmost(IQueryBuilder & $qb) { |
|
| 247 | 247 | $expr = $qb->expr(); |
| 248 | 248 | |
| 249 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 249 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 250 | 250 | |
| 251 | 251 | $orX = $expr->orX(); |
| 252 | - $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER))); |
|
| 253 | - $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED))); |
|
| 254 | - $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST))); |
|
| 252 | + $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER))); |
|
| 253 | + $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED))); |
|
| 254 | + $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST))); |
|
| 255 | 255 | |
| 256 | 256 | $qb->andWhere($orX); |
| 257 | 257 | } |
@@ -262,10 +262,10 @@ discard block |
||
| 262 | 262 | * @param string $field |
| 263 | 263 | * @param string|integer $value |
| 264 | 264 | */ |
| 265 | - private function limitToDBField(IQueryBuilder &$qb, $field, $value) { |
|
| 265 | + private function limitToDBField(IQueryBuilder & $qb, $field, $value) { |
|
| 266 | 266 | $expr = $qb->expr(); |
| 267 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 268 | - $qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value))); |
|
| 267 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 268 | + $qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value))); |
|
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | |
@@ -274,10 +274,10 @@ discard block |
||
| 274 | 274 | * @param string $field |
| 275 | 275 | * @param string|integer $value |
| 276 | 276 | */ |
| 277 | - private function limitToDBFieldOrGreater(IQueryBuilder &$qb, $field, $value) { |
|
| 277 | + private function limitToDBFieldOrGreater(IQueryBuilder & $qb, $field, $value) { |
|
| 278 | 278 | $expr = $qb->expr(); |
| 279 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 280 | - $qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value))); |
|
| 279 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 280 | + $qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value))); |
|
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | |
@@ -292,9 +292,9 @@ discard block |
||
| 292 | 292 | protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') { |
| 293 | 293 | $expr = $qb->expr(); |
| 294 | 294 | |
| 295 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 295 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 296 | 296 | |
| 297 | - $and = $expr->andX($expr->eq($pf . 'group_id', 'ncgu.gid')); |
|
| 297 | + $and = $expr->andX($expr->eq($pf.'group_id', 'ncgu.gid')); |
|
| 298 | 298 | if ($userId !== '') { |
| 299 | 299 | $and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId))); |
| 300 | 300 | } else { |
@@ -313,16 +313,16 @@ discard block |
||
| 313 | 313 | * |
| 314 | 314 | * @deprecated not used (14/07/17) |
| 315 | 315 | */ |
| 316 | - protected function rightJoinCircles(IQueryBuilder &$qb) { |
|
| 316 | + protected function rightJoinCircles(IQueryBuilder & $qb) { |
|
| 317 | 317 | $expr = $qb->expr(); |
| 318 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 318 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 319 | 319 | |
| 320 | 320 | $qb->from(self::TABLE_CIRCLES, 'c') |
| 321 | 321 | ->andWhere( |
| 322 | 322 | $expr->eq( |
| 323 | - $pf . 'circle_id', |
|
| 323 | + $pf.'circle_id', |
|
| 324 | 324 | $qb->createFunction( |
| 325 | - 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 325 | + 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 326 | 326 | ) |
| 327 | 327 | ) |
| 328 | 328 | ); |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | $expr->eq('ncgu.gid', 'g.group_id'), |
| 355 | 355 | $expr->eq( |
| 356 | 356 | 'g.circle_id', $qb->createFunction( |
| 357 | - 'SUBSTR(' . $field . ', 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 357 | + 'SUBSTR('.$field.', 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 358 | 358 | ) |
| 359 | 359 | ) |
| 360 | 360 | ) |
@@ -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 | ) |
@@ -68,11 +68,11 @@ discard block |
||
| 68 | 68 | * @param IQueryBuilder $qb |
| 69 | 69 | * @param int $circleId |
| 70 | 70 | */ |
| 71 | - protected function limitToCircle(IQueryBuilder &$qb, $circleId) { |
|
| 71 | + protected function limitToCircle(IQueryBuilder & $qb, $circleId) { |
|
| 72 | 72 | $expr = $qb->expr(); |
| 73 | 73 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 74 | 74 | |
| 75 | - $qb->andWhere($expr->eq($pf . 'share_with', $qb->createNamedParameter($circleId))); |
|
| 75 | + $qb->andWhere($expr->eq($pf.'share_with', $qb->createNamedParameter($circleId))); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | |
@@ -82,11 +82,11 @@ discard block |
||
| 82 | 82 | * @param IQueryBuilder $qb |
| 83 | 83 | * @param $shareId |
| 84 | 84 | */ |
| 85 | - protected function limitToShare(IQueryBuilder &$qb, $shareId) { |
|
| 85 | + protected function limitToShare(IQueryBuilder & $qb, $shareId) { |
|
| 86 | 86 | $expr = $qb->expr(); |
| 87 | 87 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 88 | 88 | |
| 89 | - $qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId))); |
|
| 89 | + $qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId))); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * |
| 96 | 96 | * @param IQueryBuilder $qb |
| 97 | 97 | */ |
| 98 | - protected function limitToShareParent(IQueryBuilder &$qb) { |
|
| 98 | + protected function limitToShareParent(IQueryBuilder & $qb) { |
|
| 99 | 99 | $expr = $qb->expr(); |
| 100 | 100 | |
| 101 | 101 | $qb->andWhere($expr->isNull('parent')); |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | * @param $userId |
| 110 | 110 | * @param int $parentId |
| 111 | 111 | */ |
| 112 | - protected function limitToShareChildren(IQueryBuilder &$qb, $userId, $parentId = -1) { |
|
| 112 | + protected function limitToShareChildren(IQueryBuilder & $qb, $userId, $parentId = -1) { |
|
| 113 | 113 | $expr = $qb->expr(); |
| 114 | 114 | $qb->andWhere($expr->eq('share_with', $qb->createNamedParameter($userId))); |
| 115 | 115 | |
@@ -128,15 +128,15 @@ discard block |
||
| 128 | 128 | * @param IQueryBuilder $qb |
| 129 | 129 | * @param $circleId |
| 130 | 130 | */ |
| 131 | - protected function limitToShareAndChildren(IQueryBuilder &$qb, $circleId) { |
|
| 131 | + protected function limitToShareAndChildren(IQueryBuilder & $qb, $circleId) { |
|
| 132 | 132 | $expr = $qb->expr(); |
| 133 | 133 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 134 | 134 | |
| 135 | 135 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 136 | 136 | $qb->andWhere( |
| 137 | 137 | $expr->orX( |
| 138 | - $expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)), |
|
| 139 | - $expr->eq($pf . 'id', $qb->createNamedParameter($circleId)) |
|
| 138 | + $expr->eq($pf.'parent', $qb->createNamedParameter($circleId)), |
|
| 139 | + $expr->eq($pf.'id', $qb->createNamedParameter($circleId)) |
|
| 140 | 140 | ) |
| 141 | 141 | ); |
| 142 | 142 | } |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | * |
| 151 | 151 | * @internal param $fileId |
| 152 | 152 | */ |
| 153 | - protected function limitToFiles(IQueryBuilder &$qb, $files) { |
|
| 153 | + protected function limitToFiles(IQueryBuilder & $qb, $files) { |
|
| 154 | 154 | |
| 155 | 155 | if (!is_array($files)) { |
| 156 | 156 | $files = array($files); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 161 | 161 | $qb->andWhere( |
| 162 | 162 | $expr->in( |
| 163 | - $pf . 'file_source', |
|
| 163 | + $pf.'file_source', |
|
| 164 | 164 | $qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY) |
| 165 | 165 | ) |
| 166 | 166 | ); |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | * @param int $limit |
| 173 | 173 | * @param int $offset |
| 174 | 174 | */ |
| 175 | - protected function limitToPage(IQueryBuilder &$qb, $limit = -1, $offset = 0) { |
|
| 175 | + protected function limitToPage(IQueryBuilder & $qb, $limit = -1, $offset = 0) { |
|
| 176 | 176 | if ($limit !== -1) { |
| 177 | 177 | $qb->setMaxResults($limit); |
| 178 | 178 | } |
@@ -188,18 +188,18 @@ discard block |
||
| 188 | 188 | * @param string $userId |
| 189 | 189 | * @param bool $reShares |
| 190 | 190 | */ |
| 191 | - protected function limitToShareOwner(IQueryBuilder &$qb, $userId, $reShares = false) { |
|
| 191 | + protected function limitToShareOwner(IQueryBuilder & $qb, $userId, $reShares = false) { |
|
| 192 | 192 | $expr = $qb->expr(); |
| 193 | 193 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 194 | 194 | |
| 195 | 195 | if ($reShares === false) { |
| 196 | - $qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))); |
|
| 196 | + $qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))); |
|
| 197 | 197 | } else { |
| 198 | 198 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 199 | 199 | $qb->andWhere( |
| 200 | 200 | $expr->orX( |
| 201 | - $expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)), |
|
| 202 | - $expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)) |
|
| 201 | + $expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)), |
|
| 202 | + $expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)) |
|
| 203 | 203 | ) |
| 204 | 204 | ); |
| 205 | 205 | } |
@@ -214,14 +214,14 @@ discard block |
||
| 214 | 214 | * @param IQueryBuilder $qb |
| 215 | 215 | * @param int $shareId |
| 216 | 216 | */ |
| 217 | - protected function linkCircleField(IQueryBuilder &$qb, $shareId = -1) { |
|
| 217 | + protected function linkCircleField(IQueryBuilder & $qb, $shareId = -1) { |
|
| 218 | 218 | $expr = $qb->expr(); |
| 219 | 219 | |
| 220 | 220 | $qb->from(CoreRequestBuilder::TABLE_CIRCLES, 'c'); |
| 221 | 221 | |
| 222 | 222 | $tmpOrX = $expr->eq( |
| 223 | 223 | 's.share_with', |
| 224 | - $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') |
|
| 224 | + $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')') |
|
| 225 | 225 | ); |
| 226 | 226 | |
| 227 | 227 | if ($shareId === -1) { |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | /** |
| 244 | 244 | * @param IQueryBuilder $qb |
| 245 | 245 | */ |
| 246 | - protected function linkToCircleOwner(IQueryBuilder &$qb) { |
|
| 246 | + protected function linkToCircleOwner(IQueryBuilder & $qb) { |
|
| 247 | 247 | $expr = $qb->expr(); |
| 248 | 248 | |
| 249 | 249 | $qb->selectAlias('mo.user_id', 'circle_owner'); |
@@ -252,7 +252,7 @@ discard block |
||
| 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 | ) |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | * @param string $userId |
| 268 | 268 | * @param bool $groupMemberAllowed |
| 269 | 269 | */ |
| 270 | - protected function linkToMember(IQueryBuilder &$qb, $userId, $groupMemberAllowed) { |
|
| 270 | + protected function linkToMember(IQueryBuilder & $qb, $userId, $groupMemberAllowed) { |
|
| 271 | 271 | $expr = $qb->expr(); |
| 272 | 272 | |
| 273 | 273 | $qb->from(CoreRequestBuilder::TABLE_MEMBERS, 'm'); |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | * |
| 292 | 292 | * @return \OCP\DB\QueryBuilder\ICompositeExpression |
| 293 | 293 | */ |
| 294 | - private function exprLinkToMemberAsCircleMember(IQueryBuilder &$qb, $userId) { |
|
| 294 | + private function exprLinkToMemberAsCircleMember(IQueryBuilder & $qb, $userId) { |
|
| 295 | 295 | |
| 296 | 296 | $expr = $qb->expr(); |
| 297 | 297 | $andX = $expr->andX(); |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | $expr->eq( |
| 303 | 303 | 'm.circle_id', |
| 304 | 304 | $qb->createFunction( |
| 305 | - 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 305 | + 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 306 | 306 | ) |
| 307 | 307 | ) |
| 308 | 308 | ); |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | * |
| 321 | 321 | * @return \OCP\DB\QueryBuilder\ICompositeExpression |
| 322 | 322 | */ |
| 323 | - private function exprLinkToMemberAsGroupMember(IQueryBuilder &$qb, $userId) { |
|
| 323 | + private function exprLinkToMemberAsGroupMember(IQueryBuilder & $qb, $userId) { |
|
| 324 | 324 | $expr = $qb->expr(); |
| 325 | 325 | |
| 326 | 326 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | $expr->andX( |
| 330 | 330 | $expr->eq( |
| 331 | 331 | 'g.circle_id', |
| 332 | - $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') |
|
| 332 | + $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')') |
|
| 333 | 333 | ), |
| 334 | 334 | $expr->gte('g.level', $qb->createNamedParameter(Member::LEVEL_MEMBER)) |
| 335 | 335 | ) |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | * |
| 350 | 350 | * @param IQueryBuilder $qb |
| 351 | 351 | */ |
| 352 | - protected function leftJoinShareInitiator(IQueryBuilder &$qb) { |
|
| 352 | + protected function leftJoinShareInitiator(IQueryBuilder & $qb) { |
|
| 353 | 353 | $expr = $qb->expr(); |
| 354 | 354 | |
| 355 | 355 | $qb->selectAlias('src_m.level', 'initiator_circle_level'); |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | * |
| 386 | 386 | * @param IQueryBuilder $qb |
| 387 | 387 | */ |
| 388 | - protected function joinCircleMembers(IQueryBuilder &$qb) { |
|
| 388 | + protected function joinCircleMembers(IQueryBuilder & $qb) { |
|
| 389 | 389 | $expr = $qb->expr(); |
| 390 | 390 | |
| 391 | 391 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | * @param IQueryBuilder $qb |
| 407 | 407 | * @param string $userId |
| 408 | 408 | */ |
| 409 | - protected function linkToFileCache(IQueryBuilder &$qb, $userId) { |
|
| 409 | + protected function linkToFileCache(IQueryBuilder & $qb, $userId) { |
|
| 410 | 410 | $expr = $qb->expr(); |
| 411 | 411 | |
| 412 | 412 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
@@ -522,7 +522,7 @@ discard block |
||
| 522 | 522 | /** |
| 523 | 523 | * @param IQueryBuilder $qb |
| 524 | 524 | */ |
| 525 | - private function joinShare(IQueryBuilder &$qb) { |
|
| 525 | + private function joinShare(IQueryBuilder & $qb) { |
|
| 526 | 526 | $expr = $qb->expr(); |
| 527 | 527 | |
| 528 | 528 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * @param IQueryBuilder $qb |
| 67 | 67 | * @param string $field |
| 68 | 68 | */ |
| 69 | - protected function leftJoinGroups(IQueryBuilder &$qb, $field) { |
|
| 69 | + protected function leftJoinGroups(IQueryBuilder & $qb, $field) { |
|
| 70 | 70 | $expr = $qb->expr(); |
| 71 | 71 | |
| 72 | 72 | $qb->leftJoin( |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | * |
| 81 | 81 | * @param IQueryBuilder $qb |
| 82 | 82 | */ |
| 83 | - protected function limitToNonPersonalCircle(IQueryBuilder &$qb) { |
|
| 83 | + protected function limitToNonPersonalCircle(IQueryBuilder & $qb) { |
|
| 84 | 84 | $expr = $qb->expr(); |
| 85 | 85 | |
| 86 | 86 | $qb->andWhere( |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * @throws ConfigNoCircleAvailableException |
| 100 | 100 | */ |
| 101 | 101 | protected function limitRegardingCircleType( |
| 102 | - IQueryBuilder &$qb, $userId, $circleUniqueId, $type, $name |
|
| 102 | + IQueryBuilder & $qb, $userId, $circleUniqueId, $type, $name |
|
| 103 | 103 | ) { |
| 104 | 104 | $orTypes = $this->generateLimit($qb, $circleUniqueId, $userId, $type, $name); |
| 105 | 105 | if (sizeof($orTypes) === 0) { |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | * |
| 130 | 130 | * @return array |
| 131 | 131 | */ |
| 132 | - private function generateLimit(IQueryBuilder &$qb, $circleUniqueId, $userId, $type, $name) { |
|
| 132 | + private function generateLimit(IQueryBuilder & $qb, $circleUniqueId, $userId, $type, $name) { |
|
| 133 | 133 | $orTypes = []; |
| 134 | 134 | array_push($orTypes, $this->generateLimitPersonal($qb, $userId, $type)); |
| 135 | 135 | array_push($orTypes, $this->generateLimitSecret($qb, $circleUniqueId, $type, $name)); |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | $expr->eq( |
| 182 | 182 | $qb->createNamedParameter($circleUniqueId), |
| 183 | 183 | $qb->createFunction( |
| 184 | - 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 184 | + 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 185 | 185 | ) |
| 186 | 186 | ) |
| 187 | 187 | ); |
@@ -245,14 +245,14 @@ discard block |
||
| 245 | 245 | * @param IQueryBuilder $qb |
| 246 | 246 | * @param string $userId |
| 247 | 247 | */ |
| 248 | - protected function leftJoinUserIdAsViewer(IQueryBuilder &$qb, $userId) { |
|
| 248 | + protected function leftJoinUserIdAsViewer(IQueryBuilder & $qb, $userId) { |
|
| 249 | 249 | |
| 250 | 250 | if ($qb->getType() !== QueryBuilder::SELECT) { |
| 251 | 251 | return; |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | $expr = $qb->expr(); |
| 255 | - $pf = '`' . $this->default_select_alias . '`.'; |
|
| 255 | + $pf = '`'.$this->default_select_alias.'`.'; |
|
| 256 | 256 | |
| 257 | 257 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 258 | 258 | $qb->selectAlias('u.user_id', 'viewer_userid') |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | $expr->eq( |
| 265 | 265 | 'u.circle_id', |
| 266 | 266 | $qb->createFunction( |
| 267 | - 'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH |
|
| 267 | + 'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH |
|
| 268 | 268 | . ')' |
| 269 | 269 | ) |
| 270 | 270 | ), |
@@ -279,14 +279,14 @@ discard block |
||
| 279 | 279 | * |
| 280 | 280 | * @param IQueryBuilder $qb |
| 281 | 281 | */ |
| 282 | - protected function leftJoinOwner(IQueryBuilder &$qb) { |
|
| 282 | + protected function leftJoinOwner(IQueryBuilder & $qb) { |
|
| 283 | 283 | |
| 284 | 284 | if ($qb->getType() !== QueryBuilder::SELECT) { |
| 285 | 285 | return; |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | $expr = $qb->expr(); |
| 289 | - $pf = '`' . $this->default_select_alias . '`.'; |
|
| 289 | + $pf = '`'.$this->default_select_alias.'`.'; |
|
| 290 | 290 | |
| 291 | 291 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 292 | 292 | $qb->selectAlias('o.user_id', 'owner_userid') |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | $expr->andX( |
| 298 | 298 | $expr->eq( |
| 299 | 299 | $qb->createFunction( |
| 300 | - 'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH |
|
| 300 | + 'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH |
|
| 301 | 301 | . ')' |
| 302 | 302 | ) |
| 303 | 303 | , 'o.circle_id' |
@@ -314,14 +314,14 @@ discard block |
||
| 314 | 314 | * |
| 315 | 315 | * @param IQueryBuilder $qb |
| 316 | 316 | */ |
| 317 | - protected function leftJoinCircle(IQueryBuilder &$qb) { |
|
| 317 | + protected function leftJoinCircle(IQueryBuilder & $qb) { |
|
| 318 | 318 | |
| 319 | 319 | if ($qb->getType() !== QueryBuilder::SELECT) { |
| 320 | 320 | return; |
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | $expr = $qb->expr(); |
| 324 | - $pf = $this->default_select_alias . '.'; |
|
| 324 | + $pf = $this->default_select_alias.'.'; |
|
| 325 | 325 | |
| 326 | 326 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 327 | 327 | $qb->selectAlias('lc.type', 'circle_type') |
@@ -329,9 +329,9 @@ discard block |
||
| 329 | 329 | ->leftJoin( |
| 330 | 330 | $this->default_select_alias, CoreRequestBuilder::TABLE_CIRCLES, 'lc', |
| 331 | 331 | $expr->eq( |
| 332 | - $pf . 'circle_id', |
|
| 332 | + $pf.'circle_id', |
|
| 333 | 333 | $qb->createFunction( |
| 334 | - 'SUBSTR(`lc`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 334 | + 'SUBSTR(`lc`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 335 | 335 | ) |
| 336 | 336 | ) |
| 337 | 337 | ); |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | $qb->expr() |
| 441 | 441 | ->eq( |
| 442 | 442 | $qb->createFunction( |
| 443 | - 'SUBSTR(`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 443 | + 'SUBSTR(`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 444 | 444 | ), |
| 445 | 445 | $qb->createNamedParameter($circleUniqueId) |
| 446 | 446 | ) |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | * @return bool |
| 198 | 198 | * @throws Exception |
| 199 | 199 | */ |
| 200 | - public function receiveFrame($token, $uniqueId, SharingFrame &$frame) { |
|
| 200 | + public function receiveFrame($token, $uniqueId, SharingFrame & $frame) { |
|
| 201 | 201 | try { |
| 202 | 202 | $link = $this->federatedLinksRequest->getLinkFromToken((string)$token, (string)$uniqueId); |
| 203 | 203 | } catch (Exception $e) { |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | * @return string |
| 260 | 260 | */ |
| 261 | 261 | private function generatePayloadDeliveryURL($remote) { |
| 262 | - return $this->configService->generateRemoteHost($remote) . Application::REMOTE_URL_PAYLOAD; |
|
| 262 | + return $this->configService->generateRemoteHost($remote).Application::REMOTE_URL_PAYLOAD; |
|
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | |
| 334 | 334 | } catch (Exception $e) { |
| 335 | 335 | $this->miscService->log( |
| 336 | - 'fail to send frame to ' . $link->getAddress() . ' - ' . $e->getMessage() |
|
| 336 | + 'fail to send frame to '.$link->getAddress().' - '.$e->getMessage() |
|
| 337 | 337 | ); |
| 338 | 338 | } |
| 339 | 339 | } |
@@ -687,7 +687,7 @@ |
||
| 687 | 687 | * @return \OCP\Activity\IEvent |
| 688 | 688 | */ |
| 689 | 689 | private function generateEvent($type) { |
| 690 | - $this->miscService->log("USER: " . $this->userId); |
|
| 690 | + $this->miscService->log("USER: ".$this->userId); |
|
| 691 | 691 | $event = $this->activityManager->generateEvent(); |
| 692 | 692 | $event->setApp(Application::APP_NAME) |
| 693 | 693 | ->setType($type); |