@@ -129,11 +129,11 @@ |
||
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
| 132 | - * @param IQueryBuilder $qb |
|
| 133 | - * |
|
| 134 | - * @deprecated |
|
| 135 | - * never used in fact. |
|
| 136 | - */ |
|
| 132 | + * @param IQueryBuilder $qb |
|
| 133 | + * |
|
| 134 | + * @deprecated |
|
| 135 | + * never used in fact. |
|
| 136 | + */ |
|
| 137 | 137 | protected function leftJoinOwner(IQueryBuilder &$qb) { |
| 138 | 138 | |
| 139 | 139 | if ($qb->getType() !== QueryBuilder::SELECT) { |
@@ -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 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 73 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 74 | 74 | |
| 75 | - $qb->andWhere($expr->eq($pf . 'circle_id', $qb->createNamedParameter($circleId))); |
|
| 75 | + $qb->andWhere($expr->eq($pf.'circle_id', $qb->createNamedParameter($circleId))); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | |
@@ -82,17 +82,17 @@ discard block |
||
| 82 | 82 | * @param IQueryBuilder $qb |
| 83 | 83 | * @param int $id |
| 84 | 84 | */ |
| 85 | - protected function limitToId(IQueryBuilder &$qb, $id) { |
|
| 85 | + protected function limitToId(IQueryBuilder & $qb, $id) { |
|
| 86 | 86 | $expr = $qb->expr(); |
| 87 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; |
|
| 87 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; |
|
| 88 | 88 | |
| 89 | - $qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($id))); |
|
| 89 | + $qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($id))); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | |
| 93 | 93 | |
| 94 | 94 | |
| 95 | - protected function limitToMemberLevel(IQueryBuilder &$qb, $level) { |
|
| 95 | + protected function limitToMemberLevel(IQueryBuilder & $qb, $level) { |
|
| 96 | 96 | $qb->where( |
| 97 | 97 | $qb->expr() |
| 98 | 98 | ->gte('m.level', $qb->createNamedParameter($level)) |
@@ -109,20 +109,20 @@ discard block |
||
| 109 | 109 | * @param IQueryBuilder $qb |
| 110 | 110 | * @param string $userId |
| 111 | 111 | */ |
| 112 | - protected function leftJoinUserIdAsMember(IQueryBuilder &$qb, $userId) { |
|
| 112 | + protected function leftJoinUserIdAsMember(IQueryBuilder & $qb, $userId) { |
|
| 113 | 113 | |
| 114 | 114 | if ($qb->getType() !== QueryBuilder::SELECT) { |
| 115 | 115 | return; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | $expr = $qb->expr(); |
| 119 | - $pf = $this->default_select_alias . '.'; |
|
| 119 | + $pf = $this->default_select_alias.'.'; |
|
| 120 | 120 | |
| 121 | 121 | $qb->selectAlias('u.level', 'user_level'); |
| 122 | 122 | $qb->leftJoin( |
| 123 | 123 | $this->default_select_alias, MembersMapper::TABLENAME, 'u', |
| 124 | 124 | $expr->andX( |
| 125 | - $expr->eq($pf . 'id', 'u.circle_id'), |
|
| 125 | + $expr->eq($pf.'id', 'u.circle_id'), |
|
| 126 | 126 | $expr->eq('u.user_id', $qb->createNamedParameter($userId)) |
| 127 | 127 | ) |
| 128 | 128 | ); |
@@ -134,19 +134,19 @@ discard block |
||
| 134 | 134 | * @deprecated |
| 135 | 135 | * never used in fact. |
| 136 | 136 | */ |
| 137 | - protected function leftJoinOwner(IQueryBuilder &$qb) { |
|
| 137 | + protected function leftJoinOwner(IQueryBuilder & $qb) { |
|
| 138 | 138 | |
| 139 | 139 | if ($qb->getType() !== QueryBuilder::SELECT) { |
| 140 | 140 | return; |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | $expr = $qb->expr(); |
| 144 | - $pf = $this->default_select_alias . '.'; |
|
| 144 | + $pf = $this->default_select_alias.'.'; |
|
| 145 | 145 | |
| 146 | 146 | $qb->leftJoin( |
| 147 | 147 | $this->default_select_alias, MembersMapper::TABLENAME, 'o', |
| 148 | 148 | $expr->andX( |
| 149 | - $expr->eq($pf . 'id', 'o.circle_id'), |
|
| 149 | + $expr->eq($pf.'id', 'o.circle_id'), |
|
| 150 | 150 | $expr->eq('o.level', $qb->createNamedParameter(Member::LEVEL_OWNER)) |
| 151 | 151 | ) |
| 152 | 152 | ); |
@@ -64,8 +64,9 @@ |
||
| 64 | 64 | $qb = $this->getCirclesSelectSql(); |
| 65 | 65 | |
| 66 | 66 | $this->limitToId($qb, $circleId); |
| 67 | - if ($userId !== '') |
|
| 68 | - $this->leftJoinUserIdAsMember($qb, $userId); |
|
| 67 | + if ($userId !== '') { |
|
| 68 | + $this->leftJoinUserIdAsMember($qb, $userId); |
|
| 69 | + } |
|
| 69 | 70 | |
| 70 | 71 | // $this->leftjoinOwner($qb); |
| 71 | 72 | // $this->buildWithMemberLevel($qb, 'u.level', $level); |