Completed
Pull Request — master (#439)
by Joas
01:52
created
lib/Controller/SharesController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	 */
132 132
 	public function create($circleUniqueId, $source, $type, $payload) {
133 133
 
134
-		$this->miscService->log('Creating circle share: ' . $circleUniqueId, 0);
134
+		$this->miscService->log('Creating circle share: '.$circleUniqueId, 0);
135 135
 
136 136
 		try {
137 137
 			$share = new SharingFrame($source, $type);
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
 			$this->sharingFrameService->createFrame($circleUniqueId, $share);
141 141
 		} catch (\Exception $e) {
142
-			$this->miscService->log('Failed to create circle - ' . $e->getMessage(), 3);
142
+			$this->miscService->log('Failed to create circle - '.$e->getMessage(), 3);
143 143
 			return $this->fail(
144 144
 				[
145 145
 					'circle_id' => $circleUniqueId,
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 			);
152 152
 		}
153 153
 
154
-		$this->miscService->log('Created circle: share ' . $circleUniqueId, 0);
154
+		$this->miscService->log('Created circle: share '.$circleUniqueId, 0);
155 155
 
156 156
 		return $this->success(
157 157
 			[
Please login to merge, or discard this patch.
lib/Command/CirclesDetails.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
 
87 87
 		$circle = $this->circlesRequest->forceGetCircle($circleId);
88 88
 
89
-		echo json_encode($circle, JSON_PRETTY_PRINT) . "\n";
89
+		echo json_encode($circle, JSON_PRETTY_PRINT)."\n";
90 90
 
91 91
 		return 0;
92 92
 	}
Please login to merge, or discard this patch.
lib/Command/CirclesList.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@
 block discarded – undo
97 97
 		$circles = $this->getCircles($owner, $viewer);
98 98
 
99 99
 		if ($json) {
100
-			echo json_encode($circles, JSON_PRETTY_PRINT) . "\n";
100
+			echo json_encode($circles, JSON_PRETTY_PRINT)."\n";
101 101
 
102 102
 			return 0;
103 103
 		}
Please login to merge, or discard this patch.
lib/Command/MembersList.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
 		$members = $this->membersRequest->forceGetMembers($circleId);
101 101
 
102 102
 		if ($json) {
103
-			echo json_encode($members, JSON_PRETTY_PRINT) . "\n";
103
+			echo json_encode($members, JSON_PRETTY_PRINT)."\n";
104 104
 
105 105
 			return 0;
106 106
 		}
Please login to merge, or discard this patch.
lib/Command/CirclesCreate.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		];
126 126
 
127 127
 		if (!key_exists(strtolower($type), $types)) {
128
-			throw new CircleTypeNotValidException('unknown type: ' . json_encode(array_keys($types)));
128
+			throw new CircleTypeNotValidException('unknown type: '.json_encode(array_keys($types)));
129 129
 		}
130 130
 
131 131
 		$type = $types[strtolower($type)];
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 		$circle = $this->circlesService->createCircle($type, $name, $ownerId);
134 134
 		$circle = $this->circlesRequest->forceGetCircle($circle->getUniqueId());
135 135
 
136
-		echo json_encode($circle, JSON_PRETTY_PRINT) . "\n";
136
+		echo json_encode($circle, JSON_PRETTY_PRINT)."\n";
137 137
 
138 138
 		return 0;
139 139
 	}
Please login to merge, or discard this patch.
lib/Command/MembersDetails.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
 		$memberId = $input->getArgument('member_id');
86 86
 
87 87
 		$member = $this->membersRequest->forceGetMemberById($memberId);
88
-		echo json_encode($member, JSON_PRETTY_PRINT) . "\n";
88
+		echo json_encode($member, JSON_PRETTY_PRINT)."\n";
89 89
 
90 90
 		return 0;
91 91
 	}
Please login to merge, or discard this patch.
lib/Service/GSUpstreamService.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -349,7 +349,7 @@
 block discarded – undo
349 349
 
350 350
 
351 351
 	/**
352
-	 * @param array $circles
352
+	 * @param Circle[] $circles
353 353
 	 *
354 354
 	 * @throws GSStatusException
355 355
 	 */
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -144,12 +144,12 @@  discard block
 block discarded – undo
144 144
 			} else {
145 145
 //				$gs->verify($event); // needed ? as we check event on the 'master' of the circle
146 146
 				$this->confirmEvent($event);
147
-				$this->miscService->log('confirmed: ' . json_encode($event));
147
+				$this->miscService->log('confirmed: '.json_encode($event));
148 148
 				$gs->manage($event); // needed ? as we manage it throw the confirmEvent
149 149
 			}
