Completed
Push — master ( 7b60e3...8d70e9 )
by
unknown
20:41
created
lib/private/User/Backend.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -39,14 +39,14 @@  discard block
 block discarded – undo
39 39
 	/**
40 40
 	 * actions that user backends can define
41 41
 	 */
42
-	public const CREATE_USER = 1;			// 1 << 0
43
-	public const SET_PASSWORD = 16;			// 1 << 4
44
-	public const CHECK_PASSWORD = 256;			// 1 << 8
45
-	public const GET_HOME = 4096;			// 1 << 12
46
-	public const GET_DISPLAYNAME = 65536;		// 1 << 16
47
-	public const SET_DISPLAYNAME = 1048576;		// 1 << 20
48
-	public const PROVIDE_AVATAR = 16777216;		// 1 << 24
49
-	public const COUNT_USERS = 268435456;	// 1 << 28
42
+	public const CREATE_USER = 1; // 1 << 0
43
+	public const SET_PASSWORD = 16; // 1 << 4
44
+	public const CHECK_PASSWORD = 256; // 1 << 8
45
+	public const GET_HOME = 4096; // 1 << 12
46
+	public const GET_DISPLAYNAME = 65536; // 1 << 16
47
+	public const SET_DISPLAYNAME = 1048576; // 1 << 20
48
+	public const PROVIDE_AVATAR = 16777216; // 1 << 24
49
+	public const COUNT_USERS = 268435456; // 1 << 28
50 50
 
51 51
 	protected $possibleActions = [
52 52
 		self::CREATE_USER => 'createUser',
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 * compared with self::CREATE_USER etc.
87 87
 	 */
88 88
 	public function implementsActions($actions) {
89
-		return (bool)($this->getSupportedActions() & $actions);
89
+		return (bool) ($this->getSupportedActions() & $actions);
90 90
 	}
91 91
 
92 92
 	/**
Please login to merge, or discard this patch.
lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
 		foreach ($policies as $policy) {
96 96
 			header(
97 97
 				sprintf(
98
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
98
+					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;'.$secureCookie.'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
99 99
 					$cookiePrefix,
100 100
 					$policy,
101 101
 					$cookieParams['path'],
Please login to merge, or discard this patch.
lib/private/Collaboration/Collaborators/GroupPlugin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 		$result = ['wide' => [], 'exact' => []];
64 64
 
65 65
 		$groups = $this->groupManager->search($search, $limit, $offset);
66
-		$groupIds = array_map(function (IGroup $group) {
66
+		$groupIds = array_map(function(IGroup $group) {
67 67
 			return $group->getGID();
68 68
 		}, $groups);
69 69
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 		if (!empty($groups) && ($this->shareWithGroupOnly || $this->shareeEnumerationInGroupOnly)) {
76 76
 			// Intersect all the groups that match with the groups this user is a member of
77 77
 			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
78
-			$userGroups = array_map(function (IGroup $group) {
78
+			$userGroups = array_map(function(IGroup $group) {
79 79
 				return $group->getGID();
80 80
 			}, $userGroups);
81 81
 			$groupIds = array_intersect($groupIds, $userGroups);
Please login to merge, or discard this patch.
lib/public/AppFramework/ApiController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
 		$response = new Response();
87 87
 		$response->addHeader('Access-Control-Allow-Origin', $origin);
88 88
 		$response->addHeader('Access-Control-Allow-Methods', $this->corsMethods);
89
-		$response->addHeader('Access-Control-Max-Age', (string)$this->corsMaxAge);
89
+		$response->addHeader('Access-Control-Max-Age', (string) $this->corsMaxAge);
90 90
 		$response->addHeader('Access-Control-Allow-Headers', $this->corsAllowedHeaders);
91 91
 		$response->addHeader('Access-Control-Allow-Credentials', 'false');
92 92
 		return $response;
Please login to merge, or discard this patch.
lib/public/AppFramework/App.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
 
83 83
 		if ($runIsSetupDirectly) {
84 84
 			$applicationClassName = get_class($this);
85
-			$e = new \RuntimeException('App class ' . $applicationClassName . ' is not setup via query() but directly');
85
+			$e = new \RuntimeException('App class '.$applicationClassName.' is not setup via query() but directly');
86 86
 			$setUpViaQuery = false;
87 87
 
88 88
 			$classNameParts = explode('\\', trim($applicationClassName, '\\'));
Please login to merge, or discard this patch.
lib/private/Authentication/Listeners/UserDeletedTokenCleanupListener.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
 				$this->manager->invalidateTokenById($uid, $token->getId());
65 65
 			}
66 66
 		} catch (Throwable $e) {
67
-			$this->logger->error('Could not clean up auth tokens after user deletion: ' . $e->getMessage(), [
67
+			$this->logger->error('Could not clean up auth tokens after user deletion: '.$e->getMessage(), [
68 68
 				'exception' => $e,
69 69
 			]);
70 70
 		}
Please login to merge, or discard this patch.
apps/settings/templates/settings/personal/security/twofactor.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,12 +25,12 @@
 block discarded – undo
25 25
 ?>
26 26
 
27 27
 <div id="two-factor-auth" class="section">
28
-	<h2><?php p($l->t('Two-Factor Authentication'));?></h2>
28
+	<h2><?php p($l->t('Two-Factor Authentication')); ?></h2>
29 29
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
30
-	   title="<?php p($l->t('Open documentation'));?>"
30
+	   title="<?php p($l->t('Open documentation')); ?>"
31 31
 	   href="<?php p(link_to_docs('user-2fa')); ?>"></a>
32
-	<p class="settings-hint"><?php p($l->t('Use a second factor besides your password to increase security for your account.'));?></p>
33
-	<p class="settings-hint"><?php p($l->t('If you use third party applications to connect to Nextcloud, please make sure to create and configure an app password for each before enabling second factor authentication.'));?></p>
32
+	<p class="settings-hint"><?php p($l->t('Use a second factor besides your password to increase security for your account.')); ?></p>
33
+	<p class="settings-hint"><?php p($l->t('If you use third party applications to connect to Nextcloud, please make sure to create and configure an app password for each before enabling second factor authentication.')); ?></p>
34 34
 	<ul>
35 35
 	<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
36 36
 		<li>
Please login to merge, or discard this patch.
apps/files_sharing/lib/External/MountProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
 		$managerProvider = $this->managerProvider;
64 64
 		$manager = $managerProvider();
65 65
 		$data['manager'] = $manager;
66
-		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
66
+		$mountPoint = '/'.$user->getUID().'/files/'.ltrim($data['mountpoint'], '/');
67 67
 		$data['mountpoint'] = $mountPoint;
68 68
 		$data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']);
69 69
 		$data['certificateManager'] = \OC::$server->getCertificateManager();
Please login to merge, or discard this patch.
lib/private/AppFramework/Http/Output.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
 	 * @param bool $httpOnly
95 95
 	 */
96 96
 	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly, $sameSite = 'Lax') {
97
-		$path = $this->webRoot ? : '/';
97
+		$path = $this->webRoot ?: '/';
98 98
 
99 99
 		setcookie($name, $value, [
100 100
 			'expires' => $expire,
Please login to merge, or discard this patch.