nextcloud / server

lib/private/legacy/OC_App.php

Spacing +39 added lines, -39 removed lines

@@ -149,11 +149,11 @@ 
 		// in case someone calls loadApp() directly
 		self::registerAutoloading($app, $appPath);
 
-		if (is_file($appPath . '/appinfo/app.php')) {
+		if (is_file($appPath.'/appinfo/app.php')) {
 			\OC::$server->getLogger()->debug('/appinfo/app.php is deprecated, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
 				'app' => $app,
 			]);
-			\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
+			\OC::$server->getEventLogger()->start('load_app_'.$app, 'Load app: '.$app);
 			try {
 				self::requireAppFile($app);
 			} catch (Throwable $ex) {
@@ -162,18 +162,18 @@ 
 				}
 				if (!\OC::$server->getAppManager()->isShipped($app) && !self::isType($app, ['authentication'])) {
 					\OC::$server->getLogger()->logException($ex, [
-						'message' => "App $app threw an error during app.php load and will be disabled: " . $ex->getMessage(),
+						'message' => "App $app threw an error during app.php load and will be disabled: ".$ex->getMessage(),
 					]);
 
 					// Only disable apps which are not shipped and that are not authentication apps
 					\OC::$server->getAppManager()->disableApp($app, true);
 				} else {
 					\OC::$server->getLogger()->logException($ex, [
-						'message' => "App $app threw an error during app.php load: " . $ex->getMessage(),
+						'message' => "App $app threw an error during app.php load: ".$ex->getMessage(),
 					]);
 				}
 			}
-			\OC::$server->getEventLogger()->end('load_app_' . $app);
+			\OC::$server->getEventLogger()->end('load_app_'.$app);
 		}
 
 		/** @var \OC\AppFramework\Bootstrap\Coordinator $coordinator */
@@ -243,7 +243,7 @@ 
 	 * @param bool $force
 	 */
 	public static function registerAutoloading(string $app, string $path, bool $force = false) {
-		$key = $app . '-' . $path;
+		$key = $app.'-'.$path;
 		if (!$force && isset(self::$alreadyRegistered[$key])) {
 			return;
 		}
@@ -254,17 +254,17 @@ 
 		$appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
 		\OC::$server->registerNamespace($app, $appNamespace);
 
-		if (file_exists($path . '/composer/autoload.php')) {
-			require_once $path . '/composer/autoload.php';
+		if (file_exists($path.'/composer/autoload.php')) {
+			require_once $path.'/composer/autoload.php';
 		} else {
-			\OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);
+			\OC::$composerAutoloader->addPsr4($appNamespace.'\\', $path.'/lib/', true);
 			// Register on legacy autoloader
 			\OC::$loader->addValidRoot($path);
 		}
 
 		// Register Test namespace only when testing
 		if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) {
-			\OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true);
+			\OC::$composerAutoloader->addPsr4($appNamespace.'\\Tests\\', $path.'/tests/', true);
 		}
 	}
 
@@ -276,7 +276,7 @@ 
 	 */
 	private static function requireAppFile(string $app) {
 		// encapsulated here to avoid variable scope conflicts
-		require_once $app . '/appinfo/app.php';
+		require_once $app.'/appinfo/app.php';
 	}
 
 	/**
@@ -369,8 +369,8 @@ 
 		} else {
 			$apps = $appManager->getEnabledAppsForUser($user);
 		}
-		$apps = array_filter($apps, function ($app) {
-			return $app !== 'files';//we add this manually
+		$apps = array_filter($apps, function($app) {
+			return $app !== 'files'; //we add this manually
 		});
 		sort($apps);
 		array_unshift($apps, 'files');
@@ -470,7 +470,7 @@ 
 
 		$possibleApps = [];
 		foreach (OC::$APPSROOTS as $dir) {
-			if (file_exists($dir['path'] . '/' . $appId)) {
+			if (file_exists($dir['path'].'/'.$appId)) {
 				$possibleApps[] = $dir;
 			}
 		}
@@ -484,7 +484,7 @@ 
 		} else {
 			$versionToLoad = [];
 			foreach ($possibleApps as $possibleApp) {
-				$version = self::getAppVersionByPath($possibleApp['path'] . '/' . $appId);
+				$version = self::getAppVersionByPath($possibleApp['path'].'/'.$appId);
 				if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
 					$versionToLoad = [
 						'dir' => $possibleApp,
@@ -512,7 +512,7 @@ 
 		}
 
 		if (($dir = self::findAppInDirectories($appId)) != false) {
-			return $dir['path'] . '/' . $appId;
+			return $dir['path'].'/'.$appId;
 		}
 		return false;
 	}
@@ -527,7 +527,7 @@ 
 	 */
 	public static function getAppWebPath(string $appId) {
 		if (($dir = self::findAppInDirectories($appId)) != false) {
-			return OC::$WEBROOT . $dir['url'] . '/' . $appId;
+			return OC::$WEBROOT.$dir['url'].'/'.$appId;
 		}
 		return false;
 	}
@@ -551,7 +551,7 @@ 
 	 * @return string
 	 */
 	public static function getAppVersionByPath(string $path): string {
-		$infoFile = $path . '/appinfo/info.xml';
+		$infoFile = $path.'/appinfo/info.xml';
 		$appData = \OC::$server->getAppManager()->getAppInfo($infoFile, true);
 		return isset($appData['version']) ? $appData['version'] : '';
 	}
