Completed
Pull Request — master (#384)
by Tortue
02:31
created
lib/Migration/ImportOwncloudCustomGroups.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
 				continue;
149 149
 			}
150 150
 
151
-			$level = (int) $row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER;
151
+			$level = (int)$row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER;
152 152
 
153 153
 			if ($level === Member::LEVEL_OWNER) {
154 154
 				if (isset($this->circleHasAdmin[$this->circlesById[$row['group_id']]])) {
Please login to merge, or discard this patch.
lib/Migration/GenerateUniqueIdOnCreatedCircle.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
 
94 94
 			$update = $this->connection->getQueryBuilder();
95 95
 			$update->update('circles_circles')
96
-				   ->set('unique_id', $update->createNamedParameter('d' . $uniqueId))
96
+				   ->set('unique_id', $update->createNamedParameter('d'.$uniqueId))
97 97
 				   ->where(
98 98
 					   $update->expr()
99 99
 							  ->eq('id', $update->createNamedParameter($itemId))
Please login to merge, or discard this patch.
lib/Service/SearchService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
 			$searcher = \OC::$server->query((string)$container);
89 89
 
90 90
 			if (!($searcher instanceof ISearch)) {
91
-				$this->miscService->log('Search ' . $container . ' is not compatible exception');
91
+				$this->miscService->log('Search '.$container.' is not compatible exception');
92 92
 				continue;
93 93
 			}
94 94
 
Please login to merge, or discard this patch.
lib/Service/MiscService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@
 block discarded – undo
284 284
 		ob_start();
285 285
 		echo(json_encode($result));
286 286
 		$size = ob_get_length();
287
-		header('Content-Length: ' . $size);
287
+		header('Content-Length: '.$size);
288 288
 		ob_end_flush();
289 289
 		flush();
290 290
 	}
Please login to merge, or discard this patch.
lib/Controller/TestController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
 	 * @return string
92 92
 	 */
93 93
 	private function generateTestAsyncURL($remote) {
94
-		return $this->configService->generateRemoteHost($remote) . Application::TEST_URL_ASYNC;
94
+		return $this->configService->generateRemoteHost($remote).Application::TEST_URL_ASYNC;
95 95
 	}
96 96
 
97 97
 
Please login to merge, or discard this patch.
lib/Db/CirclesRequestBuilder.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 				$expr->eq(
182 182
 					$qb->createNamedParameter($circleUniqueId),
183 183
 					$qb->createFunction(
184
-						'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
184
+						'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
185 185
 					)
186 186
 				)
187 187
 			);
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 		}
253 253
 
254 254
 		$expr = $qb->expr();
255
-		$pf = '`' . $this->default_select_alias . '`.';
255
+		$pf = '`'.$this->default_select_alias.'`.';
256 256
 
257 257
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
258 258
 		$qb->selectAlias('u.user_id', 'viewer_userid')
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 				   $expr->eq(
265 265
 					   'u.circle_id',
266 266
 					   $qb->createFunction(
267
-						   'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH
267
+						   'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH
268 268
 						   . ')'
269 269
 					   )
270 270
 				   ),
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 		}
288 288
 
289 289
 		$expr = $qb->expr();
290
-		$pf = '`' . $this->default_select_alias . '`.';
290
+		$pf = '`'.$this->default_select_alias.'`.';
291 291
 
292 292
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
293 293
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 			   $expr->andX(
299 299
 				   $expr->eq(
300 300
 					   $qb->createFunction(
301
-						   'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH
301
+						   'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH
302 302
 						   . ')'
303 303
 					   )
304 304
 					   , 'o.circle_id'
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 			   $qb->expr()
360 360
 				  ->eq(
361 361
 					  $qb->createFunction(
362
-						  'SUBSTR(`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
362
+						  'SUBSTR(`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
363 363
 					  ),
364 364
 					  $qb->createNamedParameter($circleUniqueId)
365 365
 				  )
Please login to merge, or discard this patch.
lib/Db/CoreRequestBuilder.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -140,12 +140,12 @@  discard block
 block discarded – undo
140 140
 	 */
141 141
 	protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId, $length) {
142 142
 		$expr = $qb->expr();
143
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? '`' . $this->default_select_alias . '`.' : '';
143
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? '`'.$this->default_select_alias.'`.' : '';
144 144
 
145 145
 		$qb->andWhere(
146 146
 			$expr->eq(
147 147
 				$qb->createNamedParameter($circleUniqueId),
148
-				$qb->createFunction('SUBSTR(' . $pf . '`unique_id`' . ', 1, ' . $length . ')')
148
+				$qb->createFunction('SUBSTR('.$pf.'`unique_id`'.', 1, '.$length.')')
149 149
 			)
150 150
 		);
151 151
 
@@ -198,8 +198,8 @@  discard block
 block discarded – undo
198 198
 		$expr = $qb->expr();
199 199
 
200 200
 		if ($pf === '') {
201
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
202
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
201
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
202
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
203 203
 
204 204
 			return;
205 205
 		}
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
228 228
 				continue;
229 229
 			}
230
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
230
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
231 231
 		}
232 232
 
233 233
 		return $orX;
@@ -242,12 +242,12 @@  discard block
 block discarded – undo
242 242
 	protected function limitToMembersAndAlmost(IQueryBuilder &$qb) {
243 243
 		$expr = $qb->expr();
244 244
 
245
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
245
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
246 246
 
247 247
 		$orX = $expr->orX();
248
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
249
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
250
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
248
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
249
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
250
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
251 251
 
252 252
 		$qb->andWhere($orX);
253 253
 	}
@@ -260,8 +260,8 @@  discard block
 block discarded – undo
260 260
 	 */
261 261
 	private function limitToDBField(IQueryBuilder &$qb, $field, $value) {
262 262
 		$expr = $qb->expr();
263
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
264
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
263
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
264
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
265 265
 	}
266 266
 
267 267
 
@@ -272,8 +272,8 @@  discard block
 block discarded – undo
272 272
 	 */
273 273
 	private function limitToDBFieldOrGreater(IQueryBuilder &$qb, $field, $value) {
274 274
 		$expr = $qb->expr();
275
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
276
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
275
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
276
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
277 277
 	}
278 278
 
279 279
 
@@ -288,9 +288,9 @@  discard block
 block discarded – undo
288 288
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
289 289
 		$expr = $qb->expr();
290 290
 
291
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
291
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
292 292
 
293
-		$and = $expr->andX($expr->eq($pf . 'group_id', 'ncgu.gid'));
293
+		$and = $expr->andX($expr->eq($pf.'group_id', 'ncgu.gid'));
294 294
 		if ($userId !== '') {
295 295
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
296 296
 		} else {
@@ -311,14 +311,14 @@  discard block
 block discarded – undo
311 311
 	 */
312 312
 	protected function rightJoinCircles(IQueryBuilder &$qb) {
313 313
 		$expr = $qb->expr();
314
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
314
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
315 315
 
316 316
 		$qb->from(self::TABLE_CIRCLES, 'c')
317 317
 		   ->andWhere(
318 318
 			   $expr->eq(
319
-				   $pf . 'circle_id',
319
+				   $pf.'circle_id',
320 320
 				   $qb->createFunction(
321
-					   'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
321
+					   'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
322 322
 				   )
323 323
 			   )
324 324
 		   );
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
 		}
339 339
 
340 340
 		$expr = $qb->expr();
341
-		$pf = $this->default_select_alias . '.';
341
+		$pf = $this->default_select_alias.'.';
342 342
 
343 343
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
344 344
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -346,9 +346,9 @@  discard block
 block discarded – undo
346 346
 		   ->leftJoin(
347 347
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_CIRCLES, 'lc',
348 348
 			   $expr->eq(
349
-				   $pf . 'circle_id',
349
+				   $pf.'circle_id',
350 350
 				   $qb->createFunction(
351
-					   'SUBSTR(`lc`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
351
+					   'SUBSTR(`lc`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
352 352
 				   )
353 353
 			   )
354 354
 		   );
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
 				$expr->eq('ncgu.gid', 'g.group_id'),
382 382
 				$expr->eq(
383 383
 					'g.circle_id', $qb->createFunction(
384
-					'SUBSTR(' . $field . ', 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
384
+					'SUBSTR('.$field.', 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
385 385
 				)
386 386
 				)
387 387
 			)
Please login to merge, or discard this patch.
lib/Service/FederatedLinkService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -217,7 +217,7 @@
 block discarded – undo
217 217
 	 * @return string
218 218
 	 */
219 219
 	public function generateLinkRemoteURL($remote) {
220
-		return $this->configService->generateRemoteHost($remote) . self::REMOTE_URL_LINK;
220
+		return $this->configService->generateRemoteHost($remote).self::REMOTE_URL_LINK;
221 221
 	}
222 222
 
223 223
 
Please login to merge, or discard this patch.
lib/Api/v1/Circles.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
 	 */
454 454
 	public static function generateLink($circleUniqueId) {
455 455
 		return \OC::$server->getURLGenerator()
456
-						   ->linkToRoute('circles.Navigation.navigate') . '#' . $circleUniqueId;
456
+						   ->linkToRoute('circles.Navigation.navigate').'#'.$circleUniqueId;
457 457
 	}
458 458
 
459 459
 
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 	 */
469 469
 	public static function generateAbsoluteLink($circleUniqueId) {
470 470
 		return \OC::$server->getURLGenerator()
471
-						   ->linkToRouteAbsolute('circles.Navigation.navigate') . '#' . $circleUniqueId;
471
+						   ->linkToRouteAbsolute('circles.Navigation.navigate').'#'.$circleUniqueId;
472 472
 	}
473 473
 
474 474
 
@@ -483,8 +483,8 @@  discard block
 block discarded – undo
483 483
 	 */
484 484
 	public static function generateRemoteLink(FederatedLink $link) {
485 485
 		return \OC::$server->getURLGenerator()
486
-						   ->linkToRoute('circles.Navigation.navigate') . '#' . $link->getUniqueId()
487
-			   . '-' . $link->getToken();
486
+						   ->linkToRoute('circles.Navigation.navigate').'#'.$link->getUniqueId()
487
+			   . '-'.$link->getToken();
488 488
 	}
489 489
 
490 490
 
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
 	public static function generateUserParameter(SharingFrame $frame) {
497 497
 
498 498
 		if ($frame->getCloudId() !== null) {
499
-			$name = $frame->getAuthor() . '@' . $frame->getCloudId();
499
+			$name = $frame->getAuthor().'@'.$frame->getCloudId();
500 500
 		} else {
501 501
 			$name = MiscService::getDisplay($frame->getAuthor(), Member::TYPE_USER);
502 502
 		}
Please login to merge, or discard this patch.