nextcloud / server

apps/theming/composer/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -20,6 +20,6 @@
     );
 }
 
-require_once __DIR__ . '/composer/autoload_real.php';
+require_once __DIR__.'/composer/autoload_real.php';
 
 return ComposerAutoloaderInitTheming::getLoader();

apps/theming/composer/composer/autoload_real.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -26,7 +26,7 @@ 
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInitTheming', 'loadClassLoader'));
 
-        require __DIR__ . '/autoload_static.php';
+        require __DIR__.'/autoload_static.php';
         call_user_func(\Composer\Autoload\ComposerStaticInitTheming::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);

apps/theming/composer/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -370,18 +370,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

apps/theming/composer/composer/InstalledVersions.php

Spacing +7 added lines, -7 removed lines

@@ -158,7 +158,7 @@ 
             return implode(' || ', $ranges);
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -179,7 +179,7 @@ 
             return $installed['versions'][$packageName]['version'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -200,7 +200,7 @@ 
             return $installed['versions'][$packageName]['pretty_version'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -221,7 +221,7 @@ 
             return $installed['versions'][$packageName]['reference'];
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -238,7 +238,7 @@ 
             return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
         }
 
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
     }
 
     /**
@@ -267,7 +267,7 @@ 
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = include __DIR__ . '/installed.php';
+                self::$installed = include __DIR__.'/installed.php';
             } else {
                 self::$installed = array();
             }
@@ -343,7 +343,7 @@ 
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
                 /** @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 */
-                $required = require __DIR__ . '/installed.php';
+                $required = require __DIR__.'/installed.php';
                 self::$installed = $required;
             } else {
                 self::$installed = array();

lib/private/Files/Search/QueryOptimizer/QueryOptimizerStep.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 * @param ISearchOperator $operator
 	 * @return void
 	 */
-	public function processOperator(ISearchOperator &$operator) {
+	public function processOperator(ISearchOperator & $operator) {
 		if ($operator instanceof ISearchBinaryOperator) {
 			foreach ($operator->getArguments() as $argument) {
 				$this->processOperator($argument);

apps/encryption/lib/Recovery.php

Spacing +7 added lines, -7 removed lines

@@ -123,7 +123,7 @@ 
 		$encryptedRecoveryKey = $this->crypt->encryptPrivateKey($decryptedRecoveryKey, $newPassword);
 		$header = $this->crypt->generateHeader();
 		if ($encryptedRecoveryKey) {
-			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header . $encryptedRecoveryKey);
+			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header.$encryptedRecoveryKey);
 			return true;
 		}
 		return false;
@@ -184,9 +184,9 @@ 
 				$value);
 
 			if ($value === '1') {
-				$this->addRecoveryKeys('/' . $this->user->getUID() . '/files/');
+				$this->addRecoveryKeys('/'.$this->user->getUID().'/files/');
 			} else {
-				$this->removeRecoveryKeys('/' . $this->user->getUID() . '/files/');
+				$this->removeRecoveryKeys('/'.$this->user->getUID().'/files/');
 			}
 
 			return true;
@@ -203,7 +203,7 @@ 
 		foreach ($dirContent as $item) {
 			$filePath = $item->getPath();
 			if ($item['type'] === 'dir') {
-				$this->addRecoveryKeys($filePath . '/');
+				$this->addRecoveryKeys($filePath.'/');
 			} else {
 				$fileKey = $this->keyManager->getFileKey($filePath, $this->user->getUID(), null);
 				if (!empty($fileKey)) {
@@ -233,7 +233,7 @@ 
 		foreach ($dirContent as $item) {
 			$filePath = $item->getPath();
 			if ($item['type'] === 'dir') {
-				$this->removeRecoveryKeys($filePath . '/');
+				$this->removeRecoveryKeys($filePath.'/');
 			} else {
 				$this->keyManager->deleteShareKey($filePath, $this->keyManager->getRecoveryKeyId());
 			}
@@ -248,7 +248,7 @@ 
 
 		$privateKey = $this->crypt->decryptPrivateKey($encryptedKey, $recoveryPassword);
 		if ($privateKey !== false) {
-			$this->recoverAllFiles('/' . $user . '/files/', $privateKey, $user);
+			$this->recoverAllFiles('/'.$user.'/files/', $privateKey, $user);
 		}
 	}
 
@@ -262,7 +262,7 @@ 
 			// Get relative path from encryption/keyfiles
 			$filePath = $item->getPath();
 			if ($this->view->is_dir($filePath)) {
-				$this->recoverAllFiles($filePath . '/', $privateKey, $uid);
+				$this->recoverAllFiles($filePath.'/', $privateKey, $uid);
 			} else {
 				$this->recoverFile($filePath, $privateKey, $uid);
 			}

lib/private/Files/Storage/LocalTempFileTrait.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	/** @var array<string,string|false> */
 	protected array $cachedFiles = [];
 
-	protected function getCachedFile(string $path): string|false {
+	protected function getCachedFile(string $path): string | false {
 		if (!isset($this->cachedFiles[$path])) {
 			$this->cachedFiles[$path] = $this->toTmpFile($path);
 		}
@@ -52,7 +52,7 @@ 
 		unset($this->cachedFiles[$path]);
 	}
 
-	protected function toTmpFile(string $path): string|false { //no longer in the storage api, still useful here
+	protected function toTmpFile(string $path): string | false { //no longer in the storage api, still useful here
 		$source = $this->fopen($path, 'r');
 		if (!$source) {
 			return false;

lib/private/Repair/MoveUpdaterStepFile.php

Spacing +4 added lines, -4 removed lines

@@ -42,19 +42,19 @@
 	}
 
 	public function run(IOutput $output) {
-		$updateDir = $this->config->getSystemValue('updatedirectory', null) ?? $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+		$updateDir = $this->config->getSystemValue('updatedirectory', null) ?? $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
 		$instanceId = $this->config->getSystemValueString('instanceid');
 
 		if (empty($instanceId)) {
 			return;
 		}
 
-		$updaterFolderPath = $updateDir . '/updater-' . $instanceId;
-		$stepFile = $updaterFolderPath . '/.step';
+		$updaterFolderPath = $updateDir.'/updater-'.$instanceId;
+		$stepFile = $updaterFolderPath.'/.step';
 		if (file_exists($stepFile)) {
 			$output->info('.step file exists');
 
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
+			$previousStepFile = $updaterFolderPath.'/.step-previous-update';
 
 			// cleanup
 			if (file_exists($previousStepFile)) {

lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php

Spacing +8 added lines, -8 removed lines

@@ -39,17 +39,17 @@
 		}
 
 		$excludedFolders = [
-			rtrim($root . '/data', '/'),
-			rtrim($root . '/themes', '/'),
-			rtrim($root . '/config', '/'),
-			rtrim($root . '/apps', '/'),
-			rtrim($root . '/assets', '/'),
-			rtrim($root . '/lost+found', '/'),
+			rtrim($root.'/data', '/'),
+			rtrim($root.'/themes', '/'),
+			rtrim($root.'/config', '/'),
+			rtrim($root.'/apps', '/'),
+			rtrim($root.'/assets', '/'),
+			rtrim($root.'/lost+found', '/'),
 			// Ignore folders generated by updater since the updater is replaced
 			// after the integrity check is run.
 			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
-			rtrim($root . '/updater', '/'),
-			rtrim($root . '/_oc_upgrade', '/'),
+			rtrim($root.'/updater', '/'),
+			rtrim($root.'/_oc_upgrade', '/'),
 		];
 		$customDataDir = \OC::$server->getConfig()->getSystemValueString('datadirectory', '');
 		if ($customDataDir !== '') {