@@ -651,7 +651,7 @@ 
 	 * @param string $page
 	 */
 	public static function registerAdmin(string $app, string $page) {
-		self::$adminForms[] = $app . '/' . $page . '.php';
+		self::$adminForms[] = $app.'/'.$page.'.php';
 	}
 
 	/**
@@ -660,7 +660,7 @@ 
 	 * @param string $page
 	 */
 	public static function registerPersonal(string $app, string $page) {
-		self::$personalForms[] = $app . '/' . $page . '.php';
+		self::$personalForms[] = $app.'/'.$page.'.php';
 	}
 
 	/**
@@ -688,14 +688,14 @@ 
 
 		foreach (OC::$APPSROOTS as $apps_dir) {
 			if (!is_readable($apps_dir['path'])) {
-				\OCP\Util::writeLog('core', 'unable to read app folder : ' . $apps_dir['path'], ILogger::WARN);
+				\OCP\Util::writeLog('core', 'unable to read app folder : '.$apps_dir['path'], ILogger::WARN);
 				continue;
 			}
 			$dh = opendir($apps_dir['path']);
 
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
-					if ($file[0] != '.' and is_dir($apps_dir['path'] . '/' . $file) and is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')) {
+					if ($file[0] != '.' and is_dir($apps_dir['path'].'/'.$file) and is_file($apps_dir['path'].'/'.$file.'/appinfo/info.xml')) {
 						$apps[] = $file;
 					}
 				}
@@ -729,12 +729,12 @@ 
 			if (array_search($app, $blacklist) === false) {
 				$info = OC_App::getAppInfo($app, false, $langCode);
 				if (!is_array($info)) {
-					\OCP\Util::writeLog('core', 'Could not read app info file for app "' . $app . '"', ILogger::ERROR);
+					\OCP\Util::writeLog('core', 'Could not read app info file for app "'.$app.'"', ILogger::ERROR);
 					continue;
 				}
 
 				if (!isset($info['name'])) {
-					\OCP\Util::writeLog('core', 'App id "' . $app . '" has no name in appinfo', ILogger::ERROR);
+					\OCP\Util::writeLog('core', 'App id "'.$app.'" has no name in appinfo', ILogger::ERROR);
 					continue;
 				}
 
@@ -766,12 +766,12 @@ 
 
 				$appPath = self::getAppPath($app);
 				if ($appPath !== false) {
-					$appIcon = $appPath . '/img/' . $app . '.svg';
+					$appIcon = $appPath.'/img/'.$app.'.svg';
 					if (file_exists($appIcon)) {
-						$info['preview'] = $urlGenerator->imagePath($app, $app . '.svg');
+						$info['preview'] = $urlGenerator->imagePath($app, $app.'.svg');
 						$info['previewAsIcon'] = true;
 					} else {
-						$appIcon = $appPath . '/img/app.svg';
+						$appIcon = $appPath.'/img/app.svg';
 						if (file_exists($appIcon)) {
 							$info['preview'] = $urlGenerator->imagePath($app, 'app.svg');
 							$info['previewAsIcon'] = true;
@@ -916,8 +916,8 @@ 
 		self::registerAutoloading($appId, $appPath, true);
 		self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
 
-		if (file_exists($appPath . '/appinfo/database.xml')) {
-			OC_DB::updateDbFromStructure($appPath . '/appinfo/database.xml');
+		if (file_exists($appPath.'/appinfo/database.xml')) {
+			OC_DB::updateDbFromStructure($appPath.'/appinfo/database.xml');
 		} else {
 			$ms = new MigrationService($appId, \OC::$server->getDatabaseConnection());
 			$ms->migrate();
@@ -930,9 +930,9 @@ 
 		\OC::$server->getAppManager()->getAppVersion($appId, false);
 
 		// run upgrade code
-		if (file_exists($appPath . '/appinfo/update.php')) {
+		if (file_exists($appPath.'/appinfo/update.php')) {
 			self::loadApp($appId);
-			include $appPath . '/appinfo/update.php';
+			include $appPath.'/appinfo/update.php';
 		}
 		self::setupBackgroundJobs($appData['background-jobs']);
 
@@ -943,10 +943,10 @@ 
 			\OC::$server->getConfig()->deleteAppValue($appId, 'ocsid');
 		}
 		foreach ($appData['remote'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
+			\OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $appId.'/'.$path);
 		}
 		foreach ($appData['public'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
+			\OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $appId.'/'.$path);
 		}
 
 		self::setAppTypes($appId);
@@ -1016,17 +1016,17 @@ 
 	public static function getStorage(string $appId) {
 		if (\OC::$server->getAppManager()->isEnabledForUser($appId)) { //sanity check
 			if (\OC::$server->getUserSession()->isLoggedIn()) {
-				$view = new \OC\Files\View('/' . OC_User::getUser());
+				$view = new \OC\Files\View('/'.OC_User::getUser());
 				if (!$view->file_exists($appId)) {
 					$view->mkdir($appId);
 				}
-				return new \OC\Files\View('/' . OC_User::getUser() . '/' . $appId);
+				return new \OC\Files\View('/'.OC_User::getUser().'/'.$appId);
 			} else {
-				\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ', user not logged in', ILogger::ERROR);
+				\OCP\Util::writeLog('core', 'Can\'t get app storage, app '.$appId.', user not logged in', ILogger::ERROR);
 				return false;
 			}
 		} else {
-			\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ' not enabled', ILogger::ERROR);
+			\OCP\Util::writeLog('core', 'Can\'t get app storage, app '.$appId.' not enabled', ILogger::ERROR);
 			return false;
 		}
 	}
@@ -1063,9 +1063,9 @@ 
 
 				if ($attributeLang === $similarLang) {
 					$similarLangFallback = $option['@value'];
-				} elseif (strpos($attributeLang, $similarLang . '_') === 0) {
+				} elseif (strpos($attributeLang, $similarLang.'_') === 0) {
 					if ($similarLangFallback === false) {
-						$similarLangFallback =  $option['@value'];
+						$similarLangFallback = $option['@value'];
 					}
 				}
 			} else {