Completed
Pull Request — master (#222)
by Julius
03:02
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/Controller/FederatedController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@
 block discarded – undo
225 225
 	 * @return DataResponse
226 226
 	 */
227 227
 	private function federatedFail($reason) {
228
-		$this->miscService->log(2, 'federated fail: ' . $reason);
228
+		$this->miscService->log(2, 'federated fail: '.$reason);
229 229
 
230 230
 		return new DataResponse(
231 231
 			[
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/Api/v1/Circles.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 	 */
380 380
 	public static function generateLink($circleUniqueId) {
381 381
 		return \OC::$server->getURLGenerator()
382
-						   ->linkToRoute('circles.Navigation.navigate') . '#' . $circleUniqueId;
382
+						   ->linkToRoute('circles.Navigation.navigate').'#'.$circleUniqueId;
383 383
 	}
384 384
 
385 385
 
@@ -394,8 +394,8 @@  discard block
 block discarded – undo
394 394
 	 */
395 395
 	public static function generateRemoteLink(FederatedLink $link) {
396 396
 		return \OC::$server->getURLGenerator()
397
-						   ->linkToRoute('circles.Navigation.navigate') . '#' . $link->getUniqueId()
398
-			   . '-' . $link->getToken();
397
+						   ->linkToRoute('circles.Navigation.navigate').'#'.$link->getUniqueId()
398
+			   . '-'.$link->getToken();
399 399
 	}
400 400
 
401 401
 
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
 	public static function generateUserParameter(SharingFrame $frame) {
408 408
 
409 409
 		if ($frame->getCloudId() !== null) {
410
-			$name = $frame->getAuthor() . '@' . $frame->getCloudId();
410
+			$name = $frame->getAuthor().'@'.$frame->getCloudId();
411 411
 		} else {
412 412
 			$name = MiscService::getDisplay($frame->getAuthor(), Member::TYPE_USER);
413 413
 		}
Please login to merge, or discard this patch.
lib/Service/ConfigService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@
 block discarded – undo
184 184
 		if ((!$this->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0)
185 185
 			&& strpos($remote, 'https://') !== 0
186 186
 		) {
187
-			$remote = 'https://' . $remote;
187
+			$remote = 'https://'.$remote;
188 188
 		}
189 189
 
190 190
 		return rtrim($remote, '/');
Please login to merge, or discard this patch.
lib/Db/CircleProviderRequestBuilder.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -252,7 +252,7 @@
 block discarded – undo
252 252
 			'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX(
253 253
 			$expr->eq(
254 254
 				'mo.circle_id',
255
-        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
255
+		$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
256 256
 			), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
257 257
 			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
258 258
 		)
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
77 77
 		$qb->andWhere(
78 78
 			$expr->in(
79
-				$pf . 'share_with',
79
+				$pf.'share_with',
80 80
 				$qb->createNamedParameter($circleUniqueIds, IQueryBuilder::PARAM_STR_ARRAY)
81 81
 			)
82 82
 		);
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 		$expr = $qb->expr();
94 94
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
95 95
 
96
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
96
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
97 97
 	}
98 98
 
99 99
 
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
143 143
 		$qb->andWhere(
144 144
 			$expr->orX(
145
-				$expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)),
146
-				$expr->eq($pf . 'id', $qb->createNamedParameter($circleId))
145
+				$expr->eq($pf.'parent', $qb->createNamedParameter($circleId)),
146
+				$expr->eq($pf.'id', $qb->createNamedParameter($circleId))
147 147
 			)
148 148
 		);
149 149
 	}
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
166 166
 		$qb->andWhere(
167 167
 			$expr->in(
168
-				$pf . 'file_source',
168
+				$pf.'file_source',
169 169
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
170 170
 			)
171 171
 		);
@@ -198,13 +198,13 @@  discard block
 block discarded – undo
198 198
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
199 199
 
200 200
 		if ($reShares === false) {
201
-			$qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)));
201
+			$qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)));
202 202
 		} else {
203 203
 			/** @noinspection PhpMethodParametersCountMismatchInspection */
204 204
 			$qb->andWhere(
205 205
 				$expr->orX(
206
-					$expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
207
-					$expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
206
+					$expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
207
+					$expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
208 208
 				)
209 209
 			);
210 210
 		}
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 
227 227
 		$tmpOrX = $expr->eq(
228 228
 			's.share_with',
229
-			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
229
+			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
230 230
 		);
231 231
 
232 232
 		if ($shareId === -1) {
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 			'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX(
258 258
 			$expr->eq(
259 259
 				'mo.circle_id',
260
-        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
260
+        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
261 261
 			), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
262 262
 			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
263 263
 		)
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 			$expr->eq(
308 308
 				'm.circle_id',
309 309
 				$qb->createFunction(
310
-					'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
310
+					'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
311 311
 				)
312 312
 			)
313 313
 		);
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 			$expr->andX(
334 334
 				$expr->eq(
335 335
 					'g.circle_id',
336
-					$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
336
+					$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
337 337
 				)
338 338
 			)
339 339
 		);
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.