Completed
Push — master ( 89fdd0...fb17f1 )
by Morris
28:03 queued 12:49
created
lib/private/DB/QueryBuilder/ExpressionBuilder/SqliteExpressionBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 	 * @inheritdoc
30 30
 	 */
31 31
 	public function like($x, $y, $type = null) {
32
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
32
+		return parent::like($x, $y, $type)." ESCAPE '\\'";
33 33
 	}
34 34
 
35 35
 	public function iLike($x, $y, $type = null) {
Please login to merge, or discard this patch.
apps/files/lib/Helper.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 			'freeSpace' => $storageInfo['free'],
59 59
 			'quota' => $storageInfo['quota'],
60 60
 			'used' => $storageInfo['used'],
61
-			'usedSpacePercent'  => (int)$storageInfo['relative'],
61
+			'usedSpacePercent'  => (int) $storageInfo['relative'],
62 62
 			'owner' => $storageInfo['owner'],
63 63
 			'ownerDisplayName' => $storageInfo['ownerDisplayName'],
64 64
 		];
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 * @return string icon URL
72 72
 	 */
73 73
 	public static function determineIcon($file) {
74
-		if($file['type'] === 'dir') {
74
+		if ($file['type'] === 'dir') {
75 75
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
76 76
 			// TODO: move this part to the client side, using mountType
77 77
 			if ($file->isShared()) {
@@ -79,11 +79,11 @@  discard block
 block discarded – undo
79 79
 			} elseif ($file->isMounted()) {
80 80
 				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
81 81
 			}
82
-		}else{
82
+		} else {
83 83
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
84 84
 		}
85 85
 
86
-		return substr($icon, 0, -3) . 'svg';
86
+		return substr($icon, 0, -3).'svg';
87 87
 	}
88 88
 
89 89
 	/**
Please login to merge, or discard this patch.
apps/files_external/lib/Command/Verify.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 		try {
72 72
 			$mount = $this->globalService->getStorage($mountId);
73 73
 		} catch (NotFoundException $e) {
74
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
74
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
75 75
 			return 404;
76 76
 		}
77 77
 
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 
106 106
 			foreach ($configInput as $configOption) {
107 107
 				if (!strpos($configOption, '=')) {
108
-					$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
108
+					$output->writeln('<error>Invalid mount configuration option "'.$configOption.'"</error>');
109 109
 					return;
110 110
 				}
111 111
 				list($key, $value) = explode('=', $configOption, 2);
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 			// FIXME: convert storage exceptions to StorageNotAvailableException
138 138
 			$storage->setStatus(
139 139
 				StorageNotAvailableException::STATUS_ERROR,
140
-				get_class($e) . ': ' . $e->getMessage()
140
+				get_class($e).': '.$e->getMessage()
141 141
 			);
142 142
 		}
143 143
 	}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Backend/InvalidBackend.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 		$this
50 50
 			->setIdentifier($invalidId)
51 51
 			->setStorageClass('\OC\Files\Storage\FailedStorage')
52
-			->setText('Unknown storage backend ' . $invalidId);
52
+			->setText('Unknown storage backend '.$invalidId);
53 53
 	}
54 54
 
55 55
 	/**
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	}
63 63
 
64 64
 	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
65
-		$storage->setBackendOption('exception', new \Exception('Unknown storage backend "' . $this->invalidId . '"', StorageNotAvailableException::STATUS_ERROR));
65
+		$storage->setBackendOption('exception', new \Exception('Unknown storage backend "'.$this->invalidId.'"', StorageNotAvailableException::STATUS_ERROR));
66 66
 	}
67 67
 }
68 68
 
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Backend/SMB_OC.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
 		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
66 66
 
67 67
 		if ($username_as_share) {
68
-			$share = '/' . $storage->getBackendOption('user');
68
+			$share = '/'.$storage->getBackendOption('user');
69 69
 			$storage->setBackendOption('share', $share);
70 70
 		}
71 71
 	}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Auth/Password/UserProvided.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
 	}
62 62
 
63 63
 	private function getCredentialsIdentifier($storageId) {
64
-		return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId;
64
+		return self::CREDENTIALS_IDENTIFIER_PREFIX.$storageId;
65 65
 	}
66 66
 
67 67
 	public function saveBackendOptions(IUser $user, $id, array $options) {
Please login to merge, or discard this patch.
apps/files_external/lib/Controller/StoragesController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 			$this->logger->logException($e);
128 128
 			return new DataResponse(
129 129
 				[
130
-					'message' => (string)$this->l10n->t('Invalid backend or authentication mechanism class')
130
+					'message' => (string) $this->l10n->t('Invalid backend or authentication mechanism class')
131 131
 				],
132 132
 				Http::STATUS_UNPROCESSABLE_ENTITY
133 133
 			);
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 		if ($mountPoint === '') {
147 147
 			return new DataResponse(
148 148
 				array(
149
-					'message' => (string)$this->l10n->t('Invalid mount point')
149
+					'message' => (string) $this->l10n->t('Invalid mount point')
150 150
 				),
151 151
 				Http::STATUS_UNPROCESSABLE_ENTITY
152 152
 			);
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 			// objectstore must not be sent from client side
157 157
 			return new DataResponse(
158 158
 				array(
159
-					'message' => (string)$this->l10n->t('Objectstore forbidden')
159
+					'message' => (string) $this->l10n->t('Objectstore forbidden')
160 160
 				),
161 161
 				Http::STATUS_UNPROCESSABLE_ENTITY
162 162
 			);
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 			// invalid backend
171 171
 			return new DataResponse(
172 172
 				array(
173
-					'message' => (string)$this->l10n->t('Invalid storage backend "%s"', [
173
+					'message' => (string) $this->l10n->t('Invalid storage backend "%s"', [
174 174
 						$backend->getIdentifier()
175 175
 					])
176 176
 				),
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 			// not permitted to use backend
183 183
 			return new DataResponse(
184 184
 				array(
185
-					'message' => (string)$this->l10n->t('Not permitted to use backend "%s"', [
185
+					'message' => (string) $this->l10n->t('Not permitted to use backend "%s"', [
186 186
 						$backend->getIdentifier()
187 187
 					])
188 188
 				),
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 			// not permitted to use auth mechanism
194 194
 			return new DataResponse(
195 195
 				array(
196
-					'message' => (string)$this->l10n->t('Not permitted to use authentication mechanism "%s"', [
196
+					'message' => (string) $this->l10n->t('Not permitted to use authentication mechanism "%s"', [
197 197
 						$authMechanism->getIdentifier()
198 198
 					])
199 199
 				),
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 			// unsatisfied parameters
206 206
 			return new DataResponse(
207 207
 				array(
208
-					'message' => (string)$this->l10n->t('Unsatisfied backend parameters')
208
+					'message' => (string) $this->l10n->t('Unsatisfied backend parameters')
209 209
 				),
210 210
 				Http::STATUS_UNPROCESSABLE_ENTITY
211 211
 			);
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 			// unsatisfied parameters
215 215
 			return new DataResponse(
216 216
 				[
217
-					'message' => (string)$this->l10n->t('Unsatisfied authentication mechanism parameters')
217
+					'message' => (string) $this->l10n->t('Unsatisfied authentication mechanism parameters')
218 218
 				],
219 219
 				Http::STATUS_UNPROCESSABLE_ENTITY
220 220
 			);
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		} catch (NotFoundException $e) {
307 307
 			return new DataResponse(
308 308
 				[
309
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
309
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
310 310
 				],
311 311
 				Http::STATUS_NOT_FOUND
312 312
 			);
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 		} catch (NotFoundException $e) {
332 332
 			return new DataResponse(
333 333
 				[
334
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
334
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
335 335
 				],
336 336
 				Http::STATUS_NOT_FOUND
337 337
 			);
Please login to merge, or discard this patch.
lib/private/Template/CSSResourceLocator.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -64,13 +64,13 @@  discard block
 block discarded – undo
64 64
 		) {
65 65
 			return;
66 66
 		}
67
-		$style = substr($style, strpos($style, '/')+1);
67
+		$style = substr($style, strpos($style, '/') + 1);
68 68
 		$app_path = \OC_App::getAppPath($app);
69 69
 		$app_url = \OC_App::getAppWebPath($app);
70 70
 
71 71
 		if ($app_path === false && $app_url === false) {
72 72
 			$this->logger->error('Could not find resource {resource} to load', [
73
-				'resource' => $app . '/' . $style . '.css',
73
+				'resource' => $app.'/'.$style.'.css',
74 74
 				'app' => 'cssresourceloader',
75 75
 			]);
76 76
 			return;
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		// turned into cwd.
82 82
 		$app_path = realpath($app_path);
83 83
 
84
-		if(!$this->cacheAndAppendScssIfExist($app_path, $style.'.scss', $app)) {
84
+		if (!$this->cacheAndAppendScssIfExist($app_path, $style.'.scss', $app)) {
85 85
 			$this->append($app_path, $style.'.css', $app_url);
86 86
 		}
87 87
 	}
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
 	 */
106 106
 	protected function cacheAndAppendScssIfExist($root, $file, $app = 'core') {
107 107
 		if (is_file($root.'/'.$file)) {
108
-			if($this->scssCacher !== null) {
109
-				if($this->scssCacher->process($root, $file, $app)) {
108
+			if ($this->scssCacher !== null) {
109
+				if ($this->scssCacher->process($root, $file, $app)) {
110 110
 
111 111
 					$this->append($root, $this->scssCacher->getCachedSCSS($app, $file), \OC::$WEBROOT, true, true);
112 112
 					return true;
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 				}
146 146
 			}
147 147
 
148
-			$this->resources[] = array($webRoot? : \OC::$WEBROOT, $webRoot, $file);
148
+			$this->resources[] = array($webRoot ?: \OC::$WEBROOT, $webRoot, $file);
149 149
 		}
150 150
 	}
151 151
 }
Please login to merge, or discard this patch.
apps/user_ldap/lib/LDAP.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
 	 * @return mixed
53 53
 	 */
54 54
 	public function connect($host, $port) {
55
-		if(strpos($host, '://') === false) {
56
-			$host = 'ldap://' . $host;
55
+		if (strpos($host, '://') === false) {
56
+			$host = 'ldap://'.$host;
57 57
 		}
58
-		if(strpos($host, ':', strpos($host, '://') + 1) === false) {
58
+		if (strpos($host, ':', strpos($host, '://') + 1) === false) {
59 59
 			//ldap_connect ignores port parameter when URLs are passed
60
-			$host .= ':' . $port;
60
+			$host .= ':'.$port;
61 61
 		}
62 62
 		return $this->invokeLDAPMethod('connect', $host);
63 63
 	}
@@ -267,13 +267,13 @@  discard block
 block discarded – undo
267 267
 	 * @return bool
268 268
 	 */
269 269
 	protected function isResultFalse($result) {
270
-		if($result === false) {
270
+		if ($result === false) {
271 271
 			return true;
272 272
 		}
273 273
 
274
-		if($this->curFunc === 'ldap_search' && is_array($result)) {
274
+		if ($this->curFunc === 'ldap_search' && is_array($result)) {
275 275
 			foreach ($result as $singleResult) {
276
-				if($singleResult === false) {
276
+				if ($singleResult === false) {
277 277
 					return true;
278 278
 				}
279 279
 			}
@@ -287,8 +287,8 @@  discard block
 block discarded – undo
287 287
 	 */
288 288
 	protected function invokeLDAPMethod() {
289 289
 		$arguments = func_get_args();
290
-		$func = 'ldap_' . array_shift($arguments);
291
-		if(function_exists($func)) {
290
+		$func = 'ldap_'.array_shift($arguments);
291
+		if (function_exists($func)) {
292 292
 			$this->preFunctionCall($func, $arguments);
293 293
 			$result = call_user_func_array($func, $arguments);
294 294
 			if ($this->isResultFalse($result)) {
@@ -318,12 +318,12 @@  discard block
 block discarded – undo
318 318
 	 */
319 319
 	private function processLDAPError($resource) {
320 320
 		$errorCode = ldap_errno($resource);
321
-		if($errorCode === 0) {
321
+		if ($errorCode === 0) {
322 322
 			return;
323 323
 		}
324
-		$errorMsg  = ldap_error($resource);
324
+		$errorMsg = ldap_error($resource);
325 325
 
326
-		if($this->curFunc === 'ldap_get_entries'
326
+		if ($this->curFunc === 'ldap_get_entries'
327 327
 			&& $errorCode === -4) {
328 328
 		} else if ($errorCode === 32) {
329 329
 			//for now
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
 			throw new \Exception('LDAP Operations error', $errorCode);
340 340
 		} else if ($errorCode === 19) {
341 341
 			ldap_get_option($this->curArgs[0], LDAP_OPT_ERROR_STRING, $extended_error);
342
-			throw new ConstraintViolationException(!empty($extended_error)?$extended_error:$errorMsg, $errorCode);
342
+			throw new ConstraintViolationException(!empty($extended_error) ? $extended_error : $errorMsg, $errorCode);
343 343
 		} else {
344 344
 			\OC::$server->getLogger()->debug('LDAP error {message} ({code}) after calling {func}', [
345 345
 				'app' => 'user_ldap',
@@ -354,9 +354,9 @@  discard block
 block discarded – undo
354 354
 	 * Called after an ldap method is run to act on LDAP error if necessary
355 355
 	 */
356 356
 	private function postFunctionCall() {
357
-		if($this->isResource($this->curArgs[0])) {
357
+		if ($this->isResource($this->curArgs[0])) {
358 358
 			$resource = $this->curArgs[0];
359
-		} else if(
359
+		} else if (
360 360
 			   $this->curFunc === 'ldap_search'
361 361
 			&& is_array($this->curArgs[0])
362 362
 			&& $this->isResource($this->curArgs[0][0])
Please login to merge, or discard this patch.