@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | * |
| 151 | 151 | * @param SharingFrame $frame |
| 152 | 152 | * @param Circle $circle |
| 153 | - * @param $broadcast |
|
| 153 | + * @param string|null $broadcast |
|
| 154 | 154 | */ |
| 155 | 155 | private function generateHeaders(SharingFrame $frame, Circle $circle, $broadcast) { |
| 156 | 156 | |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | * Please use getFrameFromCircle(); |
| 190 | 190 | * |
| 191 | 191 | * @param string $circleUniqueId |
| 192 | - * @param $viewerId |
|
| 192 | + * @param string $viewerId |
|
| 193 | 193 | * |
| 194 | 194 | * @return SharingFrame[] |
| 195 | 195 | */ |
@@ -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 | } |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | * @param IQueryBuilder $qb |
| 149 | 149 | * @param $files |
| 150 | 150 | */ |
| 151 | - protected function limitToFiles(IQueryBuilder &$qb, $files) { |
|
| 151 | + protected function limitToFiles(IQueryBuilder & $qb, $files) { |
|
| 152 | 152 | |
| 153 | 153 | if (!is_array($files)) { |
| 154 | 154 | $files = array($files); |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 159 | 159 | $qb->andWhere( |
| 160 | 160 | $expr->in( |
| 161 | - $pf . 'file_source', |
|
| 161 | + $pf.'file_source', |
|
| 162 | 162 | $qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY) |
| 163 | 163 | ) |
| 164 | 164 | ); |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | * @param int $limit |
| 171 | 171 | * @param int $offset |
| 172 | 172 | */ |
| 173 | - protected function limitToPage(IQueryBuilder &$qb, $limit = -1, $offset = 0) { |
|
| 173 | + protected function limitToPage(IQueryBuilder & $qb, $limit = -1, $offset = 0) { |
|
| 174 | 174 | if ($limit !== -1) { |
| 175 | 175 | $qb->setMaxResults($limit); |
| 176 | 176 | } |
@@ -186,18 +186,18 @@ discard block |
||
| 186 | 186 | * @param string $userId |
| 187 | 187 | * @param bool $reShares |
| 188 | 188 | */ |
| 189 | - protected function limitToShareOwner(IQueryBuilder &$qb, $userId, $reShares = false) { |
|
| 189 | + protected function limitToShareOwner(IQueryBuilder & $qb, $userId, $reShares = false) { |
|
| 190 | 190 | $expr = $qb->expr(); |
| 191 | 191 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 192 | 192 | |
| 193 | 193 | if ($reShares === false) { |
| 194 | - $qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))); |
|
| 194 | + $qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))); |
|
| 195 | 195 | } else { |
| 196 | 196 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 197 | 197 | $qb->andWhere( |
| 198 | 198 | $expr->orX( |
| 199 | - $expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)), |
|
| 200 | - $expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)) |
|
| 199 | + $expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)), |
|
| 200 | + $expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)) |
|
| 201 | 201 | ) |
| 202 | 202 | ); |
| 203 | 203 | } |
@@ -212,14 +212,14 @@ discard block |
||
| 212 | 212 | * @param IQueryBuilder $qb |
| 213 | 213 | * @param int $shareId |
| 214 | 214 | */ |
| 215 | - protected function linkCircleField(IQueryBuilder &$qb, $shareId = -1) { |
|
| 215 | + protected function linkCircleField(IQueryBuilder & $qb, $shareId = -1) { |
|
| 216 | 216 | $expr = $qb->expr(); |
| 217 | 217 | |
| 218 | 218 | $qb->from(CoreRequestBuilder::TABLE_CIRCLES, 'c'); |
| 219 | 219 | |
| 220 | 220 | $tmpOrX = $expr->eq( |
| 221 | 221 | 's.share_with', |
| 222 | - $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') |
|
| 222 | + $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')') |
|
| 223 | 223 | ); |
| 224 | 224 | |
| 225 | 225 | if ($shareId === -1) { |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | /** |
| 242 | 242 | * @param IQueryBuilder $qb |
| 243 | 243 | */ |
| 244 | - protected function linkToCircleOwner(IQueryBuilder &$qb) { |
|
| 244 | + protected function linkToCircleOwner(IQueryBuilder & $qb) { |
|
| 245 | 245 | $expr = $qb->expr(); |
| 246 | 246 | |
| 247 | 247 | $qb->selectAlias('mo.user_id', 'circle_owner'); |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | 'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX( |
| 251 | 251 | $expr->eq( |
| 252 | 252 | 'mo.circle_id', |
| 253 | - $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') |
|
| 253 | + $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')') |
|
| 254 | 254 | ), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)), |
| 255 | 255 | $expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER)) |
| 256 | 256 | ) |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | * @param string $userId |
| 266 | 266 | * @param bool $groupMemberAllowed |
| 267 | 267 | */ |
| 268 | - protected function linkToMember(IQueryBuilder &$qb, $userId, $groupMemberAllowed) { |
|
| 268 | + protected function linkToMember(IQueryBuilder & $qb, $userId, $groupMemberAllowed) { |
|
| 269 | 269 | $expr = $qb->expr(); |
| 270 | 270 | |
| 271 | 271 | $qb->from(CoreRequestBuilder::TABLE_MEMBERS, 'm'); |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | * |
| 290 | 290 | * @return \OCP\DB\QueryBuilder\ICompositeExpression |
| 291 | 291 | */ |
| 292 | - private function exprLinkToMemberAsCircleMember(IQueryBuilder &$qb, $userId) { |
|
| 292 | + private function exprLinkToMemberAsCircleMember(IQueryBuilder & $qb, $userId) { |
|
| 293 | 293 | |
| 294 | 294 | $expr = $qb->expr(); |
| 295 | 295 | $andX = $expr->andX(); |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | $expr->eq( |
| 301 | 301 | 'm.circle_id', |
| 302 | 302 | $qb->createFunction( |
| 303 | - 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 303 | + 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 304 | 304 | ) |
| 305 | 305 | ) |
| 306 | 306 | ); |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | * |
| 319 | 319 | * @return \OCP\DB\QueryBuilder\ICompositeExpression |
| 320 | 320 | */ |
| 321 | - private function exprLinkToMemberAsGroupMember(IQueryBuilder &$qb, $userId) { |
|
| 321 | + private function exprLinkToMemberAsGroupMember(IQueryBuilder & $qb, $userId) { |
|
| 322 | 322 | $expr = $qb->expr(); |
| 323 | 323 | |
| 324 | 324 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | $expr->andX( |
| 328 | 328 | $expr->eq( |
| 329 | 329 | 'g.circle_id', |
| 330 | - $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')') |
|
| 330 | + $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')') |
|
| 331 | 331 | ), |
| 332 | 332 | $expr->gte('g.level', $qb->createNamedParameter(Member::LEVEL_MEMBER)) |
| 333 | 333 | ) |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | * |
| 348 | 348 | * @param IQueryBuilder $qb |
| 349 | 349 | */ |
| 350 | - protected function leftJoinShareInitiator(IQueryBuilder &$qb) { |
|
| 350 | + protected function leftJoinShareInitiator(IQueryBuilder & $qb) { |
|
| 351 | 351 | $expr = $qb->expr(); |
| 352 | 352 | |
| 353 | 353 | $qb->selectAlias('src_m.level', 'initiator_circle_level'); |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | * |
| 384 | 384 | * @param IQueryBuilder $qb |
| 385 | 385 | */ |
| 386 | - protected function joinCircleMembers(IQueryBuilder &$qb) { |
|
| 386 | + protected function joinCircleMembers(IQueryBuilder & $qb) { |
|
| 387 | 387 | $expr = $qb->expr(); |
| 388 | 388 | |
| 389 | 389 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | * @param IQueryBuilder $qb |
| 405 | 405 | * @param string $userId |
| 406 | 406 | */ |
| 407 | - protected function linkToFileCache(IQueryBuilder &$qb, $userId) { |
|
| 407 | + protected function linkToFileCache(IQueryBuilder & $qb, $userId) { |
|
| 408 | 408 | $expr = $qb->expr(); |
| 409 | 409 | |
| 410 | 410 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | /** |
| 521 | 521 | * @param IQueryBuilder $qb |
| 522 | 522 | */ |
| 523 | - private function joinShare(IQueryBuilder &$qb) { |
|
| 523 | + private function joinShare(IQueryBuilder & $qb) { |
|
| 524 | 524 | $expr = $qb->expr(); |
| 525 | 525 | |
| 526 | 526 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
@@ -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 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * @param IQueryBuilder $qb |
| 105 | 105 | * @param $userId |
| 106 | 106 | */ |
| 107 | - protected function limitToUserId(IQueryBuilder &$qb, $userId) { |
|
| 107 | + protected function limitToUserId(IQueryBuilder & $qb, $userId) { |
|
| 108 | 108 | $this->limitToDBField($qb, 'user_id', $userId); |
| 109 | 109 | } |
| 110 | 110 | |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | * @param IQueryBuilder $qb |
| 116 | 116 | * @param int $type |
| 117 | 117 | */ |
| 118 | - protected function limitToUserType(IQueryBuilder &$qb, $type) { |
|
| 118 | + protected function limitToUserType(IQueryBuilder & $qb, $type) { |
|
| 119 | 119 | $this->limitToDBField($qb, 'user_type', $type); |
| 120 | 120 | } |
| 121 | 121 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * @param IQueryBuilder $qb |
| 127 | 127 | * @param string $circleUniqueId |
| 128 | 128 | */ |
| 129 | - protected function limitToCircleId(IQueryBuilder &$qb, $circleUniqueId) { |
|
| 129 | + protected function limitToCircleId(IQueryBuilder & $qb, $circleUniqueId) { |
|
| 130 | 130 | $this->limitToDBField($qb, 'circle_id', $circleUniqueId); |
| 131 | 131 | } |
| 132 | 132 | |
@@ -138,14 +138,14 @@ discard block |
||
| 138 | 138 | * @param string $circleUniqueId |
| 139 | 139 | * @param $length |
| 140 | 140 | */ |
| 141 | - protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId, $length) { |
|
| 141 | + protected function limitToShortenUniqueId(IQueryBuilder & $qb, $circleUniqueId, $length) { |
|
| 142 | 142 | $expr = $qb->expr(); |
| 143 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`' . $this->default_select_alias . '`.' : ''; |
|
| 143 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? '`'.$this->default_select_alias.'`.' : ''; |
|
| 144 | 144 | |
| 145 | 145 | $qb->andWhere( |
| 146 | 146 | $expr->eq( |
| 147 | 147 | $qb->createNamedParameter($circleUniqueId), |
| 148 | - $qb->createFunction('SUBSTR(' . $pf . '`unique_id`' . ', 1, ' . $length . ')') |
|
| 148 | + $qb->createFunction('SUBSTR('.$pf.'`unique_id`'.', 1, '.$length.')') |
|
| 149 | 149 | ) |
| 150 | 150 | ); |
| 151 | 151 | |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | * @param IQueryBuilder $qb |
| 159 | 159 | * @param int $groupId |
| 160 | 160 | */ |
| 161 | - protected function limitToGroupId(IQueryBuilder &$qb, $groupId) { |
|
| 161 | + protected function limitToGroupId(IQueryBuilder & $qb, $groupId) { |
|
| 162 | 162 | $this->limitToDBField($qb, 'group_id', $groupId); |
| 163 | 163 | } |
| 164 | 164 | |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | * @param IQueryBuilder $qb |
| 170 | 170 | * @param string $name |
| 171 | 171 | */ |
| 172 | - protected function limitToName(IQueryBuilder &$qb, $name) { |
|
| 172 | + protected function limitToName(IQueryBuilder & $qb, $name) { |
|
| 173 | 173 | $this->limitToDBField($qb, 'name', $name); |
| 174 | 174 | } |
| 175 | 175 | |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | * @param IQueryBuilder $qb |
| 181 | 181 | * @param string $name |
| 182 | 182 | */ |
| 183 | - protected function limitToStatus(IQueryBuilder &$qb, $name) { |
|
| 183 | + protected function limitToStatus(IQueryBuilder & $qb, $name) { |
|
| 184 | 184 | $this->limitToDBFieldOrGreater($qb, 'status', $name); |
| 185 | 185 | } |
| 186 | 186 | |
@@ -194,12 +194,12 @@ discard block |
||
| 194 | 194 | * @param int $level |
| 195 | 195 | * @param string|array $pf |
| 196 | 196 | */ |
| 197 | - protected function limitToLevel(IQueryBuilder &$qb, $level, $pf = '') { |
|
| 197 | + protected function limitToLevel(IQueryBuilder & $qb, $level, $pf = '') { |
|
| 198 | 198 | $expr = $qb->expr(); |
| 199 | 199 | |
| 200 | 200 | if ($pf === '') { |
| 201 | - $p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 202 | - $qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level))); |
|
| 201 | + $p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 202 | + $qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level))); |
|
| 203 | 203 | |
| 204 | 204 | return; |
| 205 | 205 | } |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) { |
| 228 | 228 | continue; |
| 229 | 229 | } |
| 230 | - $orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level))); |
|
| 230 | + $orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level))); |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | return $orX; |
@@ -239,15 +239,15 @@ discard block |
||
| 239 | 239 | * |
| 240 | 240 | * @param IQueryBuilder $qb |
| 241 | 241 | */ |
| 242 | - protected function limitToMembersAndAlmost(IQueryBuilder &$qb) { |
|
| 242 | + protected function limitToMembersAndAlmost(IQueryBuilder & $qb) { |
|
| 243 | 243 | $expr = $qb->expr(); |
| 244 | 244 | |
| 245 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 245 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 246 | 246 | |
| 247 | 247 | $orX = $expr->orX(); |
| 248 | - $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER))); |
|
| 249 | - $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED))); |
|
| 250 | - $orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST))); |
|
| 248 | + $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER))); |
|
| 249 | + $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED))); |
|
| 250 | + $orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST))); |
|
| 251 | 251 | |
| 252 | 252 | $qb->andWhere($orX); |
| 253 | 253 | } |
@@ -258,10 +258,10 @@ discard block |
||
| 258 | 258 | * @param string $field |
| 259 | 259 | * @param string|integer $value |
| 260 | 260 | */ |
| 261 | - private function limitToDBField(IQueryBuilder &$qb, $field, $value) { |
|
| 261 | + private function limitToDBField(IQueryBuilder & $qb, $field, $value) { |
|
| 262 | 262 | $expr = $qb->expr(); |
| 263 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 264 | - $qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value))); |
|
| 263 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 264 | + $qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value))); |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | |
@@ -270,10 +270,10 @@ discard block |
||
| 270 | 270 | * @param string $field |
| 271 | 271 | * @param string|integer $value |
| 272 | 272 | */ |
| 273 | - private function limitToDBFieldOrGreater(IQueryBuilder &$qb, $field, $value) { |
|
| 273 | + private function limitToDBFieldOrGreater(IQueryBuilder & $qb, $field, $value) { |
|
| 274 | 274 | $expr = $qb->expr(); |
| 275 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 276 | - $qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value))); |
|
| 275 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 276 | + $qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value))); |
|
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | |
@@ -288,9 +288,9 @@ discard block |
||
| 288 | 288 | protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') { |
| 289 | 289 | $expr = $qb->expr(); |
| 290 | 290 | |
| 291 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 291 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 292 | 292 | |
| 293 | - $and = $expr->andX($expr->eq($pf . 'group_id', 'ncgu.gid')); |
|
| 293 | + $and = $expr->andX($expr->eq($pf.'group_id', 'ncgu.gid')); |
|
| 294 | 294 | if ($userId !== '') { |
| 295 | 295 | $and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId))); |
| 296 | 296 | } else { |
@@ -309,16 +309,16 @@ discard block |
||
| 309 | 309 | * |
| 310 | 310 | * @deprecated not used (14/07/17) |
| 311 | 311 | */ |
| 312 | - protected function rightJoinCircles(IQueryBuilder &$qb) { |
|
| 312 | + protected function rightJoinCircles(IQueryBuilder & $qb) { |
|
| 313 | 313 | $expr = $qb->expr(); |
| 314 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 314 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 315 | 315 | |
| 316 | 316 | $qb->from(self::TABLE_CIRCLES, 'c') |
| 317 | 317 | ->andWhere( |
| 318 | 318 | $expr->eq( |
| 319 | - $pf . 'circle_id', |
|
| 319 | + $pf.'circle_id', |
|
| 320 | 320 | $qb->createFunction( |
| 321 | - 'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 321 | + 'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 322 | 322 | ) |
| 323 | 323 | ) |
| 324 | 324 | ); |
@@ -331,14 +331,14 @@ discard block |
||
| 331 | 331 | * |
| 332 | 332 | * @param IQueryBuilder $qb |
| 333 | 333 | */ |
| 334 | - protected function leftJoinCircle(IQueryBuilder &$qb) { |
|
| 334 | + protected function leftJoinCircle(IQueryBuilder & $qb) { |
|
| 335 | 335 | |
| 336 | 336 | if ($qb->getType() !== QueryBuilder::SELECT) { |
| 337 | 337 | return; |
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | $expr = $qb->expr(); |
| 341 | - $pf = $this->default_select_alias . '.'; |
|
| 341 | + $pf = $this->default_select_alias.'.'; |
|
| 342 | 342 | |
| 343 | 343 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 344 | 344 | $qb->selectAlias('lc.type', 'circle_type') |
@@ -346,9 +346,9 @@ discard block |
||
| 346 | 346 | ->leftJoin( |
| 347 | 347 | $this->default_select_alias, CoreRequestBuilder::TABLE_CIRCLES, 'lc', |
| 348 | 348 | $expr->eq( |
| 349 | - $pf . 'circle_id', |
|
| 349 | + $pf.'circle_id', |
|
| 350 | 350 | $qb->createFunction( |
| 351 | - 'SUBSTR(`lc`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 351 | + 'SUBSTR(`lc`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 352 | 352 | ) |
| 353 | 353 | ) |
| 354 | 354 | ); |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | $expr->eq('ncgu.gid', 'g.group_id'), |
| 382 | 382 | $expr->eq( |
| 383 | 383 | 'g.circle_id', $qb->createFunction( |
| 384 | - 'SUBSTR(' . $field . ', 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 384 | + 'SUBSTR('.$field.', 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 385 | 385 | ) |
| 386 | 386 | ) |
| 387 | 387 | ) |
@@ -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 | - public function leftJoinUserIdAsViewer(IQueryBuilder &$qb, $userId) { |
|
| 248 | + public 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 | ), |
@@ -280,14 +280,14 @@ discard block |
||
| 280 | 280 | * |
| 281 | 281 | * @param IQueryBuilder $qb |
| 282 | 282 | */ |
| 283 | - public function leftJoinOwner(IQueryBuilder &$qb) { |
|
| 283 | + public function leftJoinOwner(IQueryBuilder & $qb) { |
|
| 284 | 284 | |
| 285 | 285 | if ($qb->getType() !== QueryBuilder::SELECT) { |
| 286 | 286 | return; |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | $expr = $qb->expr(); |
| 290 | - $pf = '`' . $this->default_select_alias . '`.'; |
|
| 290 | + $pf = '`'.$this->default_select_alias.'`.'; |
|
| 291 | 291 | |
| 292 | 292 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 293 | 293 | $qb->selectAlias('o.user_id', 'owner_userid') |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | $expr->andX( |
| 299 | 299 | $expr->eq( |
| 300 | 300 | $qb->createFunction( |
| 301 | - 'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH |
|
| 301 | + 'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH |
|
| 302 | 302 | . ')' |
| 303 | 303 | ) |
| 304 | 304 | , 'o.circle_id' |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | $qb->expr() |
| 360 | 360 | ->eq( |
| 361 | 361 | $qb->createFunction( |
| 362 | - 'SUBSTR(`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')' |
|
| 362 | + 'SUBSTR(`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')' |
|
| 363 | 363 | ), |
| 364 | 364 | $qb->createNamedParameter($circleUniqueId) |
| 365 | 365 | ) |