@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * |
| 85 | 85 | * @param $container |
| 86 | 86 | */ |
| 87 | - private function registerServices(IAppContainer &$container) { |
|
| 87 | + private function registerServices(IAppContainer & $container) { |
|
| 88 | 88 | |
| 89 | 89 | $container->registerService( |
| 90 | 90 | 'MiscService', function(IAppContainer $c) { |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | * |
| 144 | 144 | * @param $container |
| 145 | 145 | */ |
| 146 | - private static function registerControllers(IAppContainer &$container) { |
|
| 146 | + private static function registerControllers(IAppContainer & $container) { |
|
| 147 | 147 | |
| 148 | 148 | $container->registerService( |
| 149 | 149 | 'NavigationController', function(IAppContainer $c) { |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | * |
| 194 | 194 | * @param IAppContainer $container |
| 195 | 195 | */ |
| 196 | - private static function registerDatabaseRequesters(IAppContainer &$container) { |
|
| 196 | + private static function registerDatabaseRequesters(IAppContainer & $container) { |
|
| 197 | 197 | |
| 198 | 198 | $container->registerService( |
| 199 | 199 | 'CirclesRequest', function(IAppContainer $c) { |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | * |
| 212 | 212 | * @param $container |
| 213 | 213 | */ |
| 214 | - private static function registerMappers(IAppContainer &$container) { |
|
| 214 | + private static function registerMappers(IAppContainer & $container) { |
|
| 215 | 215 | |
| 216 | 216 | $container->registerService( |
| 217 | 217 | 'CirclesMapper', function(IAppContainer $c) { |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | * |
| 240 | 240 | * @param $container |
| 241 | 241 | */ |
| 242 | - private static function registerCores(IAppContainer &$container) { |
|
| 242 | + private static function registerCores(IAppContainer & $container) { |
|
| 243 | 243 | |
| 244 | 244 | $container->registerService( |
| 245 | 245 | 'Logger', function(IAppContainer $c) { |
@@ -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']]])) { |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | $expr = $qb->expr(); |
| 74 | 74 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 75 | 75 | |
| 76 | - $qb->andWhere($expr->eq($pf . 'share_with', $qb->createNamedParameter($circleId))); |
|
| 76 | + $qb->andWhere($expr->eq($pf.'share_with', $qb->createNamedParameter($circleId))); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | $expr = $qb->expr(); |
| 88 | 88 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 89 | 89 | |
| 90 | - $qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId))); |
|
| 90 | + $qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId))); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | |
@@ -136,8 +136,8 @@ discard block |
||
| 136 | 136 | /** @noinspection PhpMethodParametersCountMismatchInspection */ |
| 137 | 137 | $qb->andWhere( |
| 138 | 138 | $expr->orX( |
| 139 | - $expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)), |
|
| 140 | - $expr->eq($pf . 'id', $qb->createNamedParameter($circleId)) |
|
| 139 | + $expr->eq($pf.'parent', $qb->createNamedParameter($circleId)), |
|
| 140 | + $expr->eq($pf.'id', $qb->createNamedParameter($circleId)) |
|
| 141 | 141 | ) |
| 142 | 142 | ); |
| 143 | 143 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; |
| 160 | 160 | $qb->andWhere( |
| 161 | 161 | $expr->in( |
| 162 | - $pf . 'file_source', |
|
| 162 | + $pf.'file_source', |
|
| 163 | 163 | $qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY) |
| 164 | 164 | ) |
| 165 | 165 | ); |
@@ -191,13 +191,13 @@ discard block |
||
| 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 | } |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | protected function linkToMember(& $qb, $userId) { |
| 254 | 254 | $expr = $qb->expr(); |
| 255 | 255 | |
| 256 | - $qb->leftJoin('s',MembersMapper::TABLENAME, 'm', $expr->andX( |
|
| 256 | + $qb->leftJoin('s', MembersMapper::TABLENAME, 'm', $expr->andX( |
|
| 257 | 257 | $expr->eq('s.share_with', 'm.circle_id'), |
| 258 | 258 | $expr->eq('m.user_id', $qb->createNamedParameter($userId)), |
| 259 | 259 | $expr->gte('m.level', $qb->createNamedParameter(Member::LEVEL_MEMBER)) |
@@ -132,7 +132,7 @@ |
||
| 132 | 132 | */ |
| 133 | 133 | public function initFederatedDelivery($uniqueId) { |
| 134 | 134 | |
| 135 | - $this->miscService->log("initFederatedDelivery start " . $uniqueId); |
|
| 135 | + $this->miscService->log("initFederatedDelivery start ".$uniqueId); |
|
| 136 | 136 | |
| 137 | 137 | // We don't want to keep the connection with the client up and running |
| 138 | 138 | // as he might have others things to do |
@@ -207,10 +207,10 @@ discard block |
||
| 207 | 207 | */ |
| 208 | 208 | private function generateLinkRemoteURL($remote) { |
| 209 | 209 | if (strpos($remote, 'http') !== 0) { |
| 210 | - $remote = 'https://' . $remote; |
|
| 210 | + $remote = 'https://'.$remote; |
|
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - return rtrim($remote, '/') . '/index.php/apps/circles/circles/link/'; |
|
| 213 | + return rtrim($remote, '/').'/index.php/apps/circles/circles/link/'; |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | /** |
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | */ |
| 221 | 221 | private function generatePayloadDeliveryURL($remote) { |
| 222 | 222 | if (strpos($remote, 'http') !== 0) { |
| 223 | - $remote = 'http://' . $remote; |
|
| 223 | + $remote = 'http://'.$remote; |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | - return rtrim($remote, '/') . '/index.php/apps/circles/circles/payload/'; |
|
| 226 | + return rtrim($remote, '/').'/index.php/apps/circles/circles/payload/'; |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | * @return int |
| 238 | 238 | * @throws Exception |
| 239 | 239 | */ |
| 240 | - private function requestLink(Circle $circle, FederatedLink &$link) { |
|
| 240 | + private function requestLink(Circle $circle, FederatedLink & $link) { |
|
| 241 | 241 | $args = [ |
| 242 | 242 | 'token' => $link->getToken(), |
| 243 | 243 | 'uniqueId' => $circle->getUniqueId(), |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | * |
| 314 | 314 | * @return bool |
| 315 | 315 | */ |
| 316 | - public function initiateLink(Circle $circle, FederatedLink &$link) { |
|
| 316 | + public function initiateLink(Circle $circle, FederatedLink & $link) { |
|
| 317 | 317 | |
| 318 | 318 | $link->setCircleId($circle->getId()); |
| 319 | 319 | |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | ); |
| 357 | 357 | |
| 358 | 358 | $result = json_decode($request->getBody(), true); |
| 359 | - $this->miscService->log("RESULT: " . $result); |
|
| 359 | + $this->miscService->log("RESULT: ".$result); |
|
| 360 | 360 | |
| 361 | 361 | return true; |
| 362 | 362 | } catch (Exception $e) { |
@@ -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 | ); |