@@ -438,8 +438,8 @@ |
||
| 438 | 438 | |
| 439 | 439 | /** |
| 440 | 440 | * @param string $userId |
| 441 | - * @param $shareType |
|
| 442 | - * @param Node $node |
|
| 441 | + * @param integer $shareType |
|
| 442 | + * @param Node|null $node |
|
| 443 | 443 | * @param int $limit |
| 444 | 444 | * @param int $offset |
| 445 | 445 | * |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | * |
| 220 | 220 | * @param Circle $circle |
| 221 | 221 | */ |
| 222 | - private function detailsCircleMembers(Circle &$circle) { |
|
| 222 | + private function detailsCircleMembers(Circle & $circle) { |
|
| 223 | 223 | $members = |
| 224 | 224 | $this->membersRequest->getMembers($circle->getUniqueId(), $circle->getHigherViewer()); |
| 225 | 225 | |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | * |
| 233 | 233 | * @param Circle $circle |
| 234 | 234 | */ |
| 235 | - private function detailsCircleLinkedGroups(Circle &$circle) { |
|
| 235 | + private function detailsCircleLinkedGroups(Circle & $circle) { |
|
| 236 | 236 | $groups = []; |
| 237 | 237 | if ($this->configService->isLinkedGroupsAllowed()) { |
| 238 | 238 | $groups = |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | * |
| 251 | 251 | * @param Circle $circle |
| 252 | 252 | */ |
| 253 | - private function detailsCircleFederatedCircles(Circle &$circle) { |
|
| 253 | + private function detailsCircleFederatedCircles(Circle & $circle) { |
|
| 254 | 254 | $links = []; |
| 255 | 255 | |
| 256 | 256 | try { |
@@ -481,23 +481,23 @@ discard block |
||
| 481 | 481 | switch ($type) { |
| 482 | 482 | case Circle::CIRCLES_PERSONAL: |
| 483 | 483 | return $urlGen->getAbsoluteURL( |
| 484 | - $urlGen->imagePath(Application::APP_NAME, 'personal' . $ext) |
|
| 484 | + $urlGen->imagePath(Application::APP_NAME, 'personal'.$ext) |
|
| 485 | 485 | ); |
| 486 | 486 | case Circle::CIRCLES_CLOSED: |
| 487 | 487 | return $urlGen->getAbsoluteURL( |
| 488 | - $urlGen->imagePath(Application::APP_NAME, 'closed' . $ext) |
|
| 488 | + $urlGen->imagePath(Application::APP_NAME, 'closed'.$ext) |
|
| 489 | 489 | ); |
| 490 | 490 | case Circle::CIRCLES_SECRET: |
| 491 | 491 | return $urlGen->getAbsoluteURL( |
| 492 | - $urlGen->imagePath(Application::APP_NAME, 'secret' . $ext) |
|
| 492 | + $urlGen->imagePath(Application::APP_NAME, 'secret'.$ext) |
|
| 493 | 493 | ); |
| 494 | 494 | case Circle::CIRCLES_PUBLIC: |
| 495 | 495 | return $urlGen->getAbsoluteURL( |
| 496 | - $urlGen->imagePath(Application::APP_NAME, 'public' . $ext) |
|
| 496 | + $urlGen->imagePath(Application::APP_NAME, 'public'.$ext) |
|
| 497 | 497 | ); |
| 498 | 498 | } |
| 499 | 499 | |
| 500 | - return $urlGen->getAbsoluteURL($urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext)); |
|
| 500 | + return $urlGen->getAbsoluteURL($urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext)); |
|
| 501 | 501 | } |
| 502 | 502 | |
| 503 | 503 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * @param IQueryBuilder $qb |
| 67 | 67 | * @param array $circleUniqueIds |
| 68 | 68 | */ |
| 69 | - protected function limitToCircles(IQueryBuilder &$qb, $circleUniqueIds) { |
|
| 69 | + protected function limitToCircles(IQueryBuilder & $qb, $circleUniqueIds) { |
|
| 70 | 70 | |
| 71 | 71 | if (!is_array($circleUniqueIds)) { |
| 72 | 72 | $circleUniqueIds = array($circleUniqueIds); |
@@ -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 | ); |
@@ -89,11 +89,11 @@ discard block |
||
| 89 | 89 | * @param IQueryBuilder $qb |
| 90 | 90 | * @param $shareId |
| 91 | 91 | */ |
| 92 | - protected function limitToShare(IQueryBuilder &$qb, $shareId) { |
|
| 92 | + protected function limitToShare(IQueryBuilder & $qb, $shareId) { |
|
| 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 | |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | * |
| 103 | 103 | * @param IQueryBuilder $qb |
| 104 | 104 | */ |
| 105 | - protected function limitToShareParent(IQueryBuilder &$qb) { |
|
| 105 | + protected function limitToShareParent(IQueryBuilder & $qb) { |
|
| 106 | 106 | $expr = $qb->expr(); |
| 107 | 107 | |
| 108 | 108 | $qb->andWhere($expr->isNull('parent')); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | * @param $userId |
| 117 | 117 | * @param int $parentId |
| 118 | 118 | */ |
| 119 | - protected function limitToShareChildren(IQueryBuilder &$qb, $userId, $parentId = -1) { |
|
| 119 | + protected function limitToShareChildren(IQueryBuilder & $qb, $userId, $parentId = -1) { |
|
| 120 | 120 | $expr = $qb->expr(); |
| 121 | 121 | $qb->andWhere($expr->eq('share_with', $qb->createNamedParameter($userId))); |
| 122 | 122 | |
@@ -135,15 +135,15 @@ discard block |
||
| 135 | 135 | * @param IQueryBuilder $qb |
| 136 | 136 | * @param $circleId |
| 137 | 137 | */ |
| 138 | - protected function limitToShareAndChildren(IQueryBuilder &$qb, $circleId) { |
|
| 138 | + protected function limitToShareAndChildren(IQueryBuilder & $qb, $circleId) { |
|
| 139 | 139 | $expr = $qb->expr(); |
| 140 | 140 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 141 | 141 | |
| 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 | } |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | * @param IQueryBuilder $qb |
| 156 | 156 | * @param $files |
| 157 | 157 | */ |
| 158 | - protected function limitToFiles(IQueryBuilder &$qb, $files) { |
|
| 158 | + protected function limitToFiles(IQueryBuilder & $qb, $files) { |
|
| 159 | 159 | |
| 160 | 160 | if (!is_array($files)) { |
| 161 | 161 | $files = array($files); |
@@ -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 | ); |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | * @param int $limit |
| 178 | 178 | * @param int $offset |
| 179 | 179 | */ |
| 180 | - protected function limitToPage(IQueryBuilder &$qb, $limit = -1, $offset = 0) { |
|
| 180 | + protected function limitToPage(IQueryBuilder & $qb, $limit = -1, $offset = 0) { |
|
| 181 | 181 | if ($limit !== -1) { |
| 182 | 182 | $qb->setMaxResults($limit); |
| 183 | 183 | } |
@@ -193,18 +193,18 @@ discard block |
||
| 193 | 193 | * @param string $userId |
| 194 | 194 | * @param bool $reShares |
| 195 | 195 | */ |
| 196 | - protected function limitToShareOwner(IQueryBuilder &$qb, $userId, $reShares = false) { |
|
| 196 | + protected function limitToShareOwner(IQueryBuilder & $qb, $userId, $reShares = false) { |
|
| 197 | 197 | $expr = $qb->expr(); |
| 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 | } |
@@ -219,14 +219,14 @@ discard block |
||
| 219 | 219 | * @param IQueryBuilder $qb |
| 220 | 220 | * @param int $shareId |
| 221 | 221 | */ |
| 222 | - protected function linkCircleField(IQueryBuilder &$qb, $shareId = -1) { |
|
| 222 | + protected function linkCircleField(IQueryBuilder & $qb, $shareId = -1) { |
|
| 223 | 223 | $expr = $qb->expr(); |
| 224 | 224 | |
| 225 | 225 | $qb->from(CoreRequestBuilder::TABLE_CIRCLES, 'c'); |
| 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) { |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | /** |
| 249 | 249 | * @param IQueryBuilder $qb |
| 250 | 250 | */ |
| 251 | - protected function linkToCircleOwner(IQueryBuilder &$qb) { |
|
| 251 | + protected function linkToCircleOwner(IQueryBuilder & $qb) { |
|
| 252 | 252 | $expr = $qb->expr(); |
| 253 | 253 | |
| 254 | 254 | $qb->selectAlias('mo.user_id', 'circle_owner'); |
@@ -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 | ) |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | * @param string $userId |
| 273 | 273 | * @param bool $groupMemberAllowed |
| 274 | 274 | */ |
| 275 | - protected function linkToMember(IQueryBuilder &$qb, $userId, $groupMemberAllowed) { |
|
| 275 | + protected function linkToMember(IQueryBuilder & $qb, $userId, $groupMemberAllowed) { |
|
| 276 | 276 | $expr = $qb->expr(); |
| 277 | 277 | |
| 278 | 278 | $qb->from(CoreRequestBuilder::TABLE_MEMBERS, 'm'); |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | * |
| 297 | 297 | * @return \OCP\DB\QueryBuilder\ICompositeExpression |
| 298 | 298 | */ |
| 299 | - private function exprLinkToMemberAsCircleMember(IQueryBuilder &$qb, $userId) { |
|
| 299 | + private function exprLinkToMemberAsCircleMember(IQueryBuilder & $qb, $userId) { |
|
| 300 | 300 | |
| 301 | 301 | $expr = $qb->expr(); |
| 302 | 302 | $andX = $expr->andX(); |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | $expr->eq( |
| 308 | 308 | 'm.circle_id', |
| 309 | 309 | $qb->createFunction( |
| 310 | - 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 310 | + 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 311 | 311 | ) |
| 312 | 312 | ) |
| 313 | 313 | ); |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | * |
| 326 | 326 | * @return \OCP\DB\QueryBuilder\ICompositeExpression |
| 327 | 327 | */ |
| 328 | - private function exprLinkToMemberAsGroupMember(IQueryBuilder &$qb, $userId) { |
|
| 328 | + private function exprLinkToMemberAsGroupMember(IQueryBuilder & $qb, $userId) { |
|
| 329 | 329 | $expr = $qb->expr(); |
| 330 | 330 | |
| 331 | 331 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | $expr->andX( |
| 335 | 335 | $expr->eq( |
| 336 | 336 | 'g.circle_id', |
| 337 | - $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') |
|
| 337 | + $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')') |
|
| 338 | 338 | ), |
| 339 | 339 | $expr->gte('g.level', $qb->createNamedParameter(Member::LEVEL_MEMBER)) |
| 340 | 340 | ) |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | * |
| 355 | 355 | * @param IQueryBuilder $qb |
| 356 | 356 | */ |
| 357 | - protected function leftJoinShareInitiator(IQueryBuilder &$qb) { |
|
| 357 | + protected function leftJoinShareInitiator(IQueryBuilder & $qb) { |
|
| 358 | 358 | $expr = $qb->expr(); |
| 359 | 359 | |
| 360 | 360 | $qb->selectAlias('src_m.level', 'initiator_circle_level'); |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | * |
| 391 | 391 | * @param IQueryBuilder $qb |
| 392 | 392 | */ |
| 393 | - protected function joinCircleMembers(IQueryBuilder &$qb) { |
|
| 393 | + protected function joinCircleMembers(IQueryBuilder & $qb) { |
|
| 394 | 394 | $expr = $qb->expr(); |
| 395 | 395 | |
| 396 | 396 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | * @param IQueryBuilder $qb |
| 412 | 412 | * @param string $userId |
| 413 | 413 | */ |
| 414 | - protected function linkToFileCache(IQueryBuilder &$qb, $userId) { |
|
| 414 | + protected function linkToFileCache(IQueryBuilder & $qb, $userId) { |
|
| 415 | 415 | $expr = $qb->expr(); |
| 416 | 416 | |
| 417 | 417 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | /** |
| 528 | 528 | * @param IQueryBuilder $qb |
| 529 | 529 | */ |
| 530 | - private function joinShare(IQueryBuilder &$qb) { |
|
| 530 | + private function joinShare(IQueryBuilder & $qb) { |
|
| 531 | 531 | $expr = $qb->expr(); |
| 532 | 532 | |
| 533 | 533 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |