@@ -162,7 +162,7 @@ |
||
162 | 162 | * getMembersFromCircleSql() |
163 | 163 | * getMemberFromCircleSql() |
164 | 164 | * |
165 | - * @param $circleId |
|
165 | + * @param integer $circleId |
|
166 | 166 | * |
167 | 167 | * @return \OCP\DB\QueryBuilder\IQueryBuilder |
168 | 168 | */ |
@@ -80,7 +80,7 @@ |
||
80 | 80 | |
81 | 81 | /** |
82 | 82 | * @param $circleId |
83 | - * @param $name |
|
83 | + * @param string $name |
|
84 | 84 | * |
85 | 85 | * @return array |
86 | 86 | * @throws \Exception |
@@ -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 | } |
@@ -108,7 +108,7 @@ |
||
108 | 108 | * limit the request to the children of a share |
109 | 109 | * |
110 | 110 | * @param IQueryBuilder $qb |
111 | - * @param $userId |
|
111 | + * @param string $userId |
|
112 | 112 | * @param int $parentId |
113 | 113 | */ |
114 | 114 | protected function limitToShareChildren(& $qb, $userId, $parentId = -1) { |
@@ -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']]])) { |
@@ -273,7 +273,7 @@ |
||
273 | 273 | |
274 | 274 | |
275 | 275 | /** |
276 | - * @param $circleName |
|
276 | + * @param string $circleName |
|
277 | 277 | * |
278 | 278 | * @return Circle|null |
279 | 279 | */ |
@@ -227,7 +227,7 @@ |
||
227 | 227 | ob_start(); |
228 | 228 | echo($result); |
229 | 229 | $size = ob_get_length(); |
230 | - header('Content-Length: ' . $size); |
|
230 | + header('Content-Length: '.$size); |
|
231 | 231 | ob_end_flush(); |
232 | 232 | flush(); |
233 | 233 | } |
@@ -217,10 +217,10 @@ discard block |
||
217 | 217 | */ |
218 | 218 | private function generateLinkRemoteURL($remote) { |
219 | 219 | if ($this->localTest === false && strpos($remote, 'https') !== 0) { |
220 | - $remote = 'https://' . $remote; |
|
220 | + $remote = 'https://'.$remote; |
|
221 | 221 | } |
222 | 222 | |
223 | - return rtrim($remote, '/') . '/index.php/apps/circles/v1/circles/link/'; |
|
223 | + return rtrim($remote, '/').'/index.php/apps/circles/v1/circles/link/'; |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | |
@@ -231,10 +231,10 @@ discard block |
||
231 | 231 | */ |
232 | 232 | private function generatePayloadDeliveryURL($remote) { |
233 | 233 | if ($this->localTest === false && strpos($remote, 'https') !== 0) { |
234 | - $remote = 'https://' . $remote; |
|
234 | + $remote = 'https://'.$remote; |
|
235 | 235 | } |
236 | 236 | |
237 | - return rtrim($remote, '/') . '/index.php/apps/circles/v1/circles/payload/'; |
|
237 | + return rtrim($remote, '/').'/index.php/apps/circles/v1/circles/payload/'; |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | |
448 | 448 | $result = json_decode($request->getBody(), true); |
449 | 449 | $this->miscService->log( |
450 | - "initiateRemoteShare result: " . $uniqueId . ' ---- ' . var_export($result, true) |
|
450 | + "initiateRemoteShare result: ".$uniqueId.' ---- '.var_export($result, true) |
|
451 | 451 | ); |
452 | 452 | |
453 | 453 | return true; |
@@ -552,7 +552,7 @@ |
||
552 | 552 | * @param IShare $share |
553 | 553 | * @param $data |
554 | 554 | */ |
555 | - private function assignShareObjectSharesProperties(IShare &$share, $data) { |
|
555 | + private function assignShareObjectSharesProperties(IShare & $share, $data) { |
|
556 | 556 | $shareTime = new \DateTime(); |
557 | 557 | $shareTime->setTimestamp((int)$data['stime']); |
558 | 558 |