nextcloud / server

apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php

Spacing +24 added lines, -24 removed lines

@@ -86,37 +86,37 @@ 
 
 		if ($event->getSubject() === self::SUBJECT_ADD) {
 			$subject = $l->t('{actor} created address book {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_ADD.'_self') {
 			$subject = $l->t('You created address book {addressbook}');
 		} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
 			$subject = $l->t('{actor} deleted address book {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_DELETE.'_self') {
 			$subject = $l->t('You deleted address book {addressbook}');
 		} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
 			$subject = $l->t('{actor} updated address book {addressbook}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_UPDATE.'_self') {
 			$subject = $l->t('You updated address book {addressbook}');
 		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
 			$subject = $l->t('{actor} shared address book {addressbook} with you');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER.'_you') {
 			$subject = $l->t('You shared address book {addressbook} with {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER.'_by') {
 			$subject = $l->t('{actor} shared address book {addressbook} with {user}');
 		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
 			$subject = $l->t('{actor} unshared address book {addressbook} from you');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_you') {
 			$subject = $l->t('You unshared address book {addressbook} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_by') {
 			$subject = $l->t('{actor} unshared address book {addressbook} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_self') {
 			$subject = $l->t('{actor} unshared address book {addressbook} from themselves');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_you') {
 			$subject = $l->t('You shared address book {addressbook} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_by') {
 			$subject = $l->t('{actor} shared address book {addressbook} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_you') {
 			$subject = $l->t('You unshared address book {addressbook} from group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_by') {
 			$subject = $l->t('{actor} unshared address book {addressbook} from group {group}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -146,39 +146,39 @@ 
 
 		switch ($subject) {
 			case self::SUBJECT_ADD:
-			case self::SUBJECT_ADD . '_self':
+			case self::SUBJECT_ADD.'_self':
 			case self::SUBJECT_DELETE:
-			case self::SUBJECT_DELETE . '_self':
+			case self::SUBJECT_DELETE.'_self':
 			case self::SUBJECT_UPDATE:
-			case self::SUBJECT_UPDATE . '_self':
+			case self::SUBJECT_UPDATE.'_self':
 			case self::SUBJECT_SHARE_USER:
 			case self::SUBJECT_UNSHARE_USER:
-			case self::SUBJECT_UNSHARE_USER . '_self':
+			case self::SUBJECT_UNSHARE_USER.'_self':
 				return [
 					'actor' => $this->generateUserParameter($parameters['actor']),
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
 				];
-			case self::SUBJECT_SHARE_USER . '_you':
-			case self::SUBJECT_UNSHARE_USER . '_you':
+			case self::SUBJECT_SHARE_USER.'_you':
+			case self::SUBJECT_UNSHARE_USER.'_you':
 				return [
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
 					'user' => $this->generateUserParameter($parameters['user']),
 				];
-			case self::SUBJECT_SHARE_USER . '_by':
-			case self::SUBJECT_UNSHARE_USER . '_by':
+			case self::SUBJECT_SHARE_USER.'_by':
+			case self::SUBJECT_UNSHARE_USER.'_by':
 				return [
 					'actor' => $this->generateUserParameter($parameters['actor']),
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
 					'user' => $this->generateUserParameter($parameters['user']),
 				];
-			case self::SUBJECT_SHARE_GROUP . '_you':
-			case self::SUBJECT_UNSHARE_GROUP . '_you':
+			case self::SUBJECT_SHARE_GROUP.'_you':
+			case self::SUBJECT_UNSHARE_GROUP.'_you':
 				return [
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
 					'group' => $this->generateGroupParameter($parameters['group']),
 				];
-			case self::SUBJECT_SHARE_GROUP . '_by':
-			case self::SUBJECT_UNSHARE_GROUP . '_by':
+			case self::SUBJECT_SHARE_GROUP.'_by':
+			case self::SUBJECT_UNSHARE_GROUP.'_by':
 				return [
 					'actor' => $this->generateUserParameter($parameters['actor']),
 					'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),

apps/dav/lib/Connector/PublicAuth.php

Spacing +2 added lines, -2 removed lines

@@ -114,13 +114,13 @@
 				if ($this->shareManager->checkPassword($share, $password)) {
 					return true;
 				} elseif ($this->session->exists('public_link_authenticated')
-					&& $this->session->get('public_link_authenticated') === (string)$share->getId()) {
+					&& $this->session->get('public_link_authenticated') === (string) $share->getId()) {
 					return true;
 				} else {
 					if (in_array('XMLHttpRequest', explode(',', $this->request->getHeader('X-Requested-With')))) {
 						// do not re-authenticate over ajax, use dummy auth name to prevent browser popup
 						http_response_code(401);
-						header('WWW-Authenticate: DummyBasic realm="' . $this->realm . '"');
+						header('WWW-Authenticate: DummyBasic realm="'.$this->realm.'"');
 						throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
 					}
 

lib/private/Console/TimestampFormatter.php

Spacing +1 added lines, -1 removed lines

@@ -105,6 +105,6 @@
 		$time = new \DateTime('now', $timeZone);
 		$timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTimeInterface::ATOM));
 
-		return $timestampInfo . ' ' . $this->formatter->format($message);
+		return $timestampInfo.' '.$this->formatter->format($message);
 	}
 }

apps/dav/lib/CalDAV/Trashbin/Plugin.php

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
 		PropFind $propFind,
 		INode $node): void {
 		if ($node instanceof DeletedCalendarObject) {
-			$propFind->handle(self::PROPERTY_DELETED_AT, function () use ($node) {
+			$propFind->handle(self::PROPERTY_DELETED_AT, function() use ($node) {
 				$ts = $node->getDeletedAt();
 				if ($ts === null) {
 					return null;
@@ -112,12 +112,12 @@ 
 					->setTimestamp($ts)
 					->format(DateTimeInterface::ATOM);
 			});
-			$propFind->handle(self::PROPERTY_CALENDAR_URI, function () use ($node) {
+			$propFind->handle(self::PROPERTY_CALENDAR_URI, function() use ($node) {
 				return $node->getCalendarUri();
 			});
 		}
 		if ($node instanceof TrashbinHome) {
-			$propFind->handle(self::PROPERTY_RETENTION_DURATION, function () use ($node) {
+			$propFind->handle(self::PROPERTY_RETENTION_DURATION, function() use ($node) {
 				return $this->retentionService->getDuration();
 			});
 		}

lib/private/Accounts/Hooks.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 			return;
 		}
 
-		if (isset($property) && $property->getValue() !== (string)$newValue) {
+		if (isset($property) && $property->getValue() !== (string) $newValue) {
 			$property->setValue($newValue);
 			$this->accountManager->updateAccount($account);
 		}

lib/public/HintException.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 * @return string
 	 */
 	public function __toString(): string {
-		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+		return __CLASS__.": [{$this->code}]: {$this->message} ({$this->hint})\n";
 	}
 
 	/**

lib/private/Security/Crypto.php

Spacing +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
 		}
 
 		// Append an "a" behind the password and hash it to prevent reusing the same password as for encryption
-		$password = hash('sha512', $password . 'a');
+		$password = hash('sha512', $password.'a');
 
 		$hash = new Hash('sha512');
 		$hash->setKey($password);
@@ -152,7 +152,7 @@ 
 		$this->cipher->setPassword($encryptionKey);
 		$this->cipher->setIV($iv);
 
-		if (!hash_equals($this->calculateHMAC($parts[0] . $parts[1], $hmacKey), $hmac)) {
+		if (!hash_equals($this->calculateHMAC($parts[0].$parts[1], $hmacKey), $hmac)) {
 			throw new Exception('HMAC does not match.');
 		}
 
@@ -166,15 +166,15 @@ 
 
 	private function hex2bin(string $hex): string {
 		if (!ctype_xdigit($hex)) {
-			throw new \RuntimeException('String contains non hex chars: ' . $hex);
+			throw new \RuntimeException('String contains non hex chars: '.$hex);
 		}
 		if (strlen($hex) % 2 !== 0) {
-			throw new \RuntimeException('Hex string is not of even length: ' . $hex);
+			throw new \RuntimeException('Hex string is not of even length: '.$hex);
 		}
 		$result = hex2bin($hex);
 
 		if ($result === false) {
-			throw new \RuntimeException('Hex to bin conversion failed: ' . $hex);
+			throw new \RuntimeException('Hex to bin conversion failed: '.$hex);
 		}
 
 		return $result;

apps/theming/lib/IconBuilder.php

Spacing +13 added lines, -13 removed lines

@@ -73,19 +73,19 @@ 
 			$icon->setImageFormat("png32");
 
 			$clone = clone $icon;
-			$clone->scaleImage(16,0);
+			$clone->scaleImage(16, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(32,0);
+			$clone->scaleImage(32, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(64,0);
+			$clone->scaleImage(64, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(128,0);
+			$clone->scaleImage(128, 0);
 			$favicon->addImage($clone);
 
 			$data = $favicon->getImagesBlob();
@@ -145,9 +145,9 @@ 
 		$color = $this->themingDefaults->getColorPrimary();
 
 		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+		$background = '<?xml version="1.0" encoding="UTF-8"?>'.
+			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">'.
+			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:'.$color.';" />'.
 			'</svg>';
 		// resize svg magic as this seems broken in Imagemagick
 		if ($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
@@ -171,8 +171,8 @@ 
 
 			// convert svg to resized image
 			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
+			$resX = (int) (512 * $res['x'] / $max * 2.53);
+			$resY = (int) (512 * $res['y'] / $max * 2.53);
 			$appIconFile->setResolution($resX, $resY);
 			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
 			$appIconFile->readImageBlob($svg);
@@ -195,14 +195,14 @@ 
 			$appIconFile->scaleImage(512, 512, true);
 		}
 		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
+		$border_w = (int) ($appIconFile->getImageWidth() * 0.05);
+		$border_h = (int) ($appIconFile->getImageHeight() * 0.05);
 		$innerWidth = ($appIconFile->getImageWidth() - $border_w * 2);
 		$innerHeight = ($appIconFile->getImageHeight() - $border_h * 2);
 		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
 		// center icon
-		$offset_w = (int)(512 / 2 - $innerWidth / 2);
-		$offset_h = (int)(512 / 2 - $innerHeight / 2);
+		$offset_w = (int) (512 / 2 - $innerWidth / 2);
+		$offset_h = (int) (512 / 2 - $innerHeight / 2);
 
 		$finalIconFile = new Imagick();
 		$finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));

core/Command/Integrity/CheckCore.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 		$result = $this->checker->verifyCoreSignature();
 		$this->writeArrayInOutputFormat($input, $output, $result);
 		if (count($result) > 0) {
-			$output->writeln('<error>' . count($result) . ' errors found</error>', OutputInterface::VERBOSITY_VERBOSE);
+			$output->writeln('<error>'.count($result).' errors found</error>', OutputInterface::VERBOSITY_VERBOSE);
 			return 1;
 		}
 		$output->writeln('<info>No errors found</info>', OutputInterface::VERBOSITY_VERBOSE);