Completed
Push — activities ( dc96a4...5a21e7 )
by Maxence
02:53
created
lib/Db/CircleProviderRequestBuilder.php 1 patch
Spacing   +8 added lines, -8 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
 		}
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/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 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -217,10 +217,10 @@  discard block
 block discarded – undo
217 217
 	 */
218 218
 	private function generateLinkRemoteURL($remote) {
219 219
 		if ($this->localTest === false && strpos($remote, 'https') !== 0) {
220
-			$remote = 'https://' . $remote;
220
+			$remote = 'https://'.$remote;
221 221
 		}
222 222
 
223
-		return rtrim($remote, '/') . '/index.php/apps/circles/v1/circles/link/';
223
+		return rtrim($remote, '/').'/index.php/apps/circles/v1/circles/link/';
224 224
 	}
225 225
 
226 226
 
@@ -231,10 +231,10 @@  discard block
 block discarded – undo
231 231
 	 */
232 232
 	private function generatePayloadDeliveryURL($remote) {
233 233
 		if ($this->localTest === false && strpos($remote, 'https') !== 0) {
234
-			$remote = 'https://' . $remote;
234
+			$remote = 'https://'.$remote;
235 235
 		}
236 236
 
237
-		return rtrim($remote, '/') . '/index.php/apps/circles/v1/circles/payload/';
237
+		return rtrim($remote, '/').'/index.php/apps/circles/v1/circles/payload/';
238 238
 	}
239 239
 
240 240
 
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 
448 448
 			$result = json_decode($request->getBody(), true);
449 449
 			$this->miscService->log(
450
-				"initiateRemoteShare result: " . $uniqueId . '  ----  ' . var_export($result, true)
450
+				"initiateRemoteShare result: ".$uniqueId.'  ----  '.var_export($result, true)
451 451
 			);
452 452
 
453 453
 			return true;
Please login to merge, or discard this patch.
lib/ShareByCircleProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -552,7 +552,7 @@
 block discarded – undo
552 552
 	 * @param IShare $share
553 553
 	 * @param $data
554 554
 	 */
555
-	private function assignShareObjectSharesProperties(IShare &$share, $data) {
555
+	private function assignShareObjectSharesProperties(IShare & $share, $data) {
556 556
 		$shareTime = new \DateTime();
557 557
 		$shareTime->setTimestamp((int)$data['stime']);
558 558
 
Please login to merge, or discard this patch.
lib/Db/CirclesMapper.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
 	 * @param Circle $circle
94 94
 	 * @param array $data
95 95
 	 */
96
-	private function fillCircleUserIdAndOwner(Circle &$circle, array $data) {
96
+	private function fillCircleUserIdAndOwner(Circle & $circle, array $data) {
97 97
 		$owner = new Member($this->l10n);
98 98
 		$owner->setUserId($data['owner_id']);
99 99
 		$circle->setOwner($owner);
Please login to merge, or discard this patch.
lib/Activity/Provider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
 		return $event;
576 576
 	}
577 577
 
578
-	private function parseActivityHeader(IEvent &$event, SharingFrame $frame) {
578
+	private function parseActivityHeader(IEvent & $event, SharingFrame $frame) {
579 579
 
580 580
 		$this->activityManager->getCurrentUserId();
581 581
 
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
 			'name' => $circle->getName(),
636 636
 			'link' => \OC::$server->getURLGenerator()
637 637
 								  ->linkToRoute('circles.Navigation.navigate')
638
-					  . '#' . $circle->getId()
638
+					  . '#'.$circle->getId()
639 639
 		];
640 640
 	}
641 641
 
Please login to merge, or discard this patch.
lib/Service/MembersService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	 *
235 235
 	 * @throws \Exception
236 236
 	 */
237
-	private function editMemberLevel(Circle $circle, Member &$member, $level) {
237
+	private function editMemberLevel(Circle $circle, Member & $member, $level) {
238 238
 		try {
239 239
 			$isMod = $this->dbMembers->getMemberFromCircle($circle->getId(), $this->userId);
240 240
 			$isMod->hasToBeModerator();
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 	 *
259 259
 	 * @throws \Exception
260 260
 	 */
261
-	public function switchOwner(Circle $circle, Member &$member) {
261
+	public function switchOwner(Circle $circle, Member & $member) {
262 262
 		try {
263 263
 			$isMod = $this->dbMembers->getMemberFromCircle($circle->getId(), $this->userId);
264 264
 			$isMod->hasToBeOwner();
Please login to merge, or discard this patch.