Completed
Pull Request — master (#72)
by Maxence
06:31
created
lib/Db/CirclesRequest.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -178,7 +178,7 @@
 block discarded – undo
178 178
 	}
179 179
 
180 180
 	/**
181
-	 * @param $circleId
181
+	 * @param integer $circleId
182 182
 	 * @param int $level
183 183
 	 *
184 184
 	 * @return Member[]
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	public function getCircle($uniqueId) {
129 129
 		$qb = $this->getCirclesSelectSql();
130
-		$this->limitToUniqueId($qb, (string) $uniqueId);
130
+		$this->limitToUniqueId($qb, (string)$uniqueId);
131 131
 
132 132
 		$cursor = $qb->execute();
133 133
 		$data = $cursor->fetch();
@@ -145,8 +145,8 @@  discard block
 block discarded – undo
145 145
 	 */
146 146
 	public function getFrame($circleId, $uniqueId) {
147 147
 		$qb = $this->getSharesSelectSql();
148
-		$this->limitToUniqueId($qb, (string) $uniqueId);
149
-		$this->limitToCircleId($qb, (int) $circleId);
148
+		$this->limitToUniqueId($qb, (string)$uniqueId);
149
+		$this->limitToCircleId($qb, (int)$circleId);
150 150
 
151 151
 		$cursor = $qb->execute();
152 152
 		$data = $cursor->fetch();
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
 	 */
166 166
 	public function getLinkFromToken($token, $uniqueId) {
167 167
 		$qb = $this->getLinksSelectSql();
168
-		$this->limitToUniqueId($qb, (string) $uniqueId);
169
-		$this->limitToToken($qb, (string) $token);
168
+		$this->limitToUniqueId($qb, (string)$uniqueId);
169
+		$this->limitToToken($qb, (string)$token);
170 170
 
171 171
 		$cursor = $qb->execute();
172 172
 		$data = $cursor->fetch();
Please login to merge, or discard this patch.
lib/Db/CirclesRequestBuilder.php 2 patches
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,6 +55,7 @@  discard block
 block discarded – undo
55 55
 	 * Join the Circles table
56 56
 	 *
57 57
 	 * @param IQueryBuilder $qb
58
+	 * @param string $field
58 59
 	 */
59 60
 	protected function joinCircles(& $qb, $field) {
60 61
 		$expr = $qb->expr();
@@ -110,7 +111,7 @@  discard block
 block discarded – undo
110 111
 	 * Limit the request by its Token.
111 112
 	 *
112 113
 	 * @param IQueryBuilder $qb
113
-	 * @param $token
114
+	 * @param string $token
114 115
 	 */
115 116
 	protected function limitToToken(IQueryBuilder &$qb, $token) {
116 117
 		$expr = $qb->expr();
@@ -124,7 +125,7 @@  discard block
 block discarded – undo
124 125
 	 * Limit the request to a minimum member level.
125 126
 	 *
126 127
 	 * @param IQueryBuilder $qb
127
-	 * @param $level
128
+	 * @param integer $level
128 129
 	 */
129 130
 	protected function limitToMemberLevel(IQueryBuilder &$qb, $level) {
130 131
 		$qb->where(
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 	 * @param IQueryBuilder $qb
71 71
 	 * @param int $circleId
72 72
 	 */
73
-	protected function limitToCircleId(IQueryBuilder &$qb, $circleId) {
73
+	protected function limitToCircleId(IQueryBuilder & $qb, $circleId) {
74 74
 		$expr = $qb->expr();
75
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
75
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
76 76
 
77
-		$qb->andWhere($expr->eq($pf . 'circle_id', $qb->createNamedParameter($circleId)));
77
+		$qb->andWhere($expr->eq($pf.'circle_id', $qb->createNamedParameter($circleId)));
78 78
 	}
79 79
 
80 80
 
@@ -84,11 +84,11 @@  discard block
 block discarded – undo
84 84
 	 * @param IQueryBuilder $qb
85 85
 	 * @param int $id
86 86
 	 */
87
-	protected function limitToId(IQueryBuilder &$qb, $id) {
87
+	protected function limitToId(IQueryBuilder & $qb, $id) {
88 88
 		$expr = $qb->expr();
89
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
89
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
90 90
 
91
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($id)));
91
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($id)));
92 92
 	}
93 93
 
94 94
 
@@ -98,11 +98,11 @@  discard block
 block discarded – undo
98 98
 	 * @param IQueryBuilder $qb
99 99
 	 * @param int $uniqueId
100 100
 	 */
101
-	protected function limitToUniqueId(IQueryBuilder &$qb, $uniqueId) {
101
+	protected function limitToUniqueId(IQueryBuilder & $qb, $uniqueId) {
102 102
 		$expr = $qb->expr();
103
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
103
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
104 104
 
105
-		$qb->andWhere($expr->eq($pf . 'unique_id', $qb->createNamedParameter($uniqueId)));
105
+		$qb->andWhere($expr->eq($pf.'unique_id', $qb->createNamedParameter($uniqueId)));
106 106
 	}
107 107
 
108 108
 
@@ -112,11 +112,11 @@  discard block
 block discarded – undo
112 112
 	 * @param IQueryBuilder $qb
113 113
 	 * @param $token
114 114
 	 */
115
-	protected function limitToToken(IQueryBuilder &$qb, $token) {
115
+	protected function limitToToken(IQueryBuilder & $qb, $token) {
116 116
 		$expr = $qb->expr();
117
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
117
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
118 118
 
119
-		$qb->andWhere($expr->eq($pf . 'token', $qb->createNamedParameter($token)));
119
+		$qb->andWhere($expr->eq($pf.'token', $qb->createNamedParameter($token)));
120 120
 	}
121 121
 
122 122
 
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 	 * @param IQueryBuilder $qb
127 127
 	 * @param $level
128 128
 	 */
129
-	protected function limitToMemberLevel(IQueryBuilder &$qb, $level) {
129
+	protected function limitToMemberLevel(IQueryBuilder & $qb, $level) {
130 130
 		$qb->where(
131 131
 			$qb->expr()
132 132
 			   ->gte('m.level', $qb->createNamedParameter($level))
@@ -141,20 +141,20 @@  discard block
 block discarded – undo
141 141
 	 * @param IQueryBuilder $qb
142 142
 	 * @param string $userId
143 143
 	 */
144
-	protected function leftJoinUserIdAsMember(IQueryBuilder &$qb, $userId) {
144
+	protected function leftJoinUserIdAsMember(IQueryBuilder & $qb, $userId) {
145 145
 
146 146
 		if ($qb->getType() !== QueryBuilder::SELECT) {
147 147
 			return;
148 148
 		}
149 149
 
150 150
 		$expr = $qb->expr();
151
-		$pf = $this->default_select_alias . '.';
151
+		$pf = $this->default_select_alias.'.';
152 152
 
153 153
 		$qb->selectAlias('u.level', 'user_level');
154 154
 		$qb->leftJoin(
155 155
 			$this->default_select_alias, MembersMapper::TABLENAME, 'u',
156 156
 			$expr->andX(
157
-				$expr->eq($pf . 'id', 'u.circle_id'),
157
+				$expr->eq($pf.'id', 'u.circle_id'),
158 158
 				$expr->eq('u.user_id', $qb->createNamedParameter($userId))
159 159
 			)
160 160
 		);
@@ -166,19 +166,19 @@  discard block
 block discarded – undo
166 166
 	 * @deprecated
167 167
 	 * never used in fact.
168 168
 	 */
169
-	protected function leftJoinOwner(IQueryBuilder &$qb) {
169
+	protected function leftJoinOwner(IQueryBuilder & $qb) {
170 170
 
171 171
 		if ($qb->getType() !== QueryBuilder::SELECT) {
172 172
 			return;
173 173
 		}
174 174
 
175 175
 		$expr = $qb->expr();
176
-		$pf = $this->default_select_alias . '.';
176
+		$pf = $this->default_select_alias.'.';
177 177
 
178 178
 		$qb->leftJoin(
179 179
 			$this->default_select_alias, MembersMapper::TABLENAME, 'o',
180 180
 			$expr->andX(
181
-				$expr->eq($pf . 'id', 'o.circle_id'),
181
+				$expr->eq($pf.'id', 'o.circle_id'),
182 182
 				$expr->eq('o.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
183 183
 			)
184 184
 		);
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 		$qb->update('circles_shares')
248 248
 		   ->where(
249 249
 			   $qb->expr()
250
-				  ->eq('unique_id', $qb->createNamedParameter((string) $uniqueId))
250
+				  ->eq('unique_id', $qb->createNamedParameter((string)$uniqueId))
251 251
 		   );
252 252
 
253 253
 		return $qb;
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
@@ -227,7 +227,7 @@
 block discarded – undo
227 227
 		ob_start();
228 228
 		echo($result);
229 229
 		$size = ob_get_length();
230
-		header('Content-Length: ' . $size);
230
+		header('Content-Length: '.$size);
231 231
 		ob_end_flush();
232 232
 		flush();
233 233
 	}
Please login to merge, or discard this patch.
lib/Service/FederatedService.php 2 patches
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
167 167
 	 * in the database and send a request to the remote circle using requestLink()
168 168
 	 * If any issue, entry is removed from the database.
169 169
 	 *
170
-	 * @param $circleId
171
-	 * @param $remote
170
+	 * @param integer $circleId
171
+	 * @param string $remote
172 172
 	 *
173 173
 	 * @return FederatedLink
174 174
 	 * @throws Exception
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 	 * @param Circle $circle
239 239
 	 * @param FederatedLink $link
240 240
 	 *
241
-	 * @return int
241
+	 * @return boolean
242 242
 	 * @throws Exception
243 243
 	 */
244 244
 	private function requestLink(Circle $circle, FederatedLink &$link) {
@@ -369,8 +369,8 @@  discard block
 block discarded – undo
369 369
 	}
370 370
 
371 371
 	/**
372
-	 * @param $circleId
373
-	 * @param $uniqueId
372
+	 * @param integer $circleId
373
+	 * @param string $uniqueId
374 374
 	 *
375 375
 	 * @return FederatedLink
376 376
 	 */
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
 
381 381
 
382 382
 	/**
383
-	 * @param $circleId
383
+	 * @param integer $circleId
384 384
 	 *
385 385
 	 * @return FederatedLink[]
386 386
 	 */
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -211,10 +211,10 @@  discard block
 block discarded – undo
211 211
 	 */
212 212
 	private function generateLinkRemoteURL($remote) {
213 213
 		if (strpos($remote, 'https') !== 0) {
214
-			$remote = 'https://' . $remote;
214
+			$remote = 'https://'.$remote;
215 215
 		}
216 216
 
217
-		return rtrim($remote, '/') . '/index.php/apps/circles/circles/link/';
217
+		return rtrim($remote, '/').'/index.php/apps/circles/circles/link/';
218 218
 	}
219 219
 
220 220
 	/**
@@ -224,10 +224,10 @@  discard block
 block discarded – undo
224 224
 	 */
225 225
 	private function generatePayloadDeliveryURL($remote) {
226 226
 		if (strpos($remote, 'https') !== 0) {
227
-			$remote = 'https://' . $remote;
227
+			$remote = 'https://'.$remote;
228 228
 		}
229 229
 
230
-		return rtrim($remote, '/') . '/index.php/apps/circles/circles/payload/';
230
+		return rtrim($remote, '/').'/index.php/apps/circles/circles/payload/';
231 231
 	}
232 232
 
233 233
 
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 	 * @return int
242 242
 	 * @throws Exception
243 243
 	 */
244
-	private function requestLink(Circle $circle, FederatedLink &$link) {
244
+	private function requestLink(Circle $circle, FederatedLink & $link) {
245 245
 		$args = [
246 246
 			'token'      => $link->getToken(),
247 247
 			'uniqueId'   => $circle->getUniqueId(),
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 	 *
317 317
 	 * @return bool
318 318
 	 */
319
-	public function initiateLink(Circle $circle, FederatedLink &$link) {
319
+	public function initiateLink(Circle $circle, FederatedLink & $link) {
320 320
 
321 321
 		$link->setCircleId($circle->getId());
322 322
 
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
 	 * @return bool
339 339
 	 * @throws Exception
340 340
 	 */
341
-	public function receiveFrame($token, $uniqueId, SharingFrame &$frame) {
341
+	public function receiveFrame($token, $uniqueId, SharingFrame & $frame) {
342 342
 
343 343
 		$link = $this->circlesRequest->getLinkFromToken((string)$token, (string)$uniqueId);
344 344
 		if ($link === null) {
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 
414 414
 			$result = json_decode($request->getBody(), true);
415 415
 			$this->miscService->log(
416
-				"initiateRemoteShare result: " . $uniqueId . '  ----  ' . var_export($result, true)
416
+				"initiateRemoteShare result: ".$uniqueId.'  ----  '.var_export($result, true)
417 417
 			);
418 418
 
419 419
 			return true;
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/Model/SharingFrame.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	}
102 102
 
103 103
 	/**
104
-	 * @return mixed
104
+	 * @return string
105 105
 	 */
106 106
 	public function getCircleName() {
107 107
 		return $this->circleName;
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 
210 210
 
211 211
 	/**
212
-	 * @param $k
212
+	 * @param string $k
213 213
 	 *
214 214
 	 * @return string
215 215
 	 */
Please login to merge, or discard this patch.
lib/Model/FederatedLink.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 	 * @return FederatedLink
78 78
 	 */
79 79
 	public function setId($id) {
80
-		$this->id = (int) $id;
80
+		$this->id = (int)$id;
81 81
 
82 82
 		return $this;
83 83
 	}
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 * @return $this
97 97
 	 */
98 98
 	public function setToken($token) {
99
-		$this->token = (string) $token;
99
+		$this->token = (string)$token;
100 100
 
101 101
 		return $this;
102 102
 	}
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	 * @return FederatedLink
126 126
 	 */
127 127
 	public function setAddress($address) {
128
-		$this->address = (string) $address;
128
+		$this->address = (string)$address;
129 129
 
130 130
 		return $this;
131 131
 	}
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	 * @return FederatedLink
145 145
 	 */
146 146
 	public function setLocalAddress($address) {
147
-		$this->localAddress = (string) $address;
147
+		$this->localAddress = (string)$address;
148 148
 
149 149
 		return $this;
150 150
 	}
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 	 * @return FederatedLink
183 183
 	 */
184 184
 	public function setUniqueId($uniqueId) {
185
-		$this->uniqueId = (string) $uniqueId;
185
+		$this->uniqueId = (string)$uniqueId;
186 186
 
187 187
 		return $this;
188 188
 	}
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 	 * @return FederatedLink
202 202
 	 */
203 203
 	public function setRemoteCircleName($circleName) {
204
-		$this->remoteCircleName = (string) $circleName;
204
+		$this->remoteCircleName = (string)$circleName;
205 205
 
206 206
 		return $this;
207 207
 	}
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	 * @return FederatedLink
221 221
 	 */
222 222
 	public function setCircleName($circleName) {
223
-		$this->localCircleName = (string) $circleName;
223
+		$this->localCircleName = (string)$circleName;
224 224
 
225 225
 		return $this;
226 226
 	}
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	 * @return FederatedLink
240 240
 	 */
241 241
 	public function setStatus($status) {
242
-		$this->status = (int) $status;
242
+		$this->status = (int)$status;
243 243
 
244 244
 		return $this;
245 245
 	}
Please login to merge, or discard this patch.
lib/Model/BaseCircle.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
 	 * @return $this
94 94
 	 */
95 95
 	public function setUniqueId($uniqueId) {
96
-		$this->uniqueId = (string) $uniqueId;
96
+		$this->uniqueId = (string)$uniqueId;
97 97
 
98 98
 		return $this;
99 99
 	}
Please login to merge, or discard this patch.
lib/Db/FederatedLinksRequest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
 		$qb->where(
84 84
 			$expr->andX(
85
-				$expr->eq('f.circle_id', $qb->createNamedParameter((int) $circleId)),
85
+				$expr->eq('f.circle_id', $qb->createNamedParameter((int)$circleId)),
86 86
 				$expr->eq('f.status', $qb->createNamedParameter(9))
87 87
 			)
88 88
 		);
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
 
112 112
 		$qb->where(
113 113
 			$expr->andX(
114
-				$expr->eq('f.circle_id', $qb->createNamedParameter((int) $circleId)),
115
-				$expr->eq('f.unique_id', $qb->createNamedParameter((string) $uniqueId))
114
+				$expr->eq('f.circle_id', $qb->createNamedParameter((int)$circleId)),
115
+				$expr->eq('f.unique_id', $qb->createNamedParameter((string)$uniqueId))
116 116
 			)
117 117
 		);
118 118
 
Please login to merge, or discard this patch.