Completed
Pull Request — master (#9222)
by Joas
71:57 queued 42:38
created
apps/dav/lib/DAV/GroupPrincipalBackend.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 		$principals = [];
60 60
 
61 61
 		if ($prefixPath === self::PRINCIPAL_PREFIX) {
62
-			foreach($this->groupManager->search('') as $user) {
62
+			foreach ($this->groupManager->search('') as $user) {
63 63
 				$principals[] = $this->groupToPrincipal($user);
64 64
 			}
65 65
 		}
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @return array
77 77
 	 */
78 78
 	public function getPrincipalByPath($path) {
79
-		$elements = explode('/', $path,  3);
79
+		$elements = explode('/', $path, 3);
80 80
 		if ($elements[0] !== 'principals') {
81 81
 			return null;
82 82
 		}
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 	protected function groupToPrincipal($group) {
180 180
 		$groupId = $group->getGID();
181 181
 		$principal = [
182
-			'uri' => 'principals/groups/' . urlencode($groupId),
182
+			'uri' => 'principals/groups/'.urlencode($groupId),
183 183
 			'{DAV:}displayname' => $groupId,
184 184
 		];
185 185
 
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 	 */
193 193
 	protected function userToPrincipal($user) {
194 194
 		$principal = [
195
-			'uri' => 'principals/users/' . $user->getUID(),
195
+			'uri' => 'principals/users/'.$user->getUID(),
196 196
 			'{DAV:}displayname' => $user->getDisplayName(),
197 197
 		];
198 198
 
Please login to merge, or discard this patch.
core/templates/twofactorshowchallenge.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 <div class="warning">
15 15
 	<h2 class="two-factor-header"><?php p($provider->getDisplayName()); ?></h2>
16 16
 	<?php if ($error): ?>
17
-			<?php if($error_message): ?>
17
+			<?php if ($error_message): ?>
18 18
 				<p><strong><?php p($error_message); ?></strong></p>
19 19
 			<?php else: ?>
20 20
 				<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
Please login to merge, or discard this patch.
apps/workflowengine/lib/Check/FileMimeType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
 				if (strpos($path, '/webdav/') === 0) {
89 89
 					$path = substr($path, strlen('/webdav'));
90 90
 				}
91
-				$path = $this->path . $path;
91
+				$path = $this->path.$path;
92 92
 				$this->mimeType[$this->storage->getId()][$path] = $this->mimeTypeDetector->detectPath($path);
93 93
 				return $this->mimeType[$this->storage->getId()][$path];
94 94
 			}
Please login to merge, or discard this patch.
lib/private/Preview/MP3.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,11 +46,11 @@
 block discarded – undo
46 46
 		$tags = $getID3->analyze($tmpPath);
47 47
 		unlink($tmpPath);
48 48
 		$picture = isset($tags['id3v2']['APIC'][0]['data']) ? $tags['id3v2']['APIC'][0]['data'] : null;
49
-		if(is_null($picture) && isset($tags['id3v2']['PIC'][0]['data'])) {
49
+		if (is_null($picture) && isset($tags['id3v2']['PIC'][0]['data'])) {
50 50
 			$picture = $tags['id3v2']['PIC'][0]['data'];
51 51
 		}
52 52
 
53
-		if(!is_null($picture)) {
53
+		if (!is_null($picture)) {
54 54
 			$image = new \OC_Image();
55 55
 			$image->loadFromData($picture);
56 56
 
Please login to merge, or discard this patch.
apps/federatedfilesharing/lib/Notifications.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 			'remoteId' => $shareId
135 135
 		);
136 136
 
137
-		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
137
+		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/'.$id.'/reshare', $fields);
138 138
 		$status = json_decode($result['result'], true);
139 139
 
140 140
 		$httpRequestSuccessful = $result['success'];
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 		if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
146 146
 			return [
147 147
 				$status['ocs']['data']['token'],
148
-				(int)$status['ocs']['data']['remoteId']
148
+				(int) $status['ocs']['data']['remoteId']
149 149
 			];
150 150
 		}
151 151
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 			$fields[$key] = $value;
230 230
 		}
231 231
 
232
-		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields);
232
+		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/'.$remoteId.'/'.$action, $fields);
233 233
 		$status = json_decode($result['result'], true);
234 234
 
235 235
 		if ($result['success'] &&
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 		$client = $this->httpClientService->newClient();
281 281
 
282 282
 		if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
283
-			$remoteDomain = 'https://' . $remoteDomain;
283
+			$remoteDomain = 'https://'.$remoteDomain;
284 284
 		}
285 285
 
286 286
 		$result = [
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 		$federationEndpoints = $this->discoveryService->discover($remoteDomain, 'FEDERATED_SHARING');
292 292
 		$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
293 293
 		try {
294
-			$response = $client->post($remoteDomain . $endpoint . $urlSuffix . '?format=' . self::RESPONSE_FORMAT, [
294
+			$response = $client->post($remoteDomain.$endpoint.$urlSuffix.'?format='.self::RESPONSE_FORMAT, [
295 295
 				'body' => $fields,
296 296
 				'timeout' => 10,
297 297
 				'connect_timeout' => 10,
Please login to merge, or discard this patch.
lib/private/Share20/ProviderFactory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 		}
215 215
 
216 216
 		if ($provider === null) {
217
-			throw new ProviderException('No provider with id .' . $id . ' found.');
217
+			throw new ProviderException('No provider with id .'.$id.' found.');
218 218
 		}
219 219
 
220 220
 		return $provider;
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 
242 242
 
243 243
 		if ($provider === null) {
244
-			throw new ProviderException('No share provider for share type ' . $shareType);
244
+			throw new ProviderException('No share provider for share type '.$shareType);
245 245
 		}
246 246
 
247 247
 		return $provider;
Please login to merge, or discard this patch.
apps/systemtags/appinfo/app.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
 $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
66 66
 $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
67 67
 
68
-\OCA\Files\App::getNavigationManager()->add(function () {
68
+\OCA\Files\App::getNavigationManager()->add(function() {
69 69
 	$l = \OC::$server->getL10N('systemtags');
70 70
 	return [
71 71
 		'id' => 'systemtagsfilter',
Please login to merge, or discard this patch.
apps/files_sharing/appinfo/app.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 $config = \OC::$server->getConfig();
52 52
 if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') {
53
-	\OCA\Files\App::getNavigationManager()->add(function () {
53
+	\OCA\Files\App::getNavigationManager()->add(function() {
54 54
 		$l = \OC::$server->getL10N('files_sharing');
55 55
 		return [
56 56
 			'id' => 'sharingin',
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	});
63 63
 
64 64
 	if (\OCP\Util::isSharingDisabledForUser() === false) {
65
-		\OCA\Files\App::getNavigationManager()->add(function () {
65
+		\OCA\Files\App::getNavigationManager()->add(function() {
66 66
 			$l = \OC::$server->getL10N('files_sharing');
67 67
 			return [
68 68
 				'id' => 'sharingout',
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 
76 76
 		// Check if sharing by link is enabled
77 77
 		if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
78
-			\OCA\Files\App::getNavigationManager()->add(function () {
78
+			\OCA\Files\App::getNavigationManager()->add(function() {
79 79
 				$l = \OC::$server->getL10N('files_sharing');
80 80
 				return [
81 81
 					'id' => 'sharinglinks',
Please login to merge, or discard this patch.
apps/files_trashbin/appinfo/app.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 // register hooks
29 29
 \OCA\Files_Trashbin\Trashbin::registerHooks();
30 30
 
31
-\OCA\Files\App::getNavigationManager()->add(function () {
31
+\OCA\Files\App::getNavigationManager()->add(function() {
32 32
 	$l = \OC::$server->getL10N('files_trashbin');
33 33
 	return [
34 34
 		'id' => 'trashbin',
Please login to merge, or discard this patch.