Completed
Push — master ( 47b46d...809bbe )
by
unknown
28:10
created
lib/private/Files/Search/QueryOptimizer/QueryOptimizerStep.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 	 * @param ISearchOperator $operator
48 48
 	 * @return void
49 49
 	 */
50
-	public function processOperator(ISearchOperator &$operator) {
50
+	public function processOperator(ISearchOperator & $operator) {
51 51
 		if ($operator instanceof ISearchBinaryOperator) {
52 52
 			foreach ($operator->getArguments() as $argument) {
53 53
 				$this->processOperator($argument);
Please login to merge, or discard this patch.
apps/encryption/lib/Recovery.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 		$encryptedRecoveryKey = $this->crypt->encryptPrivateKey($decryptedRecoveryKey, $newPassword);
124 124
 		$header = $this->crypt->generateHeader();
125 125
 		if ($encryptedRecoveryKey) {
126
-			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header . $encryptedRecoveryKey);
126
+			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header.$encryptedRecoveryKey);
127 127
 			return true;
128 128
 		}
129 129
 		return false;
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
184 184
 				$value);
185 185
 
186 186
 			if ($value === '1') {
187
-				$this->addRecoveryKeys('/' . $this->user->getUID() . '/files/');
187
+				$this->addRecoveryKeys('/'.$this->user->getUID().'/files/');
188 188
 			} else {
189
-				$this->removeRecoveryKeys('/' . $this->user->getUID() . '/files/');
189
+				$this->removeRecoveryKeys('/'.$this->user->getUID().'/files/');
190 190
 			}
191 191
 
192 192
 			return true;
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 		foreach ($dirContent as $item) {
204 204
 			$filePath = $item->getPath();
205 205
 			if ($item['type'] === 'dir') {
206
-				$this->addRecoveryKeys($filePath . '/');
206
+				$this->addRecoveryKeys($filePath.'/');
207 207
 			} else {
208 208
 				$fileKey = $this->keyManager->getFileKey($filePath, $this->user->getUID(), null);
209 209
 				if (!empty($fileKey)) {
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 		foreach ($dirContent as $item) {
234 234
 			$filePath = $item->getPath();
235 235
 			if ($item['type'] === 'dir') {
236
-				$this->removeRecoveryKeys($filePath . '/');
236
+				$this->removeRecoveryKeys($filePath.'/');
237 237
 			} else {
238 238
 				$this->keyManager->deleteShareKey($filePath, $this->keyManager->getRecoveryKeyId());
239 239
 			}
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 
249 249
 		$privateKey = $this->crypt->decryptPrivateKey($encryptedKey, $recoveryPassword);
250 250
 		if ($privateKey !== false) {
251
-			$this->recoverAllFiles('/' . $user . '/files/', $privateKey, $user);
251
+			$this->recoverAllFiles('/'.$user.'/files/', $privateKey, $user);
252 252
 		}
253 253
 	}
254 254
 
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 			// Get relative path from encryption/keyfiles
263 263
 			$filePath = $item->getPath();
264 264
 			if ($this->view->is_dir($filePath)) {
265
-				$this->recoverAllFiles($filePath . '/', $privateKey, $uid);
265
+				$this->recoverAllFiles($filePath.'/', $privateKey, $uid);
266 266
 			} else {
267 267
 				$this->recoverFile($filePath, $privateKey, $uid);
268 268
 			}
Please login to merge, or discard this patch.
lib/private/Files/Storage/LocalTempFileTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	/** @var array<string,string|false> */
39 39
 	protected array $cachedFiles = [];
40 40
 
41
-	protected function getCachedFile(string $path): string|false {
41
+	protected function getCachedFile(string $path): string | false {
42 42
 		if (!isset($this->cachedFiles[$path])) {
43 43
 			$this->cachedFiles[$path] = $this->toTmpFile($path);
44 44
 		}
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		unset($this->cachedFiles[$path]);
53 53
 	}
54 54
 
55
-	protected function toTmpFile(string $path): string|false { //no longer in the storage api, still useful here
55
+	protected function toTmpFile(string $path): string | false { //no longer in the storage api, still useful here
56 56
 		$source = $this->fopen($path, 'r');
57 57
 		if (!$source) {
58 58
 			return false;
Please login to merge, or discard this patch.
lib/private/Repair/MoveUpdaterStepFile.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,19 +42,19 @@
 block discarded – undo
42 42
 	}
43 43
 
44 44
 	public function run(IOutput $output) {
45
-		$updateDir = $this->config->getSystemValue('updatedirectory', null) ?? $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
45
+		$updateDir = $this->config->getSystemValue('updatedirectory', null) ?? $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
46 46
 		$instanceId = $this->config->getSystemValueString('instanceid');
47 47
 
48 48
 		if (empty($instanceId)) {
49 49
 			return;
50 50
 		}
51 51
 
52
-		$updaterFolderPath = $updateDir . '/updater-' . $instanceId;
53
-		$stepFile = $updaterFolderPath . '/.step';
52
+		$updaterFolderPath = $updateDir.'/updater-'.$instanceId;
53
+		$stepFile = $updaterFolderPath.'/.step';
54 54
 		if (file_exists($stepFile)) {
55 55
 			$output->info('.step file exists');
56 56
 
57
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
57
+			$previousStepFile = $updaterFolderPath.'/.step-previous-update';
58 58
 
59 59
 			// cleanup
60 60
 			if (file_exists($previousStepFile)) {
Please login to merge, or discard this patch.
lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -39,17 +39,17 @@
 block discarded – undo
39 39
 		}
40 40
 
41 41
 		$excludedFolders = [
42
-			rtrim($root . '/data', '/'),
43
-			rtrim($root . '/themes', '/'),
44
-			rtrim($root . '/config', '/'),
45
-			rtrim($root . '/apps', '/'),
46
-			rtrim($root . '/assets', '/'),
47
-			rtrim($root . '/lost+found', '/'),
42
+			rtrim($root.'/data', '/'),
43
+			rtrim($root.'/themes', '/'),
44
+			rtrim($root.'/config', '/'),
45
+			rtrim($root.'/apps', '/'),
46
+			rtrim($root.'/assets', '/'),
47
+			rtrim($root.'/lost+found', '/'),
48 48
 			// Ignore folders generated by updater since the updater is replaced
49 49
 			// after the integrity check is run.
50 50
 			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
51
-			rtrim($root . '/updater', '/'),
52
-			rtrim($root . '/_oc_upgrade', '/'),
51
+			rtrim($root.'/updater', '/'),
52
+			rtrim($root.'/_oc_upgrade', '/'),
53 53
 		];
54 54
 		$customDataDir = \OC::$server->getConfig()->getSystemValueString('datadirectory', '');
55 55
 		if ($customDataDir !== '') {
Please login to merge, or discard this patch.
lib/private/DB/PgSqlTools.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,9 +51,9 @@
 block discarded – undo
51 51
 	 */
52 52
 	public function resynchronizeDatabaseSequences(Connection $conn) {
53 53
 		$databaseName = $conn->getDatabase();
54
-		$conn->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
54
+		$conn->getConfiguration()->setSchemaAssetsFilter(function($asset) {
55 55
 			/** @var string|AbstractAsset $asset */
56
-			$filterExpression = '/^' . preg_quote($this->config->getSystemValueString('dbtableprefix', 'oc_')) . '/';
56
+			$filterExpression = '/^'.preg_quote($this->config->getSystemValueString('dbtableprefix', 'oc_')).'/';
57 57
 			if ($asset instanceof AbstractAsset) {
58 58
 				return preg_match($filterExpression, $asset->getName()) !== false;
59 59
 			}
Please login to merge, or discard this patch.
lib/private/Files/Mount/CacheMountProvider.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -54,15 +54,15 @@
 block discarded – undo
54 54
 	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
55 55
 		$cacheBaseDir = $this->config->getSystemValueString('cache_path', '');
56 56
 		if ($cacheBaseDir !== '') {
57
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
57
+			$cacheDir = rtrim($cacheBaseDir, '/').'/'.$user->getUID();
58 58
 			if (!file_exists($cacheDir)) {
59 59
 				mkdir($cacheDir, 0770, true);
60
-				mkdir($cacheDir . '/uploads', 0770, true);
60
+				mkdir($cacheDir.'/uploads', 0770, true);
61 61
 			}
62 62
 
63 63
 			return [
64
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir], $loader, null, null, self::class),
65
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads'], $loader, null, null, self::class)
64
+				new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/cache', ['datadir' => $cacheDir], $loader, null, null, self::class),
65
+				new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/uploads', ['datadir' => $cacheDir.'/uploads'], $loader, null, null, self::class)
66 66
 			];
67 67
 		} else {
68 68
 			return [];
Please login to merge, or discard this patch.
apps/dav/composer/composer/InstalledVersions.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
             return implode(' || ', $ranges);
159 159
         }
160 160
 
161
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
161
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
162 162
     }
163 163
 
164 164
     /**
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
             return $installed['versions'][$packageName]['version'];
180 180
         }
181 181
 
182
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
182
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
183 183
     }
184 184
 
185 185
     /**
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
             return $installed['versions'][$packageName]['pretty_version'];
201 201
         }
202 202
 
203
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
203
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
204 204
     }
205 205
 
206 206
     /**
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
             return $installed['versions'][$packageName]['reference'];
222 222
         }
223 223
 
224
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
224
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
225 225
     }
226 226
 
227 227
     /**
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
             return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
239 239
         }
240 240
 
241
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
241
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
242 242
     }
243 243
 
244 244
     /**
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
             // only require the installed.php file if this file is loaded from its dumped location,
268 268
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
269 269
             if (substr(__DIR__, -8, 1) !== 'C') {
270
-                self::$installed = include __DIR__ . '/installed.php';
270
+                self::$installed = include __DIR__.'/installed.php';
271 271
             } else {
272 272
                 self::$installed = array();
273 273
             }
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
344 344
             if (substr(__DIR__, -8, 1) !== 'C') {
345 345
                 /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
346
-                $required = require __DIR__ . '/installed.php';
346
+                $required = require __DIR__.'/installed.php';
347 347
                 self::$installed = $required;
348 348
             } else {
349 349
                 self::$installed = array();
Please login to merge, or discard this patch.
apps/files_versions/composer/composer/InstalledVersions.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
             return implode(' || ', $ranges);
159 159
         }
160 160
 
161
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
161
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
162 162
     }
163 163
 
164 164
     /**
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
             return $installed['versions'][$packageName]['version'];
180 180
         }
181 181
 
182
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
182
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
183 183
     }
184 184
 
185 185
     /**
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
             return $installed['versions'][$packageName]['pretty_version'];
201 201
         }
202 202
 
203
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
203
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
204 204
     }
205 205
 
206 206
     /**
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
             return $installed['versions'][$packageName]['reference'];
222 222
         }
223 223
 
224
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
224
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
225 225
     }
226 226
 
227 227
     /**
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
             return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
239 239
         }
240 240
 
241
-        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
241
+        throw new \OutOfBoundsException('Package "'.$packageName.'" is not installed');
242 242
     }
243 243
 
244 244
     /**
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
             // only require the installed.php file if this file is loaded from its dumped location,
268 268
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
269 269
             if (substr(__DIR__, -8, 1) !== 'C') {
270
-                self::$installed = include __DIR__ . '/installed.php';
270
+                self::$installed = include __DIR__.'/installed.php';
271 271
             } else {
272 272
                 self::$installed = array();
273 273
             }
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
344 344
             if (substr(__DIR__, -8, 1) !== 'C') {
345 345
                 /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
346
-                $required = require __DIR__ . '/installed.php';
346
+                $required = require __DIR__.'/installed.php';
347 347
                 self::$installed = $required;
348 348
             } else {
349 349
                 self::$installed = array();
Please login to merge, or discard this patch.