Completed
Push — master ( 672e4f...e22914 )
by Maxence
21:09 queued 14s
created
lib/private/Files/Mount/ObjectStorePreviewCacheMountProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 			foreach ($directoryRange as $child) {
68 68
 				$mountPoints[] = new MountPoint(
69 69
 					AppdataPreviewObjectStoreStorage::class,
70
-					'/appdata_' . $instanceId . '/preview/' . $parent . '/' . $child,
70
+					'/appdata_'.$instanceId.'/preview/'.$parent.'/'.$child,
71 71
 					$this->getMultiBucketObjectStore($i),
72 72
 					$loader,
73 73
 					null,
@@ -82,13 +82,13 @@  discard block
 block discarded – undo
82 82
 		$fakeRootStorage = new ObjectStoreStorage($rootStorageArguments);
83 83
 		$fakeRootStorageJail = new Jail([
84 84
 			'storage' => $fakeRootStorage,
85
-			'root' => '/appdata_' . $instanceId . '/preview',
85
+			'root' => '/appdata_'.$instanceId.'/preview',
86 86
 		]);
87 87
 
88 88
 		// add a fallback location to be able to fetch existing previews from the old bucket
89 89
 		$mountPoints[] = new MountPoint(
90 90
 			$fakeRootStorageJail,
91
-			'/appdata_' . $instanceId . '/preview/old-multibucket',
91
+			'/appdata_'.$instanceId.'/preview/old-multibucket',
92 92
 			null,
93 93
 			$loader,
94 94
 			null,
Please login to merge, or discard this patch.
lib/private/Group/MetaData.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
 	 * @param string $userSearch the pattern users are search for
79 79
 	 */
80 80
 	public function get(string $groupSearch = '', string $userSearch = ''): array {
81
-		$key = $groupSearch . '::' . $userSearch;
81
+		$key = $groupSearch.'::'.$userSearch;
82 82
 		if (isset($this->metaData[$key])) {
83 83
 			return $this->metaData[$key];
84 84
 		}
Please login to merge, or discard this patch.
apps/admin_audit/lib/AuditLogger.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 		$logFile = $config->getSystemValueString('logfile_audit', '');
43 43
 
44 44
 		if ($auditType === 'file' && !$logFile) {
45
-			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/audit.log';
45
+			$default = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/audit.log';
46 46
 			// Legacy way was appconfig, now it's paralleled with the normal log config
47 47
 			$logFile = $config->getAppValue('admin_audit', 'logfile', $default);
48 48
 		}
Please login to merge, or discard this patch.
apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -89,11 +89,11 @@
 block discarded – undo
89 89
 			return;
90 90
 		}
91 91
 
92
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function () {
92
+		$this->initialState->provideLazyInitialState(Application::APP_ID, 'status', function() {
93 93
 			return $this->jsDataService;
94 94
 		});
95 95
 
96
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function () use ($user) {
96
+		$this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function() use ($user) {
97 97
 			return ['profileEnabled' => $this->profileManager->isProfileEnabled($user)];
98 98
 		});
99 99
 
Please login to merge, or discard this patch.
apps/settings/lib/Controller/AuthSettingsController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 		}
147 147
 
148 148
 		if (mb_strlen($name) > 128) {
149
-			$name = mb_substr($name, 0, 120) . '…';
149
+			$name = mb_substr($name, 0, 120).'…';
150 150
 		}
151 151
 
152 152
 		$token = $this->generateRandomDeviceToken();
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 		}
247 247
 
248 248
 		if (mb_strlen($name) > 128) {
249
-			$name = mb_substr($name, 0, 120) . '…';
249
+			$name = mb_substr($name, 0, 120).'…';
250 250
 		}
251 251
 
252 252
 		if ($token instanceof INamedToken && $name !== $currentName) {
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	}
48 48
 
49 49
 	public function md5($input): IQueryFunction {
50
-		return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
50
+		return new QueryFunction('MD5('.$this->helper->quoteColumnName($input).')');
51 51
 	}
52 52
 
53 53
 	public function concat($x, ...$expr): IQueryFunction {
@@ -61,64 +61,64 @@  discard block
 block discarded – undo
61 61
 
62 62
 	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
63 63
 		$separator = $this->connection->quote($separator);
64
-		return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ' SEPARATOR ' . $separator . ')');
64
+		return new QueryFunction('GROUP_CONCAT('.$this->helper->quoteColumnName($expr).' SEPARATOR '.$separator.')');
65 65
 	}
66 66
 
67 67
 	public function substring($input, $start, $length = null): IQueryFunction {
68 68
 		if ($length) {
69
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
69
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).', '.$this->helper->quoteColumnName($length).')');
70 70
 		} else {
71
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
71
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).')');
72 72
 		}
