@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | public static function loadClassLoader($class) |
10 | 10 | { |
11 | 11 | if ('Composer\Autoload\ClassLoader' === $class) { |
12 | - require __DIR__ . '/ClassLoader.php'; |
|
12 | + require __DIR__.'/ClassLoader.php'; |
|
13 | 13 | } |
14 | 14 | } |
15 | 15 | |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); |
27 | 27 | spl_autoload_unregister(array('ComposerAutoloaderInitTheming', 'loadClassLoader')); |
28 | 28 | |
29 | - require __DIR__ . '/autoload_static.php'; |
|
29 | + require __DIR__.'/autoload_static.php'; |
|
30 | 30 | call_user_func(\Composer\Autoload\ComposerStaticInitTheming::getInitializer($loader)); |
31 | 31 | |
32 | 32 | $loader->setClassMapAuthoritative(true); |
@@ -370,18 +370,18 @@ discard block |
||
370 | 370 | private function findFileWithExtension($class, $ext) |
371 | 371 | { |
372 | 372 | // PSR-4 lookup |
373 | - $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; |
|
373 | + $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext; |
|
374 | 374 | |
375 | 375 | $first = $class[0]; |
376 | 376 | if (isset($this->prefixLengthsPsr4[$first])) { |
377 | 377 | $subPath = $class; |
378 | 378 | while (false !== $lastPos = strrpos($subPath, '\\')) { |
379 | 379 | $subPath = substr($subPath, 0, $lastPos); |
380 | - $search = $subPath . '\\'; |
|
380 | + $search = $subPath.'\\'; |
|
381 | 381 | if (isset($this->prefixDirsPsr4[$search])) { |
382 | - $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); |
|
382 | + $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1); |
|
383 | 383 | foreach ($this->prefixDirsPsr4[$search] as $dir) { |
384 | - if (file_exists($file = $dir . $pathEnd)) { |
|
384 | + if (file_exists($file = $dir.$pathEnd)) { |
|
385 | 385 | return $file; |
386 | 386 | } |
387 | 387 | } |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | |
392 | 392 | // PSR-4 fallback dirs |
393 | 393 | foreach ($this->fallbackDirsPsr4 as $dir) { |
394 | - if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { |
|
394 | + if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) { |
|
395 | 395 | return $file; |
396 | 396 | } |
397 | 397 | } |
@@ -403,14 +403,14 @@ discard block |
||
403 | 403 | . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR); |
404 | 404 | } else { |
405 | 405 | // PEAR-like class name |
406 | - $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext; |
|
406 | + $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext; |
|
407 | 407 | } |
408 | 408 | |
409 | 409 | if (isset($this->prefixesPsr0[$first])) { |
410 | 410 | foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { |
411 | 411 | if (0 === strpos($class, $prefix)) { |
412 | 412 | foreach ($dirs as $dir) { |
413 | - if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { |
|
413 | + if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) { |
|
414 | 414 | return $file; |
415 | 415 | } |
416 | 416 | } |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | |
421 | 421 | // PSR-0 fallback dirs |
422 | 422 | foreach ($this->fallbackDirsPsr0 as $dir) { |
423 | - if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { |
|
423 | + if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) { |
|
424 | 424 | return $file; |
425 | 425 | } |
426 | 426 | } |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | return implode(' || ', $ranges); |
159 | 159 | } |
160 | 160 | |
161 | - throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); |
|
161 | + throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed'); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | /** |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | return $installed['versions'][$packageName]['version']; |
180 | 180 | } |
181 | 181 | |
182 | - throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); |
|
182 | + throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed'); |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | /** |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | return $installed['versions'][$packageName]['pretty_version']; |
201 | 201 | } |
202 | 202 | |
203 | - throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); |
|
203 | + throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed'); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | /** |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | return $installed['versions'][$packageName]['reference']; |
222 | 222 | } |
223 | 223 | |
224 | - throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); |
|
224 | + throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed'); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | /** |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null; |
239 | 239 | } |
240 | 240 | |
241 | - throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); |
|
241 | + throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed'); |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | /** |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | // only require the installed.php file if this file is loaded from its dumped location, |
268 | 268 | // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 |
269 | 269 | if (substr(__DIR__, -8, 1) !== 'C') { |
270 | - self::$installed = include __DIR__ . '/installed.php'; |
|
270 | + self::$installed = include __DIR__.'/installed.php'; |
|
271 | 271 | } else { |
272 | 272 | self::$installed = array(); |
273 | 273 | } |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 |
344 | 344 | if (substr(__DIR__, -8, 1) !== 'C') { |
345 | 345 | /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */ |
346 | - $required = require __DIR__ . '/installed.php'; |
|
346 | + $required = require __DIR__.'/installed.php'; |
|
347 | 347 | self::$installed = $required; |
348 | 348 | } else { |
349 | 349 | self::$installed = array(); |
@@ -47,7 +47,7 @@ |
||
47 | 47 | * @param ISearchOperator $operator |
48 | 48 | * @return void |
49 | 49 | */ |
50 | - public function processOperator(ISearchOperator &$operator) { |
|
50 | + public function processOperator(ISearchOperator & $operator) { |
|
51 | 51 | if ($operator instanceof ISearchBinaryOperator) { |
52 | 52 | foreach ($operator->getArguments() as $argument) { |
53 | 53 | $this->processOperator($argument); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | /** @var array<string,string|false> */ |
39 | 39 | protected array $cachedFiles = []; |
40 | 40 | |
41 | - protected function getCachedFile(string $path): string|false { |
|
41 | + protected function getCachedFile(string $path): string | false { |
|
42 | 42 | if (!isset($this->cachedFiles[$path])) { |
43 | 43 | $this->cachedFiles[$path] = $this->toTmpFile($path); |
44 | 44 | } |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | unset($this->cachedFiles[$path]); |
53 | 53 | } |
54 | 54 | |
55 | - protected function toTmpFile(string $path): string|false { //no longer in the storage api, still useful here |
|
55 | + protected function toTmpFile(string $path): string | false { //no longer in the storage api, still useful here |
|
56 | 56 | $source = $this->fopen($path, 'r'); |
57 | 57 | if (!$source) { |
58 | 58 | return false; |
@@ -42,19 +42,19 @@ |
||
42 | 42 | } |
43 | 43 | |
44 | 44 | public function run(IOutput $output) { |
45 | - $updateDir = $this->config->getSystemValue('updatedirectory', null) ?? $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data'); |
|
45 | + $updateDir = $this->config->getSystemValue('updatedirectory', null) ?? $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data'); |
|
46 | 46 | $instanceId = $this->config->getSystemValueString('instanceid'); |
47 | 47 | |
48 | 48 | if (empty($instanceId)) { |
49 | 49 | return; |
50 | 50 | } |
51 | 51 | |
52 | - $updaterFolderPath = $updateDir . '/updater-' . $instanceId; |
|
53 | - $stepFile = $updaterFolderPath . '/.step'; |
|
52 | + $updaterFolderPath = $updateDir.'/updater-'.$instanceId; |
|
53 | + $stepFile = $updaterFolderPath.'/.step'; |
|
54 | 54 | if (file_exists($stepFile)) { |
55 | 55 | $output->info('.step file exists'); |
56 | 56 | |
57 | - $previousStepFile = $updaterFolderPath . '/.step-previous-update'; |
|
57 | + $previousStepFile = $updaterFolderPath.'/.step-previous-update'; |
|
58 | 58 | |
59 | 59 | // cleanup |
60 | 60 | if (file_exists($previousStepFile)) { |
@@ -39,17 +39,17 @@ |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | $excludedFolders = [ |
42 | - rtrim($root . '/data', '/'), |
|
43 | - rtrim($root . '/themes', '/'), |
|
44 | - rtrim($root . '/config', '/'), |
|
45 | - rtrim($root . '/apps', '/'), |
|
46 | - rtrim($root . '/assets', '/'), |
|
47 | - rtrim($root . '/lost+found', '/'), |
|
42 | + rtrim($root.'/data', '/'), |
|
43 | + rtrim($root.'/themes', '/'), |
|
44 | + rtrim($root.'/config', '/'), |
|
45 | + rtrim($root.'/apps', '/'), |
|
46 | + rtrim($root.'/assets', '/'), |
|
47 | + rtrim($root.'/lost+found', '/'), |
|
48 | 48 | // Ignore folders generated by updater since the updater is replaced |
49 | 49 | // after the integrity check is run. |
50 | 50 | // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846 |
51 | - rtrim($root . '/updater', '/'), |
|
52 | - rtrim($root . '/_oc_upgrade', '/'), |
|
51 | + rtrim($root.'/updater', '/'), |
|
52 | + rtrim($root.'/_oc_upgrade', '/'), |
|
53 | 53 | ]; |
54 | 54 | $customDataDir = \OC::$server->getConfig()->getSystemValueString('datadirectory', ''); |
55 | 55 | if ($customDataDir !== '') { |
@@ -51,9 +51,9 @@ |
||
51 | 51 | */ |
52 | 52 | public function resynchronizeDatabaseSequences(Connection $conn) { |
53 | 53 | $databaseName = $conn->getDatabase(); |
54 | - $conn->getConfiguration()->setSchemaAssetsFilter(function ($asset) { |
|
54 | + $conn->getConfiguration()->setSchemaAssetsFilter(function($asset) { |
|
55 | 55 | /** @var string|AbstractAsset $asset */ |
56 | - $filterExpression = '/^' . preg_quote($this->config->getSystemValueString('dbtableprefix', 'oc_')) . '/'; |
|
56 | + $filterExpression = '/^'.preg_quote($this->config->getSystemValueString('dbtableprefix', 'oc_')).'/'; |
|
57 | 57 | if ($asset instanceof AbstractAsset) { |
58 | 58 | return preg_match($filterExpression, $asset->getName()) !== false; |
59 | 59 | } |
@@ -54,15 +54,15 @@ |
||
54 | 54 | public function getMountsForUser(IUser $user, IStorageFactory $loader) { |
55 | 55 | $cacheBaseDir = $this->config->getSystemValueString('cache_path', ''); |
56 | 56 | if ($cacheBaseDir !== '') { |
57 | - $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID(); |
|
57 | + $cacheDir = rtrim($cacheBaseDir, '/').'/'.$user->getUID(); |
|
58 | 58 | if (!file_exists($cacheDir)) { |
59 | 59 | mkdir($cacheDir, 0770, true); |
60 | - mkdir($cacheDir . '/uploads', 0770, true); |
|
60 | + mkdir($cacheDir.'/uploads', 0770, true); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | return [ |
64 | - new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir], $loader, null, null, self::class), |
|
65 | - new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads'], $loader, null, null, self::class) |
|
64 | + new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/cache', ['datadir' => $cacheDir], $loader, null, null, self::class), |
|
65 | + new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/uploads', ['datadir' => $cacheDir.'/uploads'], $loader, null, null, self::class) |
|
66 | 66 | ]; |
67 | 67 | } else { |
68 | 68 | return []; |