nextcloud / server

lib/public/Util.php

Spacing +13 added lines, -13 removed lines

@@ -261,9 +261,9 @@ 
 	 */
 	public static function linkToRemote($service) {
 		$urlGenerator = \OCP\Server::get(IURLGenerator::class);
-		$remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service;
+		$remoteBase = $urlGenerator->linkTo('', 'remote.php').'/'.$service;
 		return $urlGenerator->getAbsoluteURL(
-			$remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '')
+			$remoteBase.(($service[strlen($service) - 1] != '/') ? '/' : '')
 		);
 	}
 
@@ -303,7 +303,7 @@ 
 		$user_part = $config->getSystemValueString('mail_from_address', $user_part);
 		$host_name = self::getServerHostName();
 		$host_name = $config->getSystemValueString('mail_domain', $host_name);
-		$defaultEmailAddress = $user_part . '@' . $host_name;
+		$defaultEmailAddress = $user_part.'@'.$host_name;
 
 		$emailValidator = \OCP\Server::get(IEmailValidator::class);
 		if ($emailValidator->isValid($defaultEmailAddress)) {
@@ -311,7 +311,7 @@ 
 		}
 
 		// in case we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain'
-		return $user_part . '@localhost.localdomain';
+		return $user_part.'@localhost.localdomain';
 	}
 
 	/**
@@ -320,9 +320,9 @@ 
 	 * @return int|float int if it fits, float if it is too big
 	 * @since 26.0.0
 	 */
-	public static function numericToNumber(string|float|int $number): int|float {
+	public static function numericToNumber(string | float | int $number): int | float {
 		/* This is a hack to cast to (int|float) */
-		return 0 + (string)$number;
+		return 0 + (string) $number;
 	}
 
 	/**
@@ -331,7 +331,7 @@ 
 	 * @return string a human readable file size
 	 * @since 4.0.0
 	 */
-	public static function humanFileSize(int|float $bytes): string {
+	public static function humanFileSize(int | float $bytes): string {
 		if ($bytes < 0) {
 			return '?';
 		}
@@ -367,7 +367,7 @@ 
 	 * @return false|int|float a file size in bytes
 	 * @since 4.0.0
 	 */
-	public static function computerFileSize(string $str): false|int|float {
+	public static function computerFileSize(string $str): false | int | float {
 		$str = strtolower($str);
 		if (is_numeric($str)) {
 			return Util::numericToNumber($str);
@@ -387,7 +387,7 @@ 
 			'p' => 1024 * 1024 * 1024 * 1024 * 1024,
 		];
 
-		$bytes = (float)$str;
+		$bytes = (float) $str;
 
 		if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && isset($bytes_array[$matches[1]])) {
 			$bytes *= $bytes_array[$matches[1]];
@@ -532,7 +532,7 @@ 
 	 * @return int|float number of bytes representing
 	 * @since 5.0.0
 	 */
-	public static function maxUploadFilesize(string $dir, int|float|null $free = null): int|float {
+	public static function maxUploadFilesize(string $dir, int | float | null $free = null): int | float {
 		if (is_null($free) || $free < 0) {
 			$free = self::freeSpace($dir);
 		}
@@ -545,13 +545,13 @@ 
 	 * @return int|float number of bytes representing
 	 * @since 7.0.0
 	 */
-	public static function freeSpace(string $dir): int|float {
+	public static function freeSpace(string $dir): int | float {
 		$freeSpace = \OC\Files\Filesystem::free_space($dir);
 		if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 			$freeSpace = max($freeSpace, 0);
 			return $freeSpace;
 		} else {
-			return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
+			return (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
 		}
 	}
 
@@ -561,7 +561,7 @@ 
 	 * @return int|float number of bytes representing
 	 * @since 7.0.0
 	 */
-	public static function uploadLimit(): int|float {
+	public static function uploadLimit(): int | float {
 		$ini = Server::get(IniGetWrapper::class);
 		$upload_max_filesize = self::computerFileSize($ini->get('upload_max_filesize')) ?: 0;
 		$post_max_size = self::computerFileSize($ini->get('post_max_size')) ?: 0;

apps/sharebymail/lib/ShareByMailProvider.php

Spacing +34 added lines, -34 removed lines

@@ -158,7 +158,7 @@ 
 			[$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
 			$share->getSharedBy(),
 			$share->getNode()->getId(),
-			(string)$userFolder->getRelativePath($share->getNode()->getPath())
+			(string) $userFolder->getRelativePath($share->getNode()->getPath())
 		);
 
 		if ($share->getShareOwner() !== $share->getSharedBy()) {
@@ -171,7 +171,7 @@ 
 				[$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
 				$share->getShareOwner(),
 				$fileId,
-				(string)$ownerFolder->getRelativePath($ownerPath)
+				(string) $ownerFolder->getRelativePath($ownerPath)
 			);
 		}
 	}
@@ -188,7 +188,7 @@ 
 				[$userFolder->getRelativePath($share->getNode()->getPath())],
 				$share->getSharedBy(),
 				$share->getNode()->getId(),
-				(string)$userFolder->getRelativePath($share->getNode()->getPath())
+				(string) $userFolder->getRelativePath($share->getNode()->getPath())
 			);
 		} else {
 			$this->publishActivity(
@@ -196,7 +196,7 @@ 
 				[$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith],
 				$share->getSharedBy(),
 				$share->getNode()->getId(),
-				(string)$userFolder->getRelativePath($share->getNode()->getPath())
+				(string) $userFolder->getRelativePath($share->getNode()->getPath())
 			);
 		}
 	}
@@ -247,15 +247,15 @@ 
 		$shareId = $share->getId();
 
 		$emails = $this->getSharedWithEmails($share);
-		$validEmails = array_filter($emails, function (string $email) {
+		$validEmails = array_filter($emails, function(string $email) {
 			return $this->emailValidator->isValid($email);
 		});
 
 		if (count($validEmails) === 0) {
-			$this->removeShareFromTable((int)$shareId);
-			$e = new HintException('Failed to send share by mail. Could not find a valid email address: ' . join(', ', $emails),
+			$this->removeShareFromTable((int) $shareId);
+			$e = new HintException('Failed to send share by mail. Could not find a valid email address: '.join(', ', $emails),
 				$this->l->t('Failed to send share by email. Got an invalid email address'));
-			$this->logger->error('Failed to send share by mail. Could not find a valid email address ' . join(', ', $emails), [
+			$this->logger->error('Failed to send share by mail. Could not find a valid email address '.join(', ', $emails), [
 				'app' => 'sharebymail',
 				'exception' => $e,
 			]);
@@ -287,14 +287,14 @@ 
 				'app' => 'sharebymail',
 				'exception' => $hintException,
 			]);
-			$this->removeShareFromTable((int)$shareId);
+			$this->removeShareFromTable((int) $shareId);
 			throw $hintException;
 		} catch (\Exception $e) {
 			$this->logger->error('Failed to send share by mail.', [
 				'app' => 'sharebymail',
 				'exception' => $e,
 			]);
-			$this->removeShareFromTable((int)$shareId);
+			$this->removeShareFromTable((int) $shareId);
 			throw new HintException(
 				'Failed to send share by mail',
 				$this->l->t('Failed to send share by email'),
@@ -347,7 +347,7 @@ 
 		}
 
 		if ($expiration !== null) {
-			$dateString = (string)$this->l->l('date', $expiration, ['width' => 'medium']);
+			$dateString = (string) $this->l->l('date', $expiration, ['width' => 'medium']);
 			$emailTemplate->addBodyListItem(
 				$this->l->t('This share is valid until %s at midnight', [$dateString]),
 				$this->l->t('Expiration:'),
@@ -388,7 +388,7 @@ 
 			$initiatorEmail = $initiatorUser->getEMailAddress();
 			if ($initiatorEmail !== null) {
 				$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+				$emailTemplate->addFooter($instanceName.($this->defaults->getSlogan() !== '' ? ' - '.$this->defaults->getSlogan() : ''));
 			} else {
 				$emailTemplate->addFooter();
 			}
@@ -399,7 +399,7 @@ 
 		$message->useTemplate($emailTemplate);
 		$failedRecipients = $this->mailer->send($message);
 		if (!empty($failedRecipients)) {
-			$this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
+			$this->logger->error('Share notification mail could not be sent to: '.implode(', ', $failedRecipients));
 			return;
 		}
 	}
@@ -452,7 +452,7 @@ 
 		if ($this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false) === true) {
 			$expirationTime = new \DateTime();
 			$expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
-			$expirationTime = $expirationTime->add(new \DateInterval('PT' . $expirationInterval . 'S'));
+			$expirationTime = $expirationTime->add(new \DateInterval('PT'.$expirationInterval.'S'));
 			$emailTemplate->addBodyText($this->l->t('This password will expire at %s', [$expirationTime->format('r')]));
 		}
 
@@ -484,7 +484,7 @@ 
 			$initiatorEmail = $initiatorUser->getEMailAddress();
 			if ($initiatorEmail !== null) {
 				$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+				$emailTemplate->addFooter($instanceName.($this->defaults->getSlogan() !== '' ? ' - '.$this->defaults->getSlogan() : ''));
 			} else {
 				$emailTemplate->addFooter();
 			}
@@ -495,7 +495,7 @@ 
 		$message->useTemplate($emailTemplate);
 		$failedRecipients = $this->mailer->send($message);
 		if (!empty($failedRecipients)) {
-			$this->logger->error('Share password mail could not be sent to: ' . implode(', ', $failedRecipients));
+			$this->logger->error('Share password mail could not be sent to: '.implode(', ', $failedRecipients));
 			return false;
 		}
 
@@ -549,7 +549,7 @@ 
 		$message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($this->settingsManager->replyToInitiator() && $initiatorEmailAddress !== null) {
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}
@@ -599,7 +599,7 @@ 
 		if ($this->config->getSystemValue('sharing.enable_mail_link_password_expiration', false) === true) {
 			$expirationTime = new \DateTime();
 			$expirationInterval = $this->config->getSystemValue('sharing.mail_link_password_expiration_interval', 3600);
-			$expirationTime = $expirationTime->add(new \DateInterval('PT' . $expirationInterval . 'S'));
+			$expirationTime = $expirationTime->add(new \DateInterval('PT'.$expirationInterval.'S'));
 			$emailTemplate->addBodyText($this->l->t('This password will expire at %s', [$expirationTime->format('r')]));
 		}
 
@@ -694,10 +694,10 @@ 
 			->setValue('password_expiration_time', $qb->createNamedParameter($passwordExpirationTime, IQueryBuilder::PARAM_DATETIME_MUTABLE))
 			->setValue('password_by_talk', $qb->createNamedParameter($sendPasswordByTalk, IQueryBuilder::PARAM_BOOL))
 			->setValue('stime', $qb->createNamedParameter(time()))
-			->setValue('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT))
+			->setValue('hide_download', $qb->createNamedParameter((int) $hideDownload, IQueryBuilder::PARAM_INT))
 			->setValue('label', $qb->createNamedParameter($label))
 			->setValue('note', $qb->createNamedParameter($note))
-			->setValue('mail_send', $qb->createNamedParameter((int)$mailSend, IQueryBuilder::PARAM_INT));
+			->setValue('mail_send', $qb->createNamedParameter((int) $mailSend, IQueryBuilder::PARAM_INT));
 
 		// set share attributes
 		$shareAttributes = $this->formatShareAttributes($attributes);
@@ -723,7 +723,7 @@ 
 		if ($validPassword && ($originalShare->getPassword() !== $share->getPassword()
 								|| ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) {
 			$emails = $this->getSharedWithEmails($share);
-			$validEmails = array_filter($emails, function ($email) {
+			$validEmails = array_filter($emails, function($email) {
 				return $this->emailValidator->isValid($email);
 			});
 			$this->sendPassword($share, $plainTextPassword, $validEmails);
@@ -749,9 +749,9 @@ 
 			->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
 			->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATETIME_MUTABLE))
 			->set('note', $qb->createNamedParameter($share->getNote()))
-			->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT))
+			->set('hide_download', $qb->createNamedParameter((int) $share->getHideDownload(), IQueryBuilder::PARAM_INT))
 			->set('attributes', $qb->createNamedParameter($shareAttributes))
-			->set('mail_send', $qb->createNamedParameter((int)$share->getMailSend(), IQueryBuilder::PARAM_INT))
+			->set('mail_send', $qb->createNamedParameter((int) $share->getMailSend(), IQueryBuilder::PARAM_INT))
 			->set('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL))
 			->executeStatement();
 
@@ -783,7 +783,7 @@ 
 		} catch (\Exception $e) {
 		}
 
-		$this->removeShareFromTable((int)$share->getId());
+		$this->removeShareFromTable((int) $share->getId());
 	}
 
 	/**
@@ -991,25 +991,25 @@ 
 	 */
 	protected function createShareObject(array $data): IShare {
 		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
+		$share->setId((int) $data['id'])
+			->setShareType((int) $data['share_type'])
+			->setPermissions((int) $data['permissions'])
 			->setTarget($data['file_target'])
-			->setMailSend((bool)$data['mail_send'])
+			->setMailSend((bool) $data['mail_send'])
 			->setNote($data['note'])
 			->setToken($data['token']);
 
 		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
+		$shareTime->setTimestamp((int) $data['stime']);
 		$share->setShareTime($shareTime);
 		$share->setSharedWith($data['share_with'] ?? '');
 		$share->setPassword($data['password']);
 		$passwordExpirationTime = \DateTime::createFromFormat('Y-m-d H:i:s', $data['password_expiration_time'] ?? '');
 		$share->setPasswordExpirationTime($passwordExpirationTime !== false ? $passwordExpirationTime : null);
 		$share->setLabel($data['label'] ?? '');
-		$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
-		$share->setHideDownload((bool)$data['hide_download']);
-		$share->setReminderSent((bool)$data['reminder_sent']);
+		$share->setSendPasswordByTalk((bool) $data['password_by_talk']);
+		$share->setHideDownload((bool) $data['hide_download']);
+		$share->setReminderSent((bool) $data['reminder_sent']);
 
 		if ($data['uid_initiator'] !== null) {
 			$share->setShareOwner($data['uid_owner']);
@@ -1017,7 +1017,7 @@ 
 		} else {
 			//OLD SHARE
 			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+			$path = $this->getNode($share->getSharedBy(), (int) $data['file_source']);
 
 			$owner = $path->getOwner();
 			$share->setShareOwner($owner->getUID());
@@ -1032,7 +1032,7 @@ 
 
 		$share = $this->updateShareAttributes($share, $data['attributes']);
 
-		$share->setNodeId((int)$data['file_source']);
+		$share->setNodeId((int) $data['file_source']);
 		$share->setNodeType($data['item_type']);
 
 		$share->setProviderId($this->identifier());

apps/sharebymail/tests/ShareByMailProviderTest.php

Spacing +25 added lines, -25 removed lines

@@ -77,7 +77,7 @@ 
 
 		$this->l = $this->createMock(IL10N::class);
 		$this->l->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
+			->willReturnCallback(function($text, $parameters = []) {
 				return vsprintf($text, $parameters);
 			});
 		$this->config = $this->createMock(IConfig::class);
@@ -393,7 +393,7 @@ 
 		];
 		$this->mailer->expects($this->exactly(2))
 			->method('createEMailTemplate')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return $this->createMock(IEMailTemplate::class);
@@ -475,7 +475,7 @@ 
 		];
 		$this->mailer->expects($this->exactly(2))
 			->method('createEMailTemplate')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return $this->createMock(IEMailTemplate::class);
@@ -540,7 +540,7 @@ 
 		];
 		$message->expects($this->exactly(2))
 			->method('setTo')
-			->willReturnCallback(function () use (&$setToCalls, $message) {
+			->willReturnCallback(function() use (&$setToCalls, $message) {
 				$expected = array_shift($setToCalls);
 				$this->assertEquals($expected, func_get_args());
 				return $message;
@@ -572,7 +572,7 @@ 
 		];
 		$this->mailer->expects($this->exactly(2))
 			->method('createEMailTemplate')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 				return $this->createMock(IEMailTemplate::class);
@@ -752,17 +752,17 @@ 
 
 		$this->assertSame(1, count($result));
 
-		$this->assertSame($itemSource, (int)$result[0]['item_source']);
+		$this->assertSame($itemSource, (int) $result[0]['item_source']);
 		$this->assertSame($itemType, $result[0]['item_type']);
 		$this->assertSame($shareWith, $result[0]['share_with']);
 		$this->assertSame($sharedBy, $result[0]['uid_initiator']);
 		$this->assertSame($uidOwner, $result[0]['uid_owner']);
-		$this->assertSame($permissions, (int)$result[0]['permissions']);
+		$this->assertSame($permissions, (int) $result[0]['permissions']);
 		$this->assertSame($token, $result[0]['token']);
 		$this->assertSame($password, $result[0]['password']);
 		$this->assertSame($passwordExpirationTime->getTimestamp(), \DateTime::createFromFormat('Y-m-d H:i:s', $result[0]['password_expiration_time'])->getTimestamp());
-		$this->assertSame($sendPasswordByTalk, (bool)$result[0]['password_by_talk']);
-		$this->assertSame($hideDownload, (bool)$result[0]['hide_download']);
+		$this->assertSame($sendPasswordByTalk, (bool) $result[0]['password_by_talk']);
+		$this->assertSame($hideDownload, (bool) $result[0]['hide_download']);
 		$this->assertSame($label, $result[0]['label']);
 		$this->assertSame($expiration->getTimestamp(), \DateTime::createFromFormat('Y-m-d H:i:s', $result[0]['expiration'])->getTimestamp());
 	}
@@ -805,12 +805,12 @@ 
 
 		$this->assertSame(1, count($result));
 
-		$this->assertSame($itemSource, (int)$result[0]['item_source']);
+		$this->assertSame($itemSource, (int) $result[0]['item_source']);
 		$this->assertSame($itemType, $result[0]['item_type']);
 		$this->assertSame($shareWith, $result[0]['share_with']);
 		$this->assertSame($sharedBy, $result[0]['uid_initiator']);
 		$this->assertSame($uidOwner, $result[0]['uid_owner']);
-		$this->assertSame($permissions + 1, (int)$result[0]['permissions']);
+		$this->assertSame($permissions + 1, (int) $result[0]['permissions']);
 		$this->assertSame($token, $result[0]['token']);
 		$this->assertSame($note, $result[0]['note']);
 	}
@@ -893,10 +893,10 @@ 
 
 		$instance->expects($this->once())->method('createShareObject')
 			->willReturnCallback(
-				function ($data) use ($uidOwner, $sharedBy, $id2) {
+				function($data) use ($uidOwner, $sharedBy, $id2) {
 					$this->assertSame($uidOwner, $data['uid_owner']);
 					$this->assertSame($sharedBy, $data['uid_initiator']);
-					$this->assertSame($id2, (int)$data['id']);
+					$this->assertSame($id2, (int) $data['id']);
 					return $this->share;
 				}
 			);
@@ -945,10 +945,10 @@ 
 
 		$instance->expects($this->once())->method('createShareObject')
 			->willReturnCallback(
-				function ($data) use ($uidOwner, $sharedBy, $id) {
+				function($data) use ($uidOwner, $sharedBy, $id) {
 					$this->assertSame($uidOwner, $data['uid_owner']);
 					$this->assertSame($sharedBy, $data['uid_initiator']);
-					$this->assertSame($id, (int)$data['id']);
+					$this->assertSame($id, (int) $data['id']);
 					return $this->share;
 				}
 			);
@@ -978,8 +978,8 @@ 
 
 		$instance->expects($this->once())->method('createShareObject')
 			->willReturnCallback(
-				function ($data) use ($idMail) {
-					$this->assertSame($idMail, (int)$data['id']);
+				function($data) use ($idMail) {
+					$this->assertSame($idMail, (int) $data['id']);
 					return $this->share;
 				}
 			);
@@ -1088,7 +1088,7 @@ 
 
 		$this->assertTrue(is_array($after));
 		$this->assertSame(1, count($after));
-		$this->assertSame($id, (int)$after[0]['id']);
+		$this->assertSame($id, (int) $after[0]['id']);
 	}
 
 	public function testGetRawShare(): void {
@@ -1107,12 +1107,12 @@ 
 		$result = $this->invokePrivate($instance, 'getRawShare', [$id]);
 
 		$this->assertTrue(is_array($result));
-		$this->assertSame($itemSource, (int)$result['item_source']);
+		$this->assertSame($itemSource, (int) $result['item_source']);
 		$this->assertSame($itemType, $result['item_type']);
 		$this->assertSame($shareWith, $result['share_with']);
 		$this->assertSame($sharedBy, $result['uid_initiator']);
 		$this->assertSame($uidOwner, $result['uid_owner']);
-		$this->assertSame($permissions, (int)$result['permissions']);
+		$this->assertSame($permissions, (int) $result['permissions']);
 		$this->assertSame($token, $result['token']);
 	}
 
@@ -1159,7 +1159,7 @@ 
 		$qb->execute();
 		$id = $qb->getLastInsertId();
 
-		return (int)$id;
+		return (int) $id;
 	}
 
 	public function testGetSharesInFolder(): void {
@@ -1172,8 +1172,8 @@ 
 
 		$provider = $this->getInstance(['sendMailNotification', 'createShareActivity']);
 
-		$u1 = $userManager->createUser('testFed', md5((string)time()));
-		$u2 = $userManager->createUser('testFed2', md5((string)time()));
+		$u1 = $userManager->createUser('testFed', md5((string) time()));
+		$u2 = $userManager->createUser('testFed2', md5((string) time()));
 
 		$folder1 = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
 		$file1 = $folder1->newFile('bar1');
@@ -1218,8 +1218,8 @@ 
 
 		$provider = $this->getInstance(['sendMailNotification', 'createShareActivity']);
 
-		$u1 = $userManager->createUser('testFed', md5((string)time()));
-		$u2 = $userManager->createUser('testFed2', md5((string)time()));
+		$u1 = $userManager->createUser('testFed', md5((string) time()));
+		$u2 = $userManager->createUser('testFed2', md5((string) time()));
 
 		$folder = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
 

apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php

Spacing +38 added lines, -38 removed lines

@@ -125,10 +125,10 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$message->message->VEVENT->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$message->message->VEVENT->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE']);
+		$message->message->VEVENT->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE']);
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		$message->significantChange = false;
 		$this->plugin->schedule($message);
 		$this->assertEquals('1.0', $message->getScheduleStatus());
@@ -145,11 +145,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		// save the old copy in the plugin
 		$oldVCalendar = new VCalendar();
 		$oldVEvent = new VEvent($oldVCalendar, 'one', [
@@ -159,8 +159,8 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		]);
 		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'boromir@tra.it.or', ['RSVP' => 'TRUE']);
 		$oldVCalendar->add($oldVEvent);
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting without (!) Boromir',
@@ -248,11 +248,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'the-shire@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'the-shire@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'the-shire@hobb.it';
+		$message->recipient = 'mailto:'.'the-shire@hobb.it';
 		// save the old copy in the plugin
 		$oldVCalendar = new VCalendar();
 		$oldVEvent = new VEvent($oldVCalendar, 'one', [
@@ -262,8 +262,8 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		]);
 		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'the-shire@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'the-shire@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'boromir@tra.it.or', ['RSVP' => 'TRUE']);
 		$oldVCalendar->add($oldVEvent);
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting without (!) Boromir',
@@ -337,12 +337,12 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth', ['RSVP' => 'TRUE', 'CN' => 'The Fellowship', 'CUTYPE' => 'GROUP']);
-		$newVevent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE', 'MEMBER' => 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth', ['RSVP' => 'TRUE', 'CN' => 'The Fellowship', 'CUTYPE' => 'GROUP']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'boromir@tra.it.or', ['RSVP' => 'TRUE', 'MEMBER' => 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth';
+		$message->recipient = 'mailto:'.'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth';
 		$attendees = $newVevent->select('ATTENDEE');
 		$circle = '';
 		foreach ($attendees as $attendee) {
@@ -415,7 +415,7 @@ 
 			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z'
 		]);
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$newvEvent2 = new VEvent($newVCalendar, 'two', [
 			'UID' => 'uid-1234',
 			'SEQUENCE' => 1,
@@ -424,10 +424,10 @@ 
 			'RECURRENCE-ID' => new \DateTime('2016-01-01 00:00:00')
 		]);
 		$newvEvent2->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newvEvent2->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$newvEvent2->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		// save the old copy in the plugin
 		$oldVCalendar = new VCalendar();
 		$oldVEvent = new VEvent($oldVCalendar, 'one', [
@@ -439,7 +439,7 @@ 
 			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z'
 		]);
 		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Elevenses',
 			'attendee_name' => 'frodo@hobb.it'
@@ -457,7 +457,7 @@ 
 			->willReturn(1496912700);
 		$this->eventComparisonService->expects(self::once())
 			->method('findModified')
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
+			->willReturn(['old' => [], 'new' => [$newVevent]]);
 		$this->service->expects(self::once())
 			->method('getCurrentAttendee')
 			->with($message)
@@ -526,10 +526,10 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$message->message->VEVENT->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$message->message->VEVENT->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE']);
+		$message->message->VEVENT->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE']);
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@@hobb.it';
 
 		$this->service->expects(self::once())
 			->method('getLastOccurrence')
@@ -550,11 +550,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVcalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		// save the old copy in the plugin
 		$oldVcalendar = new VCalendar();
 		$oldVevent = new VEvent($oldVcalendar, 'one', [
@@ -564,8 +564,8 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		]);
 		$oldVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$oldVevent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+		$oldVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$oldVevent->add('ATTENDEE', 'mailto:'.'boromir@tra.it.or', ['RSVP' => 'TRUE']);
 		$oldVcalendar->add($oldVevent);
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting without (!) Boromir',
@@ -584,7 +584,7 @@ 
 			->willReturn(1496912700);
 		$this->eventComparisonService->expects(self::once())
 			->method('findModified')
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
+			->willReturn(['old' => [], 'new' => [$newVevent]]);
 		$this->service->expects(self::once())
 			->method('getCurrentAttendee')
 			->with($message)
@@ -659,11 +659,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$event->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$event->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$event->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $calendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		// construct
 		foreach ($event->select('ATTENDEE') as $entry) {
 			if (strcasecmp($entry->getValue(), $message->recipient) === 0) {
@@ -734,7 +734,7 @@ 
 			->with($this->emailTemplate, 'token');
 		$this->eventComparisonService->expects(self::once())
 			->method('findModified')
-			->willReturn(['old' => [] ,'new' => [$event]]);
+			->willReturn(['old' => [], 'new' => [$event]]);
 		// construct mail provider mock returns
 		$this->mailService
 			->method('initiateMessage')
@@ -762,11 +762,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		// save the old copy in the plugin
 		$oldVCalendar = new VCalendar();
 		$oldVEvent = new VEvent($oldVCalendar, 'one', [
@@ -776,8 +776,8 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		]);
 		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'boromir@tra.it.or', ['RSVP' => 'TRUE']);
 		$oldVCalendar->add($oldVEvent);
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting without (!) Boromir',
@@ -869,11 +869,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting',
 			'attendee_name' => 'frodo@hobb.it'
@@ -891,7 +891,7 @@ 
 		$this->eventComparisonService->expects(self::once())
 			->method('findModified')
 			->with($newVCalendar, null)
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
+			->willReturn(['old' => [], 'new' => [$newVevent]]);
 		$this->service->expects(self::once())
 			->method('getCurrentAttendee')
 			->with($message)
@@ -963,10 +963,10 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting',
 			'attendee_name' => 'frodo@hobb.it'
@@ -984,7 +984,7 @@ 
 		$this->eventComparisonService->expects(self::once())
 			->method('findModified')
 			->with($newVCalendar, null)
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
+			->willReturn(['old' => [], 'new' => [$newVevent]]);
 		$this->service->expects(self::once())
 			->method('getCurrentAttendee')
 			->with($message)