@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $this->appData = $appData; |
64 | 64 | $this->urlGenerator = $urlGenerator; |
65 | 65 | $this->cacheFactory = $cacheFactory; |
66 | - $this->depsCache = $this->cacheFactory->createDistributed('JS-' . md5($this->urlGenerator->getBaseUrl())); |
|
66 | + $this->depsCache = $this->cacheFactory->createDistributed('JS-'.md5($this->urlGenerator->getBaseUrl())); |
|
67 | 67 | $this->config = $config; |
68 | 68 | $this->logger = $logger; |
69 | 69 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | return false; |
80 | 80 | } |
81 | 81 | |
82 | - $path = explode('/', $root . '/' . $file); |
|
82 | + $path = explode('/', $root.'/'.$file); |
|
83 | 83 | |
84 | 84 | $fileName = array_pop($path); |
85 | 85 | $path = implode('/', $path); |
@@ -109,9 +109,9 @@ discard block |
||
109 | 109 | return false; |
110 | 110 | } |
111 | 111 | |
112 | - $fileName = $fileName . '.deps'; |
|
112 | + $fileName = $fileName.'.deps'; |
|
113 | 113 | try { |
114 | - $deps = $this->depsCache->get($folder->getName() . '-' . $fileName); |
|
114 | + $deps = $this->depsCache->get($folder->getName().'-'.$fileName); |
|
115 | 115 | $fromCache = true; |
116 | 116 | if ($deps === null || $deps === '') { |
117 | 117 | $fromCache = false; |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | // check again |
123 | 123 | if ($deps === null || $deps === '') { |
124 | - $this->logger->info('JSCombiner: deps file empty: ' . $fileName); |
|
124 | + $this->logger->info('JSCombiner: deps file empty: '.$fileName); |
|
125 | 125 | return false; |
126 | 126 | } |
127 | 127 | |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | } |
139 | 139 | |
140 | 140 | if ($fromCache === false) { |
141 | - $this->depsCache->set($folder->getName() . '-' . $fileName, json_encode($deps)); |
|
141 | + $this->depsCache->set($folder->getName().'-'.$fileName, json_encode($deps)); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | return true; |
@@ -155,17 +155,17 @@ discard block |
||
155 | 155 | */ |
156 | 156 | protected function cache($path, $fileName, ISimpleFolder $folder) { |
157 | 157 | $deps = []; |
158 | - $fullPath = $path . '/' . $fileName; |
|
158 | + $fullPath = $path.'/'.$fileName; |
|
159 | 159 | $data = json_decode(file_get_contents($fullPath)); |
160 | 160 | $deps[$fullPath] = filemtime($fullPath); |
161 | 161 | |
162 | 162 | $res = ''; |
163 | 163 | foreach ($data as $file) { |
164 | - $filePath = $path . '/' . $file; |
|
164 | + $filePath = $path.'/'.$file; |
|
165 | 165 | |
166 | 166 | if (is_file($filePath)) { |
167 | 167 | $res .= file_get_contents($filePath); |
168 | - $res .= PHP_EOL . PHP_EOL; |
|
168 | + $res .= PHP_EOL.PHP_EOL; |
|
169 | 169 | $deps[$filePath] = filemtime($filePath); |
170 | 170 | } |
171 | 171 | } |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | $cachedfile = $folder->newFile($fileName); |
178 | 178 | } |
179 | 179 | |
180 | - $depFileName = $fileName . '.deps'; |
|
180 | + $depFileName = $fileName.'.deps'; |
|
181 | 181 | try { |
182 | 182 | $depFile = $folder->getFile($depFileName); |
183 | 183 | } catch (NotFoundException $e) { |
@@ -185,21 +185,21 @@ discard block |
||
185 | 185 | } |
186 | 186 | |
187 | 187 | try { |
188 | - $gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz |
|
188 | + $gzipFile = $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz |
|
189 | 189 | } catch (NotFoundException $e) { |
190 | - $gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz |
|
190 | + $gzipFile = $folder->newFile($fileName.'.gzip'); # Safari doesn't like .gz |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | try { |
194 | 194 | $cachedfile->putContent($res); |
195 | 195 | $deps = json_encode($deps); |
196 | 196 | $depFile->putContent($deps); |
197 | - $this->depsCache->set($folder->getName() . '-' . $depFileName, $deps); |
|
197 | + $this->depsCache->set($folder->getName().'-'.$depFileName, $deps); |
|
198 | 198 | $gzipFile->putContent(gzencode($res, 9)); |
199 | - $this->logger->debug('JSCombiner: successfully cached: ' . $fileName); |
|
199 | + $this->logger->debug('JSCombiner: successfully cached: '.$fileName); |
|
200 | 200 | return true; |
201 | - } catch (NotPermittedException|NotFoundException $e) { |
|
202 | - $this->logger->error('JSCombiner: unable to cache: ' . $fileName); |
|
201 | + } catch (NotPermittedException | NotFoundException $e) { |
|
202 | + $this->logger->error('JSCombiner: unable to cache: '.$fileName); |
|
203 | 203 | return false; |
204 | 204 | } |
205 | 205 | } |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | */ |
225 | 225 | public function getContent($root, $file) { |
226 | 226 | /** @var array $data */ |
227 | - $data = json_decode(file_get_contents($root . '/' . $file)); |
|
227 | + $data = json_decode(file_get_contents($root.'/'.$file)); |
|
228 | 228 | if (!is_array($data)) { |
229 | 229 | return []; |
230 | 230 | } |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | |
236 | 236 | $result = []; |
237 | 237 | foreach ($data as $f) { |
238 | - $result[] = $path . '/' . $f; |
|
238 | + $result[] = $path.'/'.$f; |
|
239 | 239 | } |
240 | 240 | |
241 | 241 | return $result; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | if ($path === '') { |
80 | 80 | return $this->getRoot(); |
81 | 81 | } else { |
82 | - return $this->getRoot() . '/' . ltrim($path, '/'); |
|
82 | + return $this->getRoot().'/'.ltrim($path, '/'); |
|
83 | 83 | } |
84 | 84 | } |
85 | 85 | |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $rootLength = strlen($root) + 1; |
99 | 99 | if ($path === $root) { |
100 | 100 | return ''; |
101 | - } elseif (substr($path, 0, $rootLength) === $root . '/') { |
|
101 | + } elseif (substr($path, 0, $rootLength) === $root.'/') { |
|
102 | 102 | return substr($path, $rootLength); |
103 | 103 | } else { |
104 | 104 | return null; |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR, |
318 | 318 | [ |
319 | 319 | new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'path', $this->getGetUnjailedRoot()), |
320 | - new SearchComparison(ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE, 'path', SearchComparison::escapeLikeParameter($this->getGetUnjailedRoot()) . '/%'), |
|
320 | + new SearchComparison(ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE, 'path', SearchComparison::escapeLikeParameter($this->getGetUnjailedRoot()).'/%'), |
|
321 | 321 | ], |
322 | 322 | ) |
323 | 323 | ] |
@@ -26,7 +26,7 @@ |
||
26 | 26 | </div> |
27 | 27 | </fieldset> |
28 | 28 | <fieldset> |
29 | - <input type="submit" value="<?php p($l->t('Save'));?>"> |
|
29 | + <input type="submit" value="<?php p($l->t('Save')); ?>"> |
|
30 | 30 | </fieldset> |
31 | 31 | </form> |
32 | 32 | </div> |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | |
189 | 189 | private function filterTrace(array $trace) { |
190 | 190 | $sensitiveValues = []; |
191 | - $trace = array_map(function (array $traceLine) use (&$sensitiveValues) { |
|
191 | + $trace = array_map(function(array $traceLine) use (&$sensitiveValues) { |
|
192 | 192 | $className = $traceLine['class'] ?? ''; |
193 | 193 | if ($className && isset($this->methodsWithSensitiveParametersByClass[$className]) |
194 | 194 | && in_array($traceLine['function'], $this->methodsWithSensitiveParametersByClass[$className], true)) { |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | } |
202 | 202 | return $traceLine; |
203 | 203 | }, $trace); |
204 | - return array_map(function (array $traceLine) use ($sensitiveValues) { |
|
204 | + return array_map(function(array $traceLine) use ($sensitiveValues) { |
|
205 | 205 | if (isset($traceLine['args'])) { |
206 | 206 | $traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues); |
207 | 207 | } |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | } |
224 | 224 | |
225 | 225 | private function encodeTrace($trace) { |
226 | - $trace = array_map(function (array $line) { |
|
226 | + $trace = array_map(function(array $line) { |
|
227 | 227 | if (isset($line['args'])) { |
228 | 228 | $line['args'] = array_map([$this, 'encodeArg'], $line['args']); |
229 | 229 | } |
@@ -241,9 +241,9 @@ discard block |
||
241 | 241 | ]; |
242 | 242 | } |
243 | 243 | |
244 | - $objectInfo = [ '__class__' => get_class($arg) ]; |
|
244 | + $objectInfo = ['__class__' => get_class($arg)]; |
|
245 | 245 | $objectVars = get_object_vars($arg); |
246 | - return array_map(function ($arg) use ($nestingLevel) { |
|
246 | + return array_map(function($arg) use ($nestingLevel) { |
|
247 | 247 | return $this->encodeArg($arg, $nestingLevel - 1); |
248 | 248 | }, array_merge($objectInfo, $objectVars)); |
249 | 249 | } |
@@ -254,14 +254,14 @@ discard block |
||
254 | 254 | } |
255 | 255 | |
256 | 256 | // Only log the first 5 elements of an array unless we are on debug |
257 | - if ((int)$this->systemConfig->getValue('loglevel', 2) !== 0) { |
|
257 | + if ((int) $this->systemConfig->getValue('loglevel', 2) !== 0) { |
|
258 | 258 | $elemCount = count($arg); |
259 | 259 | if ($elemCount > 5) { |
260 | 260 | $arg = array_slice($arg, 0, 5); |
261 | - $arg[] = 'And ' . ($elemCount - 5) . ' more entries, set log level to debug to see all entries'; |
|
261 | + $arg[] = 'And '.($elemCount - 5).' more entries, set log level to debug to see all entries'; |
|
262 | 262 | } |
263 | 263 | } |
264 | - return array_map(function ($e) use ($nestingLevel) { |
|
264 | + return array_map(function($e) use ($nestingLevel) { |
|
265 | 265 | return $this->encodeArg($e, $nestingLevel - 1); |
266 | 266 | }, $arg); |
267 | 267 | } |
@@ -167,7 +167,7 @@ |
||
167 | 167 | * @return bool |
168 | 168 | */ |
169 | 169 | public function isFlagSet(int $flag): bool { |
170 | - return (bool)($this->flags & $flag); |
|
170 | + return (bool) ($this->flags & $flag); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | /** |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $uid = $input->getArgument('uid'); |
118 | 118 | $user = $this->userManager->get($uid); |
119 | 119 | if (!$user) { |
120 | - throw new \InvalidArgumentException('The user "' . $uid . '" does not exist.'); |
|
120 | + throw new \InvalidArgumentException('The user "'.$uid.'" does not exist.'); |
|
121 | 121 | } |
122 | 122 | // normalize uid |
123 | 123 | $input->setArgument('uid', $user->getUID()); |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | try { |
156 | 156 | $this->checkInput($input); |
157 | 157 | } catch (\InvalidArgumentException $e) { |
158 | - $output->writeln('<error>' . $e->getMessage() . '</error>'); |
|
158 | + $output->writeln('<error>'.$e->getMessage().'</error>'); |
|
159 | 159 | return 1; |
160 | 160 | } |
161 | 161 | |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | $value = $this->config->getUserValue($uid, $app, $key, null); |
168 | 168 | if ($input->getArgument('value') !== null) { |
169 | 169 | if ($input->hasParameterOption('--update-only') && $value === null) { |
170 | - $output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>'); |
|
170 | + $output->writeln('<error>The setting does not exist for user "'.$uid.'".</error>'); |
|
171 | 171 | return 1; |
172 | 172 | } |
173 | 173 | |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | return 0; |
198 | 198 | } elseif ($input->hasParameterOption('--delete')) { |
199 | 199 | if ($input->hasParameterOption('--error-if-not-exists') && $value === null) { |
200 | - $output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>'); |
|
200 | + $output->writeln('<error>The setting does not exist for user "'.$uid.'".</error>'); |
|
201 | 201 | return 1; |
202 | 202 | } |
203 | 203 | |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | $output->writeln($user->getDisplayName()); |
230 | 230 | return 0; |
231 | 231 | } |
232 | - $output->writeln('<error>The setting does not exist for user "' . $uid . '".</error>'); |
|
232 | + $output->writeln('<error>The setting does not exist for user "'.$uid.'".</error>'); |
|
233 | 233 | return 1; |
234 | 234 | } |
235 | 235 | } else { |
@@ -69,8 +69,8 @@ |
||
69 | 69 | 'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure', |
70 | 70 | 'statuscode' => $this->getOCSStatus(), |
71 | 71 | 'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage ?? '', |
72 | - 'totalitems' => (string)($this->itemsCount ?? ''), |
|
73 | - 'itemsperpage' => (string)($this->itemsPerPage ?? ''), |
|
72 | + 'totalitems' => (string) ($this->itemsCount ?? ''), |
|
73 | + 'itemsperpage' => (string) ($this->itemsPerPage ?? ''), |
|
74 | 74 | ]; |
75 | 75 | |
76 | 76 | return $this->renderResult($meta); |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | $this->logger = $logger; |
138 | 138 | } |
139 | 139 | |
140 | - public function for(string $appId): IRegistrationContext { |
|
140 | + public function for (string $appId): IRegistrationContext { |
|
141 | 141 | return new class($appId, $this) implements IRegistrationContext { |
142 | 142 | /** @var string */ |
143 | 143 | private $appId; |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | ->getContainer() |
480 | 480 | ->registerCapability($registration->getService()); |
481 | 481 | } catch (Throwable $e) { |
482 | - $this->logger->error("Error during capability registration of $appId: " . $e->getMessage(), [ |
|
482 | + $this->logger->error("Error during capability registration of $appId: ".$e->getMessage(), [ |
|
483 | 483 | 'exception' => $e, |
484 | 484 | ]); |
485 | 485 | } |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | $registry->registerLazy($registration->getService()); |
496 | 496 | } catch (Throwable $e) { |
497 | 497 | $appId = $registration->getAppId(); |
498 | - $this->logger->error("Error during crash reporter registration of $appId: " . $e->getMessage(), [ |
|
498 | + $this->logger->error("Error during crash reporter registration of $appId: ".$e->getMessage(), [ |
|
499 | 499 | 'exception' => $e, |
500 | 500 | ]); |
501 | 501 | } |
@@ -511,7 +511,7 @@ discard block |
||
511 | 511 | $dashboardManager->lazyRegisterWidget($panel->getService(), $panel->getAppId()); |
512 | 512 | } catch (Throwable $e) { |
513 | 513 | $appId = $panel->getAppId(); |
514 | - $this->logger->error("Error during dashboard registration of $appId: " . $e->getMessage(), [ |
|
514 | + $this->logger->error("Error during dashboard registration of $appId: ".$e->getMessage(), [ |
|
515 | 515 | 'exception' => $e, |
516 | 516 | ]); |
517 | 517 | } |
@@ -528,7 +528,7 @@ discard block |
||
528 | 528 | ); |
529 | 529 | } catch (Throwable $e) { |
530 | 530 | $appId = $registration->getAppId(); |
531 | - $this->logger->error("Error during event listener registration of $appId: " . $e->getMessage(), [ |
|
531 | + $this->logger->error("Error during event listener registration of $appId: ".$e->getMessage(), [ |
|
532 | 532 | 'exception' => $e, |
533 | 533 | ]); |
534 | 534 | } |
@@ -561,7 +561,7 @@ discard block |
||
561 | 561 | $registration->isShared() |
562 | 562 | ); |
563 | 563 | } catch (Throwable $e) { |
564 | - $this->logger->error("Error during service registration of $appId: " . $e->getMessage(), [ |
|
564 | + $this->logger->error("Error during service registration of $appId: ".$e->getMessage(), [ |
|
565 | 565 | 'exception' => $e, |
566 | 566 | ]); |
567 | 567 | } |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | $registration->getTarget() |
586 | 586 | ); |
587 | 587 | } catch (Throwable $e) { |
588 | - $this->logger->error("Error during service alias registration of $appId: " . $e->getMessage(), [ |
|
588 | + $this->logger->error("Error during service alias registration of $appId: ".$e->getMessage(), [ |
|
589 | 589 | 'exception' => $e, |
590 | 590 | ]); |
591 | 591 | } |
@@ -609,7 +609,7 @@ discard block |
||
609 | 609 | $registration->getValue() |
610 | 610 | ); |
611 | 611 | } catch (Throwable $e) { |
612 | - $this->logger->error("Error during service parameter registration of $appId: " . $e->getMessage(), [ |
|
612 | + $this->logger->error("Error during service parameter registration of $appId: ".$e->getMessage(), [ |
|
613 | 613 | 'exception' => $e, |
614 | 614 | ]); |
615 | 615 | } |
@@ -55,7 +55,7 @@ |
||
55 | 55 | } |
56 | 56 | |
57 | 57 | $providers = $this->manager->getDiscoverableProviders(); |
58 | - $jsonProviders = array_map(static function (IDiscoverableReferenceProvider $provider) { |
|
58 | + $jsonProviders = array_map(static function(IDiscoverableReferenceProvider $provider) { |
|
59 | 59 | return $provider->jsonSerialize(); |
60 | 60 | }, $providers); |
61 | 61 | $this->initialStateService->provideInitialState('core', 'reference-provider-list', $jsonProviders); |