Completed
Pull Request — master (#384)
by Tortue
02:27
created
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/MembersCreate.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 		];
120 120
 
121 121
 		if (!key_exists(strtolower($level), $levels)) {
122
-			throw new Exception('unknown level: ' . json_encode(array_keys($levels)));
122
+			throw new Exception('unknown level: '.json_encode(array_keys($levels)));
123 123
 		}
124 124
 
125 125
 		$level = $levels[strtolower($level)];
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		$this->membersService->levelMember($circleId, $userId, Member::TYPE_USER, $level, true);
129 129
 
130 130
 		$member = $this->membersRequest->forceGetMember($circleId, $userId, Member::TYPE_USER);
131
-		echo json_encode($member, JSON_PRETTY_PRINT) . "\n";
131
+		echo json_encode($member, JSON_PRETTY_PRINT)."\n";
132 132
 
133 133
 		return 0;
134 134
 	}
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)];
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 		$member = $this->membersRequest->forceGetMember(
125 125
 			$member->getCircleId(), $member->getUserId(), Member::TYPE_USER
126 126
 		);
127
-		echo json_encode($member, JSON_PRETTY_PRINT) . "\n";
127
+		echo json_encode($member, JSON_PRETTY_PRINT)."\n";
128 128
 
129 129
 		return 0;
130 130
 	}
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/SharingFrameService.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 		}
140 140
 
141 141
 		$this->miscService->log(
142
-			'Create frame with payload ' . json_encode($frame->getPayload()) . ' as ' . $userId, 0
142
+			'Create frame with payload '.json_encode($frame->getPayload()).' as '.$userId, 0
143 143
 		);
144 144
 		try {
145 145
 			$circle = $this->circlesRequest->getCircle($circleUniqueId, $userId);
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 
154 154
 			$this->initiateShare($circle->getUniqueId(), $frame->getUniqueId());
155 155
 		} catch (Exception $e) {
156
-			$this->miscService->log('fail to create frame for circle ' . $circleUniqueId . ' - ' . $e->getMessage());
156
+			$this->miscService->log('fail to create frame for circle '.$circleUniqueId.' - '.$e->getMessage());
157 157
 			throw $e;
158 158
 		}
159 159
 	}
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 
293 293
 		$client = $this->clientService->newClient();
294 294
 
295
-		$addr = $this->configService->getLocalAddress() . \OC::$WEBROOT;
295
+		$addr = $this->configService->getLocalAddress().\OC::$WEBROOT;
296 296
 
297 297
 		try {
298 298
 			$client->post(
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 
308 308
 			return true;
309 309
 		} catch (Exception $e) {
310
-			$this->miscService->log('fail to initialise circle share to ' . $addr . ' for circle ' . $circleUniqueId . ' - ' . $e->getMessage(), 3);
310
+			$this->miscService->log('fail to initialise circle share to '.$addr.' for circle '.$circleUniqueId.' - '.$e->getMessage(), 3);
311 311
 			throw $e;
312 312
 		}
313 313
 	}
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 	 * @return string
320 320
 	 */
321 321
 	private function generatePayloadDeliveryURL($remote) {
322
-		return $this->configService->generateRemoteHost($remote) . Application::REMOTE_URL_PAYLOAD;
322
+		return $this->configService->generateRemoteHost($remote).Application::REMOTE_URL_PAYLOAD;
323 323
 	}
324 324
 
325 325
 
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 
394 394
 		} catch (Exception $e) {
395 395
 			$this->miscService->log(
396
-				'fail to send frame to ' . $link->getAddress() . ' - ' . $e->getMessage()
396
+				'fail to send frame to '.$link->getAddress().' - '.$e->getMessage()
397 397
 			);
398 398
 		}
399 399
 	}
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 use OCP\EventDispatcher\IEventDispatcher;
43 43
 use OCP\Util;
44 44
 
45
-require_once __DIR__ . '/../../appinfo/autoload.php';
45
+require_once __DIR__.'/../../appinfo/autoload.php';
46 46
 
47 47
 
48 48
 class Application extends App {
@@ -245,9 +245,9 @@  discard block
 block discarded – undo
245 245
 		$this->dispatcher->addListener('\OCA\Circles::onLinkRemove', [$groupsBackendService, 'onLinkRemove']);
246 246
 		$this->dispatcher->addListener('\OCA\Circles::onSettingsChange', [$groupsBackendService, 'onSettingsChange']);
247 247
 
248
-		$this->dispatcher->addListener(IGroup::class . '::postAddUser', [$groupsBackendService, 'onGroupPostAddUser']);
249
-		$this->dispatcher->addListener(IGroup::class . '::postRemoveUser', [$groupsBackendService, 'onGroupPostRemoveUser']);
250
-		$this->dispatcher->addListener(IGroup::class . '::postDelete', [$groupsBackendService, 'onGroupPostDelete']);
248
+		$this->dispatcher->addListener(IGroup::class.'::postAddUser', [$groupsBackendService, 'onGroupPostAddUser']);
249
+		$this->dispatcher->addListener(IGroup::class.'::postRemoveUser', [$groupsBackendService, 'onGroupPostRemoveUser']);
250
+		$this->dispatcher->addListener(IGroup::class.'::postDelete', [$groupsBackendService, 'onGroupPostDelete']);
251 251
 	}
252 252
 
253 253
 }
Please login to merge, or discard this patch.