@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $this->updateSignatory($signatory, $this->retrieveJson($request), $keyId); |
96 | 96 | } catch (RequestNetworkException $e) { |
97 | 97 | $this->debug('network issue while downloading Signatory', ['request' => $request]); |
98 | - throw new SignatoryException('network issue: ' . $e->getMessage()); |
|
98 | + throw new SignatoryException('network issue: '.$e->getMessage()); |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 | |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | return $host; |
142 | 142 | } |
143 | 143 | |
144 | - throw new InvalidOriginException('cannot retrieve origin from ' . $keyId); |
|
144 | + throw new InvalidOriginException('cannot retrieve origin from '.$keyId); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 |
@@ -63,7 +63,7 @@ |
||
63 | 63 | echo($result); |
64 | 64 | |
65 | 65 | $size = ob_get_length(); |
66 | - header('Content-Length: ' . $size); |
|
66 | + header('Content-Length: '.$size); |
|
67 | 67 | ob_end_flush(); |
68 | 68 | flush(); |
69 | 69 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | * @param array $serializable |
131 | 131 | */ |
132 | 132 | public function emergency(string $message, bool $trace = false, array $serializable = []): void { |
133 | - $this->log(self::$EMERGENCY, '[emergency] ' . $message, $trace, $serializable); |
|
133 | + $this->log(self::$EMERGENCY, '[emergency] '.$message, $trace, $serializable); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | * @param array $serializable |
140 | 140 | */ |
141 | 141 | public function alert(string $message, bool $trace = false, array $serializable = []): void { |
142 | - $this->log(self::$ALERT, '[alert] ' . $message, $trace, $serializable); |
|
142 | + $this->log(self::$ALERT, '[alert] '.$message, $trace, $serializable); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | * @param array $serializable |
149 | 149 | */ |
150 | 150 | public function warning(string $message, bool $trace = false, array $serializable = []): void { |
151 | - $this->log(self::$WARNING, '[warning] ' . $message, $trace, $serializable); |
|
151 | + $this->log(self::$WARNING, '[warning] '.$message, $trace, $serializable); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | /** |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | * @param array $serializable |
158 | 158 | */ |
159 | 159 | public function notice(string $message, bool $trace = false, array $serializable = []): void { |
160 | - $this->log(self::$NOTICE, '[notice] ' . $message, $trace, $serializable); |
|
160 | + $this->log(self::$NOTICE, '[notice] '.$message, $trace, $serializable); |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | /** |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | * @param array $serializable |
166 | 166 | */ |
167 | 167 | public function debug(string $message, array $serializable = []): void { |
168 | - $message = '[debug] ' . $message; |
|
168 | + $message = '[debug] '.$message; |
|
169 | 169 | $debugLevel = (int)$this->appConfig('debug_level'); |
170 | 170 | $this->log($debugLevel, $message, ($this->appConfig('debug_trace') === '1'), $serializable); |
171 | 171 | } |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | if ($trace) { |
183 | 183 | $opts['exception'] = new HintException($message, json_encode($serializable)); |
184 | 184 | } elseif (!empty($serializable)) { |
185 | - $message .= ' -- ' . json_encode($serializable); |
|
185 | + $message .= ' -- '.json_encode($serializable); |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | $this->logger() |
@@ -219,8 +219,8 @@ discard block |
||
219 | 219 | throw new SignatureException('missing elements in \'headers\''); |
220 | 220 | } |
221 | 221 | |
222 | - $target = strtolower($request->getMethod()) . " " . $request->getRequestUri(); |
|
223 | - $estimated = ['(request-target): ' . $target]; |
|
222 | + $target = strtolower($request->getMethod())." ".$request->getRequestUri(); |
|
223 | + $estimated = ['(request-target): '.$target]; |
|
224 | 224 | |
225 | 225 | foreach ($headers as $key) { |
226 | 226 | $value = $request->getHeader($key); |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | throw new SignatureException('empty elements in \'headers\''); |
232 | 232 | } |
233 | 233 | |
234 | - $estimated[] = $key . ': ' . $value; |
|
234 | + $estimated[] = $key.': '.$value; |
|
235 | 235 | } |
236 | 236 | $signedRequest->setClearSignature(implode("\n", $estimated)); |
237 | 237 | } |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | $request = $signedRequest->getOutgoingRequest(); |
304 | 304 | |
305 | 305 | $data = new SimpleDataStore(); |
306 | - $data->s('(request-target)', NCRequest::method($request->getType()) . ' ' . $request->getPath()) |
|
306 | + $data->s('(request-target)', NCRequest::method($request->getType()).' '.$request->getPath()) |
|
307 | 307 | ->sInt('content-length', strlen($signedRequest->getBody())) |
308 | 308 | ->s('date', gmdate($this->dateHeader)) |
309 | 309 | ->s('digest', $signedRequest->getDigest()) |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | foreach ($data->keys() as $element) { |
323 | 323 | try { |
324 | 324 | $value = $data->gItem($element); |
325 | - $signing[] = $element . ': ' . $value; |
|
325 | + $signing[] = $element.': '.$value; |
|
326 | 326 | if ($element !== '(request-target)') { |
327 | 327 | $signedRequest->getOutgoingRequest()->addHeader($element, $value); |
328 | 328 | } |
@@ -355,10 +355,10 @@ discard block |
||
355 | 355 | $headers = array_diff($signedRequest->getSignatureHeader()->keys(), ['(request-target)']); |
356 | 356 | $signatory = $signedRequest->getSignatory(); |
357 | 357 | $signatureElements = [ |
358 | - 'keyId="' . $signatory->getKeyId() . '"', |
|
359 | - 'algorithm="' . $this->getChosenEncryption($signatory) . '"', |
|
360 | - 'headers="' . implode(' ', $headers) . '"', |
|
361 | - 'signature="' . $signedRequest->getSignedSignature() . '"' |
|
358 | + 'keyId="'.$signatory->getKeyId().'"', |
|
359 | + 'algorithm="'.$this->getChosenEncryption($signatory).'"', |
|
360 | + 'headers="'.implode(' ', $headers).'"', |
|
361 | + 'signature="'.$signedRequest->getSignedSignature().'"' |
|
362 | 362 | ]; |
363 | 363 | |
364 | 364 | $signedRequest->getOutgoingRequest()->addHeader('Signature', implode(',', $signatureElements)); |
@@ -253,8 +253,8 @@ discard block |
||
253 | 253 | $qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $probe->getFilterMember()); |
254 | 254 | } |
255 | 255 | |
256 | - $qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc'); |
|
257 | - $qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc'); |
|
256 | + $qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc'); |
|
257 | + $qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc'); |
|
258 | 258 | |
259 | 259 | return $this->getItemsFromRequest($qb); |
260 | 260 | } |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | $qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId, $level); |
280 | 280 | |
281 | 281 | $aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS); |
282 | - $qb->orderBy($aliasMembership . '.inheritance_depth', 'asc'); |
|
282 | + $qb->orderBy($aliasMembership.'.inheritance_depth', 'asc'); |
|
283 | 283 | |
284 | 284 | return $this->getItemsFromRequest($qb); |
285 | 285 | } |
@@ -347,10 +347,10 @@ discard block |
||
347 | 347 | $qb = $this->getMemberSelectSql(); |
348 | 348 | $qb->limitToCircleId($circleId); |
349 | 349 | |
350 | - $qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance')); |
|
350 | + $qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance')); |
|
351 | 351 | |
352 | 352 | return array_map( |
353 | - function (Member $member): string { |
|
353 | + function(Member $member): string { |
|
354 | 354 | return $member->getInstance(); |
355 | 355 | }, $this->getItemsFromRequest($qb) |
356 | 356 | ); |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | */ |
401 | 401 | public function searchFederatedUsers(string $needle): array { |
402 | 402 | $qb = $this->getMemberSelectSql(); |
403 | - $qb->searchInDBField('user_id', '%' . $needle . '%'); |
|
403 | + $qb->searchInDBField('user_id', '%'.$needle.'%'); |
|
404 | 404 | |
405 | 405 | return $this->getItemsFromRequest($qb, true); |
406 | 406 | } |
@@ -80,7 +80,7 @@ |
||
80 | 80 | $qb->generateSelect(self::TABLE_CIRCLE, self::$tables[self::TABLE_CIRCLE], $alias); |
81 | 81 | |
82 | 82 | if (!$single) { |
83 | - $qb->orderBy($alias . '.creation', 'asc'); |
|
83 | + $qb->orderBy($alias.'.creation', 'asc'); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | return $qb; |
@@ -198,10 +198,10 @@ discard block |
||
198 | 198 | $qb->leftJoin( |
199 | 199 | CoreQueryBuilder::REMOTE, self::TABLE_MEMBER, $aliasMember, |
200 | 200 | $expr->andX( |
201 | - $expr->eq($aliasMember . '.circle_id', $qb->createNamedParameter($circle->getSingleId())), |
|
202 | - $expr->eq($aliasMember . '.instance', CoreQueryBuilder::REMOTE . '.instance'), |
|
201 | + $expr->eq($aliasMember.'.circle_id', $qb->createNamedParameter($circle->getSingleId())), |
|
202 | + $expr->eq($aliasMember.'.instance', CoreQueryBuilder::REMOTE.'.instance'), |
|
203 | 203 | $expr->gte( |
204 | - $aliasMember . '.level', |
|
204 | + $aliasMember.'.level', |
|
205 | 205 | $qb->createNamedParameter(Member::LEVEL_MEMBER, IQueryBuilder::PARAM_INT) |
206 | 206 | ) |
207 | 207 | ) |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | |
210 | 210 | $external = $expr->andX(); |
211 | 211 | $external->add($qb->exprLimit('type', RemoteInstance::TYPE_EXTERNAL, '', false)); |
212 | - $external->add($expr->isNotNull($aliasMember . '.instance')); |
|
212 | + $external->add($expr->isNotNull($aliasMember.'.instance')); |
|
213 | 213 | $orX->add($external); |
214 | 214 | } |
215 | 215 |
@@ -86,7 +86,7 @@ |
||
86 | 86 | self::$tables[self::TABLE_MEMBER], |
87 | 87 | CoreQueryBuilder::MEMBER |
88 | 88 | ) |
89 | - ->orderBy(CoreQueryBuilder::MEMBER . '.joined'); |
|
89 | + ->orderBy(CoreQueryBuilder::MEMBER.'.joined'); |
|
90 | 90 | |
91 | 91 | if ($getBasedOn) { |
92 | 92 | $qb->leftJoinBasedOn(CoreQueryBuilder::MEMBER, $initiator); |
@@ -169,10 +169,10 @@ |
||
169 | 169 | return $client->delete($request->getCompleteUrl(), $request->getClientOptions()); |
170 | 170 | case Request::TYPE_GET: |
171 | 171 | return $client->get( |
172 | - $request->getCompleteUrl() . $request->getQueryString(), $request->getClientOptions() |
|
172 | + $request->getCompleteUrl().$request->getQueryString(), $request->getClientOptions() |
|
173 | 173 | ); |
174 | 174 | default: |
175 | - throw new Exception('unknown request type ' . json_encode($request)); |
|
175 | + throw new Exception('unknown request type '.json_encode($request)); |
|
176 | 176 | } |
177 | 177 | } |
178 | 178 | } |