Completed
Push — federated-circles ( 2a3998...f4a386 )
by Maxence
02:39
created
lib/Db/MembersMapper.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@
 block discarded – undo
162 162
 	 * getMembersFromCircleSql()
163 163
 	 * getMemberFromCircleSql()
164 164
 	 *
165
-	 * @param $circleId
165
+	 * @param integer $circleId
166 166
 	 *
167 167
 	 * @return \OCP\DB\QueryBuilder\IQueryBuilder
168 168
 	 */
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	 *
85 85
 	 * @param $container
86 86
 	 */
87
-	private function registerServices(IAppContainer &$container) {
87
+	private function registerServices(IAppContainer & $container) {
88 88
 
89 89
 		$container->registerService(
90 90
 			'MiscService', function(IAppContainer $c) {
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 *
144 144
 	 * @param $container
145 145
 	 */
146
-	private static function registerControllers(IAppContainer &$container) {
146
+	private static function registerControllers(IAppContainer & $container) {
147 147
 
148 148
 		$container->registerService(
149 149
 			'NavigationController', function(IAppContainer $c) {
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 	 *
194 194
 	 * @param IAppContainer $container
195 195
 	 */
196
-	private static function registerDatabaseRequesters(IAppContainer &$container) {
196
+	private static function registerDatabaseRequesters(IAppContainer & $container) {
197 197
 
198 198
 		$container->registerService(
199 199
 			'CirclesRequest', function(IAppContainer $c) {
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 	 *
212 212
 	 * @param $container
213 213
 	 */
214
-	private static function registerMappers(IAppContainer &$container) {
214
+	private static function registerMappers(IAppContainer & $container) {
215 215
 
216 216
 		$container->registerService(
217 217
 			'CirclesMapper', function(IAppContainer $c) {
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	 *
240 240
 	 * @param $container
241 241
 	 */
242
-	private static function registerCores(IAppContainer &$container) {
242
+	private static function registerCores(IAppContainer & $container) {
243 243
 
244 244
 		$container->registerService(
245 245
 			'Logger', function(IAppContainer $c) {
Please login to merge, or discard this patch.
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/Db/CircleProviderRequestBuilder.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 		$expr = $qb->expr();
74 74
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
75 75
 
76
-		$qb->andWhere($expr->eq($pf . 'share_with', $qb->createNamedParameter($circleId)));
76
+		$qb->andWhere($expr->eq($pf.'share_with', $qb->createNamedParameter($circleId)));
77 77
 	}
78 78
 
79 79
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 		$expr = $qb->expr();
88 88
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
89 89
 
90
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
90
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
91 91
 	}
92 92
 
93 93
 
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
137 137
 		$qb->andWhere(
138 138
 			$expr->orX(
139
-				$expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)),
140
-				$expr->eq($pf . 'id', $qb->createNamedParameter($circleId))
139
+				$expr->eq($pf.'parent', $qb->createNamedParameter($circleId)),
140
+				$expr->eq($pf.'id', $qb->createNamedParameter($circleId))
141 141
 			)
142 142
 		);
143 143
 	}
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
160 160
 		$qb->andWhere(
161 161
 			$expr->in(
162
-				$pf . 'file_source',
162
+				$pf.'file_source',
163 163
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
164 164
 			)
165 165
 		);
@@ -191,13 +191,13 @@  discard block
 block discarded – undo
191 191
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
192 192
 
193 193
 		if ($reShares === false) {
194
-			$qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)));
194
+			$qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)));
195 195
 		} else {
196 196
 			/** @noinspection PhpMethodParametersCountMismatchInspection */
197 197
 			$qb->andWhere(
198 198
 				$expr->orX(
199
-					$expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
200
-					$expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
199
+					$expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
200
+					$expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
201 201
 				)
202 202
 			);
203 203
 		}
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 	protected function linkToMember(& $qb, $userId) {
254 254
 		$expr = $qb->expr();
255 255
 
256
-		$qb->leftJoin('s',MembersMapper::TABLENAME, 'm', $expr->andX(
256
+		$qb->leftJoin('s', MembersMapper::TABLENAME, 'm', $expr->andX(
257 257
 		   $expr->eq('s.share_with', 'm.circle_id'),
258 258
 		   $expr->eq('m.user_id', $qb->createNamedParameter($userId)),
259 259
 		   $expr->gte('m.level', $qb->createNamedParameter(Member::LEVEL_MEMBER))
Please login to merge, or discard this patch.
lib/Db/CirclesRequest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
 
96 96
 
97 97
 	/**
98
-	 * @param $circleId
98
+	 * @param integer $circleId
99 99
 	 * @param int $level
100 100
 	 *
101 101
 	 * @return Member[]
Please login to merge, or discard this patch.
lib/Model/SharingFrame.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
 	}
93 93
 
94 94
 	/**
95
-	 * @return mixed
95
+	 * @return string
96 96
 	 */
97 97
 	public function getCircleName() {
98 98
 		return $this->circleName;
Please login to merge, or discard this patch.
lib/Db/CirclesRequestBuilder.php 2 patches
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,6 +54,7 @@  discard block
 block discarded – undo
54 54
 	 * Join the Circles table
55 55
 	 *
56 56
 	 * @param IQueryBuilder $qb
57
+	 * @param string $field
57 58
 	 */
58 59
 	protected function joinCircles(& $qb, $field) {
59 60
 		$expr = $qb->expr();
@@ -109,7 +110,7 @@  discard block
 block discarded – undo
109 110
 	 * Limit the request to a minimum member level.
110 111
 	 *
111 112
 	 * @param IQueryBuilder $qb
112
-	 * @param $level
113
+	 * @param integer $level
113 114
 	 */
114 115
 	protected function limitToMemberLevel(IQueryBuilder &$qb, $level) {
115 116
 		$qb->where(
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -69,11 +69,11 @@  discard block
 block discarded – undo
69 69
 	 * @param IQueryBuilder $qb
70 70
 	 * @param int $circleId
71 71
 	 */
72
-	protected function limitToCircle(IQueryBuilder &$qb, $circleId) {
72
+	protected function limitToCircle(IQueryBuilder & $qb, $circleId) {
73 73
 		$expr = $qb->expr();
74
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
74
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
75 75
 
76
-		$qb->andWhere($expr->eq($pf . 'circle_id', $qb->createNamedParameter($circleId)));
76
+		$qb->andWhere($expr->eq($pf.'circle_id', $qb->createNamedParameter($circleId)));
77 77
 	}
78 78
 
79 79
 
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
 	 * @param IQueryBuilder $qb
84 84
 	 * @param int $id
85 85
 	 */
86
-	protected function limitToId(IQueryBuilder &$qb, $id) {
86
+	protected function limitToId(IQueryBuilder & $qb, $id) {
87 87
 		$expr = $qb->expr();
88
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
88
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
89 89
 
90
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($id)));
90
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($id)));
91 91
 	}
92 92
 
93 93
 
@@ -97,11 +97,11 @@  discard block
 block discarded – undo
97 97
 	 * @param IQueryBuilder $qb
98 98
 	 * @param int $uniqueId
99 99
 	 */
100
-	protected function limitToUniqueId(IQueryBuilder &$qb, $uniqueId) {
100
+	protected function limitToUniqueId(IQueryBuilder & $qb, $uniqueId) {
101 101
 		$expr = $qb->expr();
102
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
102
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
103 103
 
104
-		$qb->andWhere($expr->eq($pf . 'unique_id', $qb->createNamedParameter($uniqueId)));
104
+		$qb->andWhere($expr->eq($pf.'unique_id', $qb->createNamedParameter($uniqueId)));
105 105
 	}
106 106
 
107 107
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	 * @param IQueryBuilder $qb
112 112
 	 * @param $level
113 113
 	 */
114
-	protected function limitToMemberLevel(IQueryBuilder &$qb, $level) {
114
+	protected function limitToMemberLevel(IQueryBuilder & $qb, $level) {
115 115
 		$qb->where(
116 116
 			$qb->expr()
117 117
 			   ->gte('m.level', $qb->createNamedParameter($level))
@@ -126,20 +126,20 @@  discard block
 block discarded – undo
126 126
 	 * @param IQueryBuilder $qb
127 127
 	 * @param string $userId
128 128
 	 */
129
-	protected function leftJoinUserIdAsMember(IQueryBuilder &$qb, $userId) {
129
+	protected function leftJoinUserIdAsMember(IQueryBuilder & $qb, $userId) {
130 130
 
131 131
 		if ($qb->getType() !== QueryBuilder::SELECT) {
132 132
 			return;
133 133
 		}
134 134
 
135 135
 		$expr = $qb->expr();
136
-		$pf = $this->default_select_alias . '.';
136
+		$pf = $this->default_select_alias.'.';
137 137
 
138 138
 		$qb->selectAlias('u.level', 'user_level');
139 139
 		$qb->leftJoin(
140 140
 			$this->default_select_alias, MembersMapper::TABLENAME, 'u',
141 141
 			$expr->andX(
142
-				$expr->eq($pf . 'id', 'u.circle_id'),
142
+				$expr->eq($pf.'id', 'u.circle_id'),
143 143
 				$expr->eq('u.user_id', $qb->createNamedParameter($userId))
144 144
 			)
145 145
 		);
@@ -151,19 +151,19 @@  discard block
 block discarded – undo
151 151
 	 * @deprecated
152 152
 	 * never used in fact.
153 153
 	 */
154
-	protected function leftJoinOwner(IQueryBuilder &$qb) {
154
+	protected function leftJoinOwner(IQueryBuilder & $qb) {
155 155
 
156 156
 		if ($qb->getType() !== QueryBuilder::SELECT) {
157 157
 			return;
158 158
 		}
159 159
 
160 160
 		$expr = $qb->expr();
161
-		$pf = $this->default_select_alias . '.';
161
+		$pf = $this->default_select_alias.'.';
162 162
 
163 163
 		$qb->leftJoin(
164 164
 			$this->default_select_alias, MembersMapper::TABLENAME, 'o',
165 165
 			$expr->andX(
166
-				$expr->eq($pf . 'id', 'o.circle_id'),
166
+				$expr->eq($pf.'id', 'o.circle_id'),
167 167
 				$expr->eq('o.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
168 168
 			)
169 169
 		);
Please login to merge, or discard this patch.
lib/Service/FederatedService.php 2 patches
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 	 * in the database and send a request to the remote circle using requestLink()
165 165
 	 * If any issue, entry is removed from the database.
166 166
 	 *
167
-	 * @param $circleId
168
-	 * @param $remote
167
+	 * @param integer $circleId
168
+	 * @param string $remote
169 169
 	 *
170 170
 	 * @return FederatedLink
171 171
 	 * @throws Exception
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 	 * @param Circle $circle
236 236
 	 * @param FederatedLink $link
237 237
 	 *
238
-	 * @return int
238
+	 * @return boolean
239 239
 	 * @throws Exception
240 240
 	 */
241 241
 	private function requestLink(Circle $circle, FederatedLink &$link) {
@@ -328,8 +328,8 @@  discard block
 block discarded – undo
328 328
 
329 329
 
330 330
 	/**
331
-	 * @param $circleId
332
-	 * @param $uniqueId
331
+	 * @param integer $circleId
332
+	 * @param string $uniqueId
333 333
 	 *
334 334
 	 * @return FederatedLink
335 335
 	 */
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
 
340 340
 
341 341
 	/**
342
-	 * @param $circleId
342
+	 * @param integer $circleId
343 343
 	 *
344 344
 	 * @return FederatedLink[]
345 345
 	 */
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 
350 350
 
351 351
 	/**
352
-	 * @param $uniqueId
352
+	 * @param string $uniqueId
353 353
 	 *
354 354
 	 * @return bool
355 355
 	 * @throws Exception
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -208,10 +208,10 @@  discard block
 block discarded – undo
208 208
 	 */
209 209
 	private function generateLinkRemoteURL($remote) {
210 210
 		if (strpos($remote, 'http') !== 0) {
211
-			$remote = 'https://' . $remote;
211
+			$remote = 'https://'.$remote;
212 212
 		}
213 213
 
214
-		return rtrim($remote, '/') . '/index.php/apps/circles/circles/link/';
214
+		return rtrim($remote, '/').'/index.php/apps/circles/circles/link/';
215 215
 	}
216 216
 
217 217
 	/**
@@ -221,10 +221,10 @@  discard block
 block discarded – undo
221 221
 	 */
222 222
 	private function generatePayloadDeliveryURL($remote) {
223 223
 		if (strpos($remote, 'http') !== 0) {
224
-			$remote = 'http://' . $remote;
224
+			$remote = 'http://'.$remote;
225 225
 		}
226 226
 
227
-		return rtrim($remote, '/') . '/index.php/apps/circles/circles/payload/';
227
+		return rtrim($remote, '/').'/index.php/apps/circles/circles/payload/';
228 228
 	}
229 229
 
230 230
 
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 	 * @return int
239 239
 	 * @throws Exception
240 240
 	 */
241
-	private function requestLink(Circle $circle, FederatedLink &$link) {
241
+	private function requestLink(Circle $circle, FederatedLink & $link) {
242 242
 		$args = [
243 243
 			'token'      => $link->getToken(),
244 244
 			'uniqueId'   => $circle->getUniqueId(),
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 	 *
314 314
 	 * @return bool
315 315
 	 */
316
-	public function initiateLink(Circle $circle, FederatedLink &$link) {
316
+	public function initiateLink(Circle $circle, FederatedLink & $link) {
317 317
 
318 318
 		$link->setCircleId($circle->getId());
319 319
 
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 
372 372
 			$result = json_decode($request->getBody(), true);
373 373
 			$this->miscService->log(
374
-				"initiateRemoteShare result: " . $uniqueId . '  ----  ' . var_export($result, true)
374
+				"initiateRemoteShare result: ".$uniqueId.'  ----  '.var_export($result, true)
375 375
 			);
376 376
 
377 377
 			return true;
Please login to merge, or discard this patch.
lib/Controller/FederatedController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 
175 175
 		$frame = SharingFrame::fromJSON($item);
176 176
 		$this->miscService->log(
177
-			"receiveFederatedDelivery start " . $token . '   ' . $uniqueId . '    ' . $item . '   '
177
+			"receiveFederatedDelivery start ".$token.'   '.$uniqueId.'    '.$item.'   '
178 178
 			. var_export($frame, true)
179 179
 		);
180 180
 
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 		ob_start();
203 203
 		echo($result);
204 204
 		$size = ob_get_length();
205
-		header('Content-Length: ' . $size);
205
+		header('Content-Length: '.$size);
206 206
 		ob_end_flush();
207 207
 		flush();
208 208
 	}
Please login to merge, or discard this patch.