nextcloud / server

tests/lib/InstallerTest.php

Spacing +13 added lines, -13 removed lines

@@ -103,7 +103,7 @@ 
 		);
 
 		// Extract app
-		$pathOfTestApp = __DIR__ . '/../data/testapp.zip';
+		$pathOfTestApp = __DIR__.'/../data/testapp.zip';
 		$tar = new ZIP($pathOfTestApp);
 		$tar->extract($installer->getInstallPath());
 
@@ -342,7 +342,7 @@ 
 			->method('get')
 			->willReturn($appArray);
 		$realTmpFile = Server::get(ITempManager::class)->getTemporaryFile('.tar.gz');
-		copy(__DIR__ . '/../data/testapp.tar.gz', $realTmpFile);
+		copy(__DIR__.'/../data/testapp.tar.gz', $realTmpFile);
 		$this->tempManager
 			->expects($this->once())
 			->method('getTemporaryFile')
@@ -420,14 +420,14 @@ 
 			->method('get')
 			->willReturn($appArray);
 		$realTmpFile = Server::get(ITempManager::class)->getTemporaryFile('.tar.gz');
-		copy(__DIR__ . '/../data/testapp1.tar.gz', $realTmpFile);
+		copy(__DIR__.'/../data/testapp1.tar.gz', $realTmpFile);
 		$this->tempManager
 			->expects($this->once())
 			->method('getTemporaryFile')
 			->with('.tar.gz')
 			->willReturn($realTmpFile);
 		$realTmpFolder = Server::get(ITempManager::class)->getTemporaryFolder();
-		mkdir($realTmpFolder . '/testfolder');
+		mkdir($realTmpFolder.'/testfolder');
 		$this->tempManager
 			->expects($this->once())
 			->method('getTemporaryFolder')
@@ -504,7 +504,7 @@ 
 			->method('get')
 			->willReturn($appArray);
 		$realTmpFile = Server::get(ITempManager::class)->getTemporaryFile('.tar.gz');
-		copy(__DIR__ . '/../data/testapp1.tar.gz', $realTmpFile);
+		copy(__DIR__.'/../data/testapp1.tar.gz', $realTmpFile);
 		$this->tempManager
 			->expects($this->once())
 			->method('getTemporaryFile')
@@ -583,7 +583,7 @@ 
 			->method('get')
 			->willReturn($appArray);
 		$realTmpFile = Server::get(ITempManager::class)->getTemporaryFile('.tar.gz');
-		copy(__DIR__ . '/../data/testapp.tar.gz', $realTmpFile);
+		copy(__DIR__.'/../data/testapp.tar.gz', $realTmpFile);
 		$this->tempManager
 			->expects($this->once())
 			->method('getTemporaryFile')
@@ -607,8 +607,8 @@ 
 		$installer = $this->getInstaller();
 		$installer->downloadApp('testapp');
 
-		$this->assertTrue(file_exists(__DIR__ . '/../../apps/testapp/appinfo/info.xml'));
-		$this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
+		$this->assertTrue(file_exists(__DIR__.'/../../apps/testapp/appinfo/info.xml'));
+		$this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__.'/../../apps/testapp/'));
 	}
 
 
@@ -677,7 +677,7 @@ 
 			->method('get')
 			->willReturn($appArray);
 		$realTmpFile = Server::get(ITempManager::class)->getTemporaryFile('.tar.gz');
-		copy(__DIR__ . '/../data/testapp.0.8.tar.gz', $realTmpFile);
+		copy(__DIR__.'/../data/testapp.0.8.tar.gz', $realTmpFile);
 		$this->tempManager
 			->expects($this->once())
 			->method('getTemporaryFile')
@@ -697,12 +697,12 @@ 
 			->expects($this->once())
 			->method('newClient')
 			->willReturn($client);
-		$this->assertTrue(file_exists(__DIR__ . '/../../apps/testapp/appinfo/info.xml'));
-		$this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
+		$this->assertTrue(file_exists(__DIR__.'/../../apps/testapp/appinfo/info.xml'));
+		$this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__.'/../../apps/testapp/'));
 
 		$installer = $this->getInstaller();
 		$installer->downloadApp('testapp');
