nextcloud / server

lib/private/Files/Filesystem.php

Spacing +13 added lines, -13 removed lines

@@ -409,17 +409,17 @@ 
 		$userObject = $userManager->get($user);
 
 		if (is_null($userObject)) {
-			\OCP\Util::writeLog('files', ' Backends provided no user object for ' . $user, ILogger::ERROR);
+			\OCP\Util::writeLog('files', ' Backends provided no user object for '.$user, ILogger::ERROR);
 			// reset flag, this will make it possible to rethrow the exception if called again
 			unset(self::$usersSetup[$user]);
-			throw new \OC\User\NoUserException('Backends provided no user object for ' . $user);
+			throw new \OC\User\NoUserException('Backends provided no user object for '.$user);
 		}
 
 		$realUid = $userObject->getUID();
 		// workaround in case of different casings
 		if ($user !== $realUid) {
 			$stack = json_encode(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 50));
-			\OCP\Util::writeLog('files', 'initMountPoints() called with wrong user casing. This could be a bug. Expected: "' . $realUid . '" got "' . $user . '". Stack: ' . $stack, ILogger::WARN);
+			\OCP\Util::writeLog('files', 'initMountPoints() called with wrong user casing. This could be a bug. Expected: "'.$realUid.'" got "'.$user.'". Stack: '.$stack, ILogger::WARN);
 			$user = $realUid;
 
 			// again with the correct casing
@@ -452,11 +452,11 @@ 
 		} else {
 			self::getMountManager()->addMount(new MountPoint(
 				new NullStorage([]),
-				'/' . $user
+				'/'.$user
 			));
 			self::getMountManager()->addMount(new MountPoint(
 				new NullStorage([]),
-				'/' . $user . '/files'
+				'/'.$user.'/files'
 			));
 		}
 		\OC_Hook::emit('OC_Filesystem', 'post_initMountPoints', array('user' => $user));