150 150
 		} catch (Exception $e) {
151 151
 			$this->miscService->log(
152
-				get_class($e) . ' on new event: ' . $e->getMessage() . ' - ' . json_encode($event), 1
152
+				get_class($e).' on new event: '.$e->getMessage().' - '.json_encode($event), 1
153 153
 			);
154 154
 			throw $e;
155 155
 		}
@@ -238,13 +238,13 @@  discard block
 block discarded – undo
238 238
 		$request->setDataSerialize($event);
239 239
 
240 240
 		$result = $this->retrieveJson($request);
241
-		$this->miscService->log('result ' . json_encode($result));
241
+		$this->miscService->log('result '.json_encode($result));
242 242
 		if ($this->getInt('status', $result) === 0) {
243 243
 			throw new GlobalScaleEventException($this->get('error', $result));
244 244
 		}
245 245
 
246 246
 		$updatedData = $this->getArray('event', $result);
247
-		$this->miscService->log('updatedEvent: ' . json_encode($updatedData));
247
+		$this->miscService->log('updatedEvent: '.json_encode($updatedData));
248 248
 		if (!empty($updatedData)) {
249 249
 			$updated = new GSEvent();
250 250
 			try {
Please login to merge, or discard this patch.
lib/Command/MembersCreate.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 		];
144 144
 
145 145
 		if (!key_exists(strtolower($level), $levels)) {
146
-			throw new Exception('unknown level: ' . json_encode(array_keys($levels)));
146
+			throw new Exception('unknown level: '.json_encode(array_keys($levels)));
147 147
 		}
148 148
 
149 149
 		$level = $levels[strtolower($level)];
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 		$this->membersService->levelMember($circleId, $userId, Member::TYPE_USER, $instance, $level, true);
153 153
 
154 154
 		$member = $this->membersRequest->forceGetMember($circleId, $userId, Member::TYPE_USER, $instance);
155
-		echo json_encode($member, JSON_PRETTY_PRINT) . "\n";
155
+		echo json_encode($member, JSON_PRETTY_PRINT)."\n";
156 156
 
157 157
 		return 0;
158 158
 	}
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 				$instance = $host;
204 204
 			}
205 205
 
206
-			$result[] = $user['userid']['value'] . ' <info>@' . $host . '</info>';
206
+			$result[] = $user['userid']['value'].' <info>@'.$host.'</info>';
207 207
 		}
208 208
 
209 209
 //		if ($userId === '') {
Please login to merge, or discard this patch.
lib/Command/MembersLevel.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 		];
112 112
 
113 113
 		if (!key_exists(strtolower($level), $levels)) {
114
-			throw new Exception('unknown level: ' . json_encode(array_keys($levels)));
114
+			throw new Exception('unknown level: '.json_encode(array_keys($levels)));
115 115
 		}
116 116
 
117 117
 		$level = $levels[strtolower($level)];
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		$member = $this->membersRequest->forceGetMember(
126 126
 			$member->getCircleId(), $member->getUserId(), Member::TYPE_USER, $member->getInstance()
127 127
 		);
128
-		echo json_encode($member, JSON_PRETTY_PRINT) . "\n";
128
+		echo json_encode($member, JSON_PRETTY_PRINT)."\n";
129 129
 
130 130
 		return 0;
131 131
 	}
Please login to merge, or discard this patch.