73 73
 	}
74 74
 
75 75
 	public function sum($field): IQueryFunction {
76
-		return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
76
+		return new QueryFunction('SUM('.$this->helper->quoteColumnName($field).')');
77 77
 	}
78 78
 
79 79
 	public function lower($field): IQueryFunction {
80
-		return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
80
+		return new QueryFunction('LOWER('.$this->helper->quoteColumnName($field).')');
81 81
 	}
82 82
 
83 83
 	public function add($x, $y): IQueryFunction {
84
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' + ' . $this->helper->quoteColumnName($y));
84
+		return new QueryFunction($this->helper->quoteColumnName($x).' + '.$this->helper->quoteColumnName($y));
85 85
 	}
86 86
 
87 87
 	public function subtract($x, $y): IQueryFunction {
88
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' - ' . $this->helper->quoteColumnName($y));
88
+		return new QueryFunction($this->helper->quoteColumnName($x).' - '.$this->helper->quoteColumnName($y));
89 89
 	}
90 90
 
91 91
 	public function count($count = '', $alias = ''): IQueryFunction {
92
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
92
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
93 93
 		$quotedName = $count === '' ? '*' : $this->helper->quoteColumnName($count);
94
-		return new QueryFunction('COUNT(' . $quotedName . ')' . $alias);
94
+		return new QueryFunction('COUNT('.$quotedName.')'.$alias);
95 95
 	}
96 96
 
97 97
 	public function octetLength($field, $alias = ''): IQueryFunction {
98
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
98
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
99 99
 		$quotedName = $this->helper->quoteColumnName($field);
100
-		return new QueryFunction('OCTET_LENGTH(' . $quotedName . ')' . $alias);
100
+		return new QueryFunction('OCTET_LENGTH('.$quotedName.')'.$alias);
101 101
 	}
102 102
 
103 103
 	public function charLength($field, $alias = ''): IQueryFunction {
104
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
104
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
105 105
 		$quotedName = $this->helper->quoteColumnName($field);
106
-		return new QueryFunction('CHAR_LENGTH(' . $quotedName . ')' . $alias);
106
+		return new QueryFunction('CHAR_LENGTH('.$quotedName.')'.$alias);
107 107
 	}
108 108
 
109 109
 	public function max($field): IQueryFunction {
110
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($field) . ')');
110
+		return new QueryFunction('MAX('.$this->helper->quoteColumnName($field).')');
111 111
 	}
112 112
 
113 113
 	public function min($field): IQueryFunction {
114
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
114
+		return new QueryFunction('MIN('.$this->helper->quoteColumnName($field).')');
115 115
 	}
116 116
 
117 117
 	public function greatest($x, $y): IQueryFunction {
118
-		return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
118
+		return new QueryFunction('GREATEST('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
119 119
 	}
120 120
 
121 121
 	public function least($x, $y): IQueryFunction {
122
-		return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
122
+		return new QueryFunction('LEAST('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
123 123
 	}
124 124
 }
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -38,26 +38,26 @@
 block discarded – undo
38 38
 
39 39
 	public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
40 40
 		$separator = $this->connection->quote($separator);
41
-		return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ', ' . $separator . ')');
41
+		return new QueryFunction('GROUP_CONCAT('.$this->helper->quoteColumnName($expr).', '.$separator.')');
42 42
 	}
43 43
 
44 44
 	public function greatest($x, $y): IQueryFunction {
45
-		return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
45
+		return new QueryFunction('MAX('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
46 46
 	}
47 47
 
48 48
 	public function least($x, $y): IQueryFunction {
49
-		return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
49
+		return new QueryFunction('MIN('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
50 50
 	}
51 51
 
52 52
 	public function octetLength($field, $alias = ''): IQueryFunction {
53
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
53
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
54 54
 		$quotedName = $this->helper->quoteColumnName($field);
55
-		return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);
55
+		return new QueryFunction('LENGTH(CAST('.$quotedName.' as BLOB))'.$alias);
56 56
 	}
57 57
 
58 58
 	public function charLength($field, $alias = ''): IQueryFunction {
59
-		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
59
+		$alias = $alias ? (' AS '.$this->helper->quoteColumnName($alias)) : '';
60 60
 		$quotedName = $this->helper->quoteColumnName($field);
61
-		return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
61
+		return new QueryFunction('LENGTH('.$quotedName.')'.$alias);
62 62
 	}
63 63
 }
Please login to merge, or discard this patch.
apps/user_ldap/lib/Migration/Version1120Date20210917155206.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@
 block discarded – undo
143 143
 
144 144
 	protected function emitUnassign(string $oldId, bool $pre): void {
145 145
 		if ($this->userManager instanceof PublicEmitter) {
146
-			$this->userManager->emit('\OC\User', $pre ? 'pre' : 'post' . 'UnassignedUserId', [$oldId]);
146
+			$this->userManager->emit('\OC\User', $pre ? 'pre' : 'post'.'UnassignedUserId', [$oldId]);
147 147
 		}
148 148
 	}
149 149
 
Please login to merge, or discard this patch.
lib/private/Files/ObjectStore/SwiftFactory.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	}
92 92
 
93 93
 	private function getCachedToken(string $cacheKey) {
94
-		$cachedTokenString = $this->cache->get($cacheKey . '/token');
94
+		$cachedTokenString = $this->cache->get($cacheKey.'/token');
95 95
 		if ($cachedTokenString) {
96 96
 			return json_decode($cachedTokenString, true);
97 97
 		} else {
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 		}
118 118
 
119 119
 		$this->params['cachedToken'] = $value;
120
-		$this->cache->set($cacheKey . '/token', json_encode($value));
120
+		$this->cache->set($cacheKey.'/token', json_encode($value));
121 121
 	}
122 122
 
123 123
 	/**
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 		}
149 149
 		$this->params = array_merge(self::DEFAULT_OPTIONS, $this->params);
150 150
 
151
-		$cacheKey = $userName . '@' . $this->params['url'] . '/' . $this->params['container'];
151
+		$cacheKey = $userName.'@'.$this->params['url'].'/'.$this->params['container'];
152 152
 		$token = $this->getCachedToken($cacheKey);
153 153
 		$this->params['cachedToken'] = $token;
154 154
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 			if ($authService instanceof IdentityV3Service) {
185 185
 				$token = $authService->generateTokenFromCache($cachedToken);
186 186
 				if (\is_null($token->catalog)) {
187
-					$this->logger->warning('Invalid cached token for swift, no catalog set: ' . json_encode($cachedToken));
187
+					$this->logger->warning('Invalid cached token for swift, no catalog set: '.json_encode($cachedToken));
188 188
 				} elseif ($token->hasExpired()) {
189 189
 					$this->logger->debug('Cached token for swift expired');
190 190
 				} else {
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 		} catch (ConnectException $e) {
279 279
 			/** @var RequestInterface $request */
280 280
 			$request = $e->getRequest();
281
-			$host = $request->getUri()->getHost() . ':' . $request->getUri()->getPort();
281
+			$host = $request->getUri()->getHost().':'.$request->getUri()->getPort();
282 282
 			$this->logger->error("Can't connect to object storage server at $host", ['exception' => $e]);
283 283
 			throw new StorageNotAvailableException("Can't connect to object storage server at $host", StorageNotAvailableException::STATUS_ERROR, $e);
284 284
 		}
Please login to merge, or discard this patch.