-		$this->assertTrue(file_exists(__DIR__ . '/../../apps/testapp/appinfo/info.xml'));
-		$this->assertEquals('0.8', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
+		$this->assertTrue(file_exists(__DIR__.'/../../apps/testapp/appinfo/info.xml'));
+		$this->assertEquals('0.8', \OC_App::getAppVersionByPath(__DIR__.'/../../apps/testapp/'));
 	}
 }

lib/private/Installer.php

Spacing +29 added lines, -29 removed lines

@@ -61,14 +61,14 @@ 
 			throw new \Exception('App not found in any app directory');
 		}
 
-		$basedir = $app['path'] . '/' . $appId;
+		$basedir = $app['path'].'/'.$appId;
 
-		if (is_file($basedir . '/appinfo/database.xml')) {
-			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+		if (is_file($basedir.'/appinfo/database.xml')) {
+			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in '.$appId);
 		}
 
 		$l = \OCP\Util::getL10N('core');
-		$info = \OCP\Server::get(IAppManager::class)->getAppInfoByPath($basedir . '/appinfo/info.xml', $l->getLanguageCode());
+		$info = \OCP\Server::get(IAppManager::class)->getAppInfoByPath($basedir.'/appinfo/info.xml', $l->getLanguageCode());
 
 		if (!is_array($info)) {
 			throw new \Exception(
@@ -114,7 +114,7 @@ 
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
 
 		//run appinfo/install.php
-		self::includeAppScript($basedir . '/appinfo/install.php');
+		self::includeAppScript($basedir.'/appinfo/install.php');
 
 		OC_App::executeRepairSteps($appId, $info['repair-steps']['install']);
 
@@ -125,10 +125,10 @@ 
 
 		//set remote/public handlers
 		foreach ($info['remote'] as $name => $path) {
-			$config->setAppValue('core', 'remote_' . $name, $info['id'] . '/' . $path);
+			$config->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
 		}
 		foreach ($info['public'] as $name => $path) {
-			$config->setAppValue('core', 'public_' . $name, $info['id'] . '/' . $path);
+			$config->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
 		}
 
 		OC_App::setAppTypes($info['id']);
@@ -213,7 +213,7 @@ 
 			if ($app['id'] === $appId) {
 				// Load the certificate
 				$certificate = new X509();
-				$rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
+				$rootCrt = file_get_contents(__DIR__.'/../../resources/codesigning/root.crt');
 				$rootCrts = $this->splitCerts($rootCrt);
 				foreach ($rootCrts as $rootCrt) {
 					$certificate->loadCA($rootCrt);
@@ -225,7 +225,7 @@ 
 				foreach ($rootCrts as $rootCrt) {
 					$crl->loadCA($rootCrt);
 				}
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
+				$crl->loadCRL(file_get_contents(__DIR__.'/../../resources/codesigning/root.crl'));
 				if ($crl->validateSignature() !== true) {
 					throw new \Exception('Could not validate CRL signature');
 				}
@@ -293,11 +293,11 @@ 
 
 					$archive = new TAR($tempFile);
 					if (!$archive->extract($extractDir)) {
-						$errorMessage = 'Could not extract app ' . $appId;
+						$errorMessage = 'Could not extract app '.$appId;
 
 						$archiveError = $archive->getError();
 						if ($archiveError instanceof \PEAR_Error) {
-							$errorMessage .= ': ' . $archiveError->getMessage();
+							$errorMessage .= ': '.$archiveError->getMessage();
 						}
 
 						throw new \Exception($errorMessage);
@@ -325,7 +325,7 @@ 
 					}
 
 					// Check if appinfo/info.xml has the same app ID as well
-					$xml = simplexml_load_string(file_get_contents($extractDir . '/' . $folders[0] . '/appinfo/info.xml'));
+					$xml = simplexml_load_string(file_get_contents($extractDir.'/'.$folders[0].'/appinfo/info.xml'));
 
 					if ($xml === false) {
 						throw new \Exception(
@@ -336,19 +336,19 @@ 
 						);
 					}
 
-					if ((string)$xml->id !== $appId) {
+					if ((string) $xml->id !== $appId) {
 						throw new \Exception(
 							sprintf(
 								'App for id %s has a wrong app ID in info.xml: %s',
 								$appId,
-								(string)$xml->id
+								(string) $xml->id
 							)
 						);
 					}
 
 					// Check if the version is lower than before
 					$currentVersion = \OCP\Server::get(IAppManager::class)->getAppVersion($appId, true);
-					$newVersion = (string)$xml->version;
+					$newVersion = (string) $xml->version;
 					if (version_compare($currentVersion, $newVersion) === 1) {
 						throw new \Exception(
 							sprintf(
@@ -360,12 +360,12 @@ 
 						);
 					}
 
-					$baseDir = $installPath . '/' . $appId;
+					$baseDir = $installPath.'/'.$appId;
 					// Remove old app with the ID if existent
 					Files::rmdirr($baseDir);
 					// Move to app folder
 					if (@mkdir($baseDir)) {
-						$extractDir .= '/' . $folders[0];
+						$extractDir .= '/'.$folders[0];
 					}
 					// otherwise we just copy the outer directory
 					$this->copyRecursive($extractDir, $baseDir);
@@ -400,7 +400,7 @@ 
 	 * @param bool $allowUnstable
 	 * @return string|false false or the version number of the update
 	 */
-	public function isUpdateAvailable($appId, $allowUnstable = false): string|false {
+	public function isUpdateAvailable($appId, $allowUnstable = false): string | false {
 		if ($this->isInstanceReadyForUpdates === null) {
 			$installPath = $this->getInstallPath();
 			if ($installPath === null) {
@@ -451,8 +451,8 @@ 
 		if ($app === false) {
 			return false;
 		}
-		$basedir = $app['path'] . '/' . $appId;
-		return file_exists($basedir . '/.git/');
+		$basedir = $app['path'].'/'.$appId;
+		return file_exists($basedir.'/.git/');
 	}
 
 	/**
@@ -496,11 +496,11 @@ 
 				$this->logger->error('No application directories are marked as writable.', ['app' => 'core']);
 				return false;
 			}
-			$appDir = $installPath . '/' . $appId;
+			$appDir = $installPath.'/'.$appId;
 			Files::rmdirr($appDir);
 			return true;
 		} else {
-			$this->logger->error('can\'t remove app ' . $appId . '. It is not installed.');
+			$this->logger->error('can\'t remove app '.$appId.'. It is not installed.');
 
 			return false;
 		}
@@ -544,8 +544,8 @@ 
 		foreach (\OC::$APPSROOTS as $app_dir) {
 			if ($dir = opendir($app_dir['path'])) {
 				while (false !== ($filename = readdir($dir))) {
-					if ($filename[0] !== '.' and is_dir($app_dir['path'] . "/$filename")) {
-						if (file_exists($app_dir['path'] . "/$filename/appinfo/info.xml")) {
+					if ($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) {
+						if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
 							if ($config->getAppValue($filename, 'installed_version', null) === null) {
 								$enabled = $appManager->isDefaultEnabled($filename);
 								if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
@@ -579,9 +579,9 @@ 
 	/**
 	 * install an app already placed in the app folder
 	 */
-	public static function installShippedApp(string $app, ?IOutput $output = null): string|false {
+	public static function installShippedApp(string $app, ?IOutput $output = null): string | false {
 		if ($output instanceof IOutput) {
-			$output->debug('Installing ' . $app);
+			$output->debug('Installing '.$app);
 		}
 
 		$appManager = \OCP\Server::get(IAppManager::class);
@@ -605,7 +605,7 @@ 
 			return false;
 		}
 		if ($output instanceof IOutput) {
-			$output->debug('Registering tasks of ' . $app);
+			$output->debug('Registering tasks of '.$app);
 		}
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
 
@@ -618,10 +618,10 @@ 
 
 		//set remote/public handlers
 		foreach ($info['remote'] as $name => $path) {
-			$config->setAppValue('core', 'remote_' . $name, $app . '/' . $path);
+			$config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
 		}
 		foreach ($info['public'] as $name => $path) {
-			$config->setAppValue('core', 'public_' . $name, $app . '/' . $path);
+			$config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
 		}
 
 		OC_App::setAppTypes($info['id']);