@@ -471,7 +471,7 @@ 
 	private static function listenForNewMountProviders(MountProviderCollection $mountConfigManager, IUserManager $userManager) {
 		if (!self::$listeningForProviders) {
 			self::$listeningForProviders = true;
-			$mountConfigManager->listen('\OC\Files\Config', 'registerMountProvider', function (IMountProvider $provider) use ($userManager) {
+			$mountConfigManager->listen('\OC\Files\Config', 'registerMountProvider', function(IMountProvider $provider) use ($userManager) {
 				foreach (Filesystem::$usersSetup as $user => $setup) {
 					$userObject = $userManager->get($user);
 					if ($userObject) {
@@ -566,7 +566,7 @@ 
 	 * @return string
 	 */
 	static public function getLocalPath($path) {
-		$datadir = \OC_User::getHome(\OC_User::getUser()) . '/files';
+		$datadir = \OC_User::getHome(\OC_User::getUser()).'/files';
 		$newpath = $path;
 		if (strncmp($newpath, $datadir, strlen($datadir)) == 0) {
 			$newpath = substr($path, strlen($datadir));
@@ -583,7 +583,7 @@ 
 	static public function isValidPath($path) {
 		$path = self::normalizePath($path);
 		if (!$path || $path[0] !== '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
 		if (strpos($path, '/../') !== false || strrchr($path, '/') === '/..') {
 			return false;
@@ -804,7 +804,7 @@ 
 		 *        conversion should get removed as soon as all existing
 		 *        function calls have been fixed.
 		 */
-		$path = (string)$path;
+		$path = (string) $path;
 
 		$cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath, $keepUnicode]);
 
@@ -822,13 +822,13 @@ 
 		}
 
 		//add leading slash, if it is already there we strip it anyway
-		$path = '/' . $path;
+		$path = '/'.$path;
 
 		$patterns = [
-			'/\\\\/s',          // no windows style slashes
+			'/\\\\/s', // no windows style slashes
 			'/\/\.(\/\.)?\//s', // remove '/./'
-			'/\/{2,}/s',        // remove squence of slashes
-			'/\/\.$/s',         // remove trailing /.
+			'/\/{2,}/s', // remove squence of slashes
+			'/\/\.$/s', // remove trailing /.
 		];
 
 		do {

core/Command/Encryption/DecryptAll.php

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		if ( !$input->isInteractive() ) {
+		if (!$input->isInteractive()) {
 			$output->writeln('Invalid TTY.');
 			$output->writeln('If you are trying to execute the command in a Docker ');
 			$output->writeln("container, do not forget to execute 'docker exec' with");

core/Command/Encryption/EncryptAll.php

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		if ( !$input->isInteractive() ) {
+		if (!$input->isInteractive()) {
 			$output->writeln('Invalid TTY.');
 			$output->writeln('If you are trying to execute the command in a Docker ');
 			$output->writeln("container, do not forget to execute 'docker exec' with");

core/Command/TwoFactorAuth/Enforce.php

Spacing +2 added lines, -2 removed lines

@@ -98,10 +98,10 @@
 		if (empty($state->getEnforcedGroups())) {
 			$message = 'Two-factor authentication is enforced for all users';
 		} else {
-			$message = 'Two-factor authentication is enforced for members of the group(s) ' . implode(', ', $state->getEnforcedGroups());
+			$message = 'Two-factor authentication is enforced for members of the group(s) '.implode(', ', $state->getEnforcedGroups());
 		}
 		if (!empty($state->getExcludedGroups())) {
-			$message .= ', except members of ' . implode(', ', $state->getExcludedGroups());
+			$message .= ', except members of '.implode(', ', $state->getExcludedGroups());
 		}
 		$output->writeln($message);
 	}

lib/public/Accounts/PropertyDoesNotExistException.php

Spacing +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
 	 * @param string $msg the error message
 	 * @since 15.0.0
 	 */
-	public function __construct($property){
-		parent::__construct('Property ' . $property . ' does not exist.');
+	public function __construct($property) {
+		parent::__construct('Property '.$property.' does not exist.');
 	}
 
 }

apps/dav/lib/Migration/BuildCalendarSearchIndex.php

Spacing +2 added lines, -2 removed lines

@@ -70,9 +70,9 @@
 		}
 
 		$query = $this->db->getQueryBuilder();
-		$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
+		$query->select($query->createFunction('MAX('.$query->getColumnName('id').')'))
 			->from('calendarobjects');
-		$maxId = (int)$query->execute()->fetchColumn();
+		$maxId = (int) $query->execute()->fetchColumn();
 
 		$output->info('Add background job');
 		$this->jobList->add(BuildCalendarSearchIndexBackgroundJob::class, [

apps/files_sharing/lib/SharedStorage.php

Spacing +5 added lines, -5 removed lines

@@ -182,7 +182,7 @@ 
 	 * @return string
 	 */
 	public function getId() {
-		return 'shared::' . $this->getMountPoint();
+		return 'shared::'.$this->getMountPoint();
 	}
 
 	/**
@@ -285,7 +285,7 @@ 
 					}
 			}
 			$info = array(
-				'target' => $this->getMountPoint() . $path,
+				'target' => $this->getMountPoint().$path,
 				'source' => $source,
 				'mode' => $mode,
 			);
@@ -378,7 +378,7 @@ 
 		if (!$storage) {
 			$storage = $this;
 		}
-		$sourceRoot  = $this->getSourceRootInfo();
+		$sourceRoot = $this->getSourceRootInfo();
 		if ($this->storage instanceof FailedStorage) {
 			return new FailedCache();
 		}
@@ -484,7 +484,7 @@ 
 
 	public function file_get_contents($path) {
 		$info = [
-			'target' => $this->getMountPoint() . '/' . $path,
+			'target' => $this->getMountPoint().'/'.$path,
 			'source' => $this->getUnjailedPath($path),
 		];
 		\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_get_contents', $info);
@@ -493,7 +493,7 @@ 
 
 	public function file_put_contents($path, $data) {
 		$info = [
-			'target' => $this->getMountPoint() . '/' . $path,
+			'target' => $this->getMountPoint().'/'.$path,
 			'source' => $this->getUnjailedPath($path),
 		];
 		\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'file_put_contents', $info);

apps/dav/lib/CalDAV/Outbox.php

Spacing +11 added lines, -11 removed lines

@@ -74,12 +74,12 @@ 
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 		];
@@ -94,23 +94,23 @@ 
 		if ($this->disableFreeBusy) {
 			return array_merge($commonAcl, [
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-invite',
 					'principal' => $this->getOwner(),
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-invite',
+					'principal' => $this->getOwner().'/calendar-proxy-write',
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-reply',
 					'principal' => $this->getOwner(),
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-reply',
+					'principal' => $this->getOwner().'/calendar-proxy-write',
 					'protected' => true,
 				],
 			]);
@@ -118,13 +118,13 @@ 
 
 		return array_merge($commonAcl, [
 			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
+				'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send',
 				'principal' => $this->getOwner(),
 				'protected' => true,
 			],
 			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 		]);

lib/public/BackgroundJob/Job.php

Spacing +3 added lines, -3 removed lines

@@ -73,17 +73,17 @@
 
 		try {
 			$jobStartTime = $this->time->getTime();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+			$logger->debug('Run '.get_class($this).' job with ID '.$this->getId(), ['app' => 'cron']);
 			$this->run($this->argument);
 			$timeTaken = $this->time->getTime() - $jobStartTime;
 
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+			$logger->debug('Finished '.get_class($this).' job with ID '.$this->getId().' in '.$timeTaken.' seconds', ['app' => 'cron']);
 			$jobList->setExecutionTime($this, $timeTaken);
 		} catch (\Exception $e) {
 			if ($logger) {
 				$logger->logException($e, [
 					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+					'message' => 'Error while running background job (class: '.get_class($this).', arguments: '.print_r($this->argument, true).')'
 				]);
 			}
 		}