Completed
Pull Request — master (#1187)
by Maxence
50s
created
lib/Db/CircleProviderRequestBuilder.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
78 78
 		$qb->andWhere(
79 79
 			$expr->in(
80
-				$pf . 'share_with',
80
+				$pf.'share_with',
81 81
 				$qb->createNamedParameter($circleUniqueIds, IQueryBuilder::PARAM_STR_ARRAY)
82 82
 			)
83 83
 		);
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 		$expr = $qb->expr();
95 95
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
96 96
 
97
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
97
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
98 98
 	}
99 99
 
100 100
 
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
 
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,12 +198,12 @@  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
 			$qb->andWhere(
204 204
 				$expr->orX(
205
-					$expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
206
-					$expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
205
+					$expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
206
+					$expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
207 207
 				)
208 208
 			);
209 209
 		}
@@ -298,11 +298,11 @@  discard block
 block discarded – undo
298 298
 		$expr = $qb->expr();
299 299
 		$andX = $expr->andX();
300 300
 
301
-		$andX->add($expr->eq($aliasM . '.user_id', $qb->createNamedParameter($userId)));
302
-		$andX->add($expr->eq($aliasM . '.circle_id', $aliasC . '.unique_id'));
303
-		$andX->add($expr->gte($aliasM . '.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
304
-		$andX->add($expr->eq($aliasM . '.instance', $qb->createNamedParameter('')));
305
-		$andX->add($expr->eq($aliasM . '.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER)));
301
+		$andX->add($expr->eq($aliasM.'.user_id', $qb->createNamedParameter($userId)));
302
+		$andX->add($expr->eq($aliasM.'.circle_id', $aliasC.'.unique_id'));
303
+		$andX->add($expr->gte($aliasM.'.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
304
+		$andX->add($expr->eq($aliasM.'.instance', $qb->createNamedParameter('')));
305
+		$andX->add($expr->eq($aliasM.'.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_USER)));
306 306
 
307 307
 		return $andX;
308 308
 	}
@@ -330,11 +330,11 @@  discard block
 block discarded – undo
330 330
 
331 331
 		$andX = $expr->andX();
332 332
 
333
-		$andX->add($expr->eq($aliasM . '.user_id', 'ncgu.gid'));
334
-		$andX->add($expr->eq($aliasM . '.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_GROUP)));
335
-		$andX->add($expr->eq($aliasM . '.instance', $qb->createNamedParameter('')));
336
-		$andX->add($expr->eq($aliasM . '.circle_id', $aliasC . '.unique_id'));
337
-		$andX->add($expr->gte($aliasM . '.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
333
+		$andX->add($expr->eq($aliasM.'.user_id', 'ncgu.gid'));
334
+		$andX->add($expr->eq($aliasM.'.user_type', $qb->createNamedParameter(DeprecatedMember::TYPE_GROUP)));
335
+		$andX->add($expr->eq($aliasM.'.instance', $qb->createNamedParameter('')));
336
+		$andX->add($expr->eq($aliasM.'.circle_id', $aliasC.'.unique_id'));
337
+		$andX->add($expr->gte($aliasM.'.level', $qb->createNamedParameter(DeprecatedMember::LEVEL_MEMBER)));
338 338
 
339 339
 		return $andX;
340 340
 	}
Please login to merge, or discard this patch.
lib/Db/DeprecatedCirclesRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -203,7 +203,7 @@
 block discarded – undo
203 203
 		$cursor->closeCursor();
204 204
 
205 205
 		if ($data === false) {
206
-			throw new CircleDoesNotExistException($this->l10n->t('Circle not found ' . $circleUniqueId));
206
+			throw new CircleDoesNotExistException($this->l10n->t('Circle not found '.$circleUniqueId));
207 207
 		}
208 208
 
209 209
 		$circle = $this->parseCirclesSelectSql($data);
Please login to merge, or discard this patch.
lib/Service/RemoteService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@
 block discarded – undo
189 189
 			$loop++;
190 190
 			if ($loop > 10 || in_array($instance, $knownInstance)) {
191 191
 				throw new CircleNotFoundException(
192
-					'circle not found after browsing ' . implode(', ', $knownInstance)
192
+					'circle not found after browsing '.implode(', ', $knownInstance)
193 193
 				);
194 194
 			}
195 195
 			$knownInstance[] = $instance;
Please login to merge, or discard this patch.
lib/Db/FileSharesRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 		$expr = $qb->expr();
106 106
 
107 107
 		$this->limitToShareType($qb, self::SHARE_TYPE);
108
-		$qb->andWhere($expr->isNull($this->default_select_alias . '.parent'));
108
+		$qb->andWhere($expr->isNull($this->default_select_alias.'.parent'));
109 109
 
110 110
 		$shares = [];
111 111
 		$cursor = $qb->execute();
Please login to merge, or discard this patch.
lib/Service/FederatedShareService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 		/** @var FederatedShare $share */
111 111
 		$share = $data->gObj('federatedShare', FederatedShare::class);
112 112
 		if ($share->getLockStatus() === ItemLock::STATUS_INSTANCE_LOCKED) {
113
-			throw new FederatedShareAlreadyLockedException('item already locked by ' . $share->getInstance());
113
+			throw new FederatedShareAlreadyLockedException('item already locked by '.$share->getInstance());
114 114
 		}
115 115
 
116 116
 		return $share;
Please login to merge, or discard this patch.
lib/Command/CirclesDestroy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 		} catch (FederatedItemException $e) {
126 126
 			if ($input->getOption('status-code')) {
127 127
 				throw new FederatedItemException(
128
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
128
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
129 129
 				);
130 130
 			}
131 131
 
Please login to merge, or discard this patch.
lib/Command/MembersAdd.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 		} catch (FederatedItemException $e) {
140 140
 			if ($input->getOption('status-code')) {
141 141
 				throw new FederatedItemException(
142
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
142
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
143 143
 				);
144 144
 			}
145 145
 
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 				$instance = $host;
198 198
 			}
199 199
 
200
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
200
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
201 201
 		}
202 202
 
203 203
 //		if ($userId === '') {
Please login to merge, or discard this patch.
lib/Controller/LocalController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@
 block discarded – undo
194 194
 					throw new OCSException('works only from local instance', 404);
195 195
 				}
196 196
 
197
-				$userId = $currentUser->getUserId() . '/' . $userId;
197
+				$userId = $currentUser->getUserId().'/'.$userId;
198 198
 			}
199 199
 
200 200
 			$federatedUser = $this->federatedUserService->generateFederatedUser($userId, $type);
Please login to merge, or discard this patch.
lib/MountManager/CircleMountManager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
 	 * @return string
110 110
 	 */
111 111
 	protected function stripPath($path) {
112
-		$prefix = '/' . $this->userId . '/files';
112
+		$prefix = '/'.$this->userId.'/files';
113 113
 
114 114
 		return rtrim(substr($path, strlen($prefix)), '/');
115 115
 	}
Please login to merge, or discard this patch.