Completed
Push — stable13 ( 9d3a4b...5f029e )
by Morris
105:36 queued 79:13
created
apps/files_sharing/lib/Controller/ShareesAPIController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -117,13 +117,13 @@  discard block
 block discarded – undo
117 117
 	public function search($search = '', $itemType = null, $page = 1, $perPage = 200, $shareType = null, $lookup = true) {
118 118
 
119 119
 		// only search for string larger than a given threshold
120
-		$threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
120
+		$threshold = (int) $this->config->getSystemValue('sharing.minSearchStringLength', 0);
121 121
 		if (strlen($search) < $threshold) {
122 122
 			return new DataResponse($this->result);
123 123
 		}
124 124
 
125 125
 		// never return more than the max. number of results configured in the config.php
126
-		$maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
126
+		$maxResults = (int) $this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
127 127
 		if ($maxResults > 0) {
128 128
 			$perPage = min($perPage, $maxResults);
129 129
 		}
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
179 179
 
180 180
 		// extra treatment for 'exact' subarray, with a single merge expected keys might be lost
181
-		if(isset($result['exact'])) {
181
+		if (isset($result['exact'])) {
182 182
 			$result['exact'] = array_merge($this->result['exact'], $result['exact']);
183 183
 		}
184 184
 		$this->result = array_merge($this->result, $result);
@@ -222,12 +222,12 @@  discard block
 block discarded – undo
222 222
 	 */
223 223
 	protected function getPaginationLink($page, array $params) {
224 224
 		if ($this->isV2()) {
225
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
225
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees').'?';
226 226
 		} else {
227
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
227
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees').'?';
228 228
 		}
229 229
 		$params['page'] = $page + 1;
230
-		$link = '<' . $url . http_build_query($params) . '>; rel="next"';
230
+		$link = '<'.$url.http_build_query($params).'>; rel="next"';
231 231
 
232 232
 		return $link;
233 233
 	}
Please login to merge, or discard this patch.
lib/private/Collaboration/Collaborators/Search.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 		$searchResult = $this->c->resolve(SearchResult::class);
48 48
 
49 49
 		foreach ($shareTypes as $type) {
50
-			if(!isset($this->pluginList[$type])) {
50
+			if (!isset($this->pluginList[$type])) {
51 51
 				continue;
52 52
 			}
53 53
 			foreach ($this->pluginList[$type] as $plugin) {
@@ -70,18 +70,18 @@  discard block
 block discarded – undo
70 70
 		// that the exact same email address and federated cloud id exists
71 71
 		$emailType = new SearchResultType('emails');
72 72
 		$remoteType = new SearchResultType('remotes');
73
-		if($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
73
+		if ($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
74 74
 			$searchResult->unsetResult($remoteType);
75 75
 		} elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
76 76
 			$searchResult->unsetResult($emailType);
77 77
 		}
78 78
 
79
-		return [$searchResult->asArray(), (bool)$hasMoreResults];
79
+		return [$searchResult->asArray(), (bool) $hasMoreResults];
80 80
 	}
81 81
 
82 82
 	public function registerPlugin(array $pluginInfo) {
83
-		$shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
84
-		if($shareType === null) {
83
+		$shareType = constant(Share::class.'::'.$pluginInfo['shareType']);
84
+		if ($shareType === null) {
85 85
 			throw new \InvalidArgumentException('Provided ShareType is invalid');
86 86
 		}
87 87
 		$this->pluginList[$shareType][] = $pluginInfo['class'];
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/QuotaPlugin.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 			return;
95 95
 		}
96 96
 
97
-		return $this->checkQuota($parent->getPath() . '/' . basename($uri));
97
+		return $this->checkQuota($parent->getPath().'/'.basename($uri));
98 98
 	}
99 99
 
100 100
 	/**
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 
155 155
 		if ($length) {
156 156
 			list($parentPath, $newName) = \Sabre\Uri\split($path);
157
-			if(is_null($parentPath)) {
157
+			if (is_null($parentPath)) {
158 158
 				$parentPath = '';
159 159
 			}
160 160
 			$req = $this->server->httpRequest;
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 				// there is still enough space for the remaining chunks
166 166
 				$length -= $chunkHandler->getCurrentSize();
167 167
 				// use target file name for free space check in case of shared files
168
-				$path = rtrim($parentPath, '/') . '/' . $info['name'];
168
+				$path = rtrim($parentPath, '/').'/'.$info['name'];
169 169
 			}
170 170
 			$freeSpace = $this->getFreeSpace($path);
171 171
 			if ($freeSpace !== FileInfo::SPACE_UNKNOWN && $freeSpace !== FileInfo::SPACE_UNLIMITED && $length > $freeSpace) {
Please login to merge, or discard this patch.
apps/files_trashbin/lib/Storage.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 			if ($currentUser) {
113 113
 				$currentUserId = $currentUser->getUID();
114 114
 
115
-				$view = new View($currentUserId . '/files');
115
+				$view = new View($currentUserId.'/files');
116 116
 				$fileInfo = $view->getFileInfo($oldPath);
117 117
 				if ($fileInfo) {
118 118
 					$sourceStorage = $fileInfo->getStorage();
@@ -129,11 +129,11 @@  discard block
 block discarded – undo
129 129
 		} catch (\Exception $e) {
130 130
 			// do nothing, in this case we just disable the trashbin and continue
131 131
 			$logger = \OC::$server->getLogger();
132
-			$logger->debug('Trashbin storage could not check if a file was moved out of a shared folder: ' . $e->getMessage());
132
+			$logger->debug('Trashbin storage could not check if a file was moved out of a shared folder: '.$e->getMessage());
133 133
 		}
134 134
 
135
-		if($fileMovedOutOfSharedFolder) {
136
-			self::$moveOutOfSharedFolder['/' . $currentUserId . '/files' . $oldPath] = true;
135
+		if ($fileMovedOutOfSharedFolder) {
136
+			self::$moveOutOfSharedFolder['/'.$currentUserId.'/files'.$oldPath] = true;
137 137
 		} else {
138 138
 			self::$disableTrash = true;
139 139
 		}
@@ -173,16 +173,16 @@  discard block
 block discarded – undo
173 173
 	 */
174 174
 	public function unlink($path) {
175 175
 		try {
176
-			if (isset(self::$moveOutOfSharedFolder[$this->mountPoint . $path])) {
176
+			if (isset(self::$moveOutOfSharedFolder[$this->mountPoint.$path])) {
177 177
 				$result = $this->doDelete($path, 'unlink', true);
178
-				unset(self::$moveOutOfSharedFolder[$this->mountPoint . $path]);
178
+				unset(self::$moveOutOfSharedFolder[$this->mountPoint.$path]);
179 179
 			} else {
180 180
 				$result = $this->doDelete($path, 'unlink');
181 181
 			}
182 182
 		} catch (GenericEncryptionException $e) {
183 183
 			// in case of a encryption exception we delete the file right away
184 184
 			$this->logger->info(
185
-				"Can't move file" .  $path .
185
+				"Can't move file".$path.
186 186
 				"to the trash bin, therefore it was deleted right away");
187 187
 
188 188
 			$result = $this->storage->unlink($path);
@@ -199,9 +199,9 @@  discard block
 block discarded – undo
199 199
 	 * @return bool true if the operation succeeded, false otherwise
200 200
 	 */
201 201
 	public function rmdir($path) {
202
-		if (isset(self::$moveOutOfSharedFolder[$this->mountPoint . $path])) {
202
+		if (isset(self::$moveOutOfSharedFolder[$this->mountPoint.$path])) {
203 203
 			$result = $this->doDelete($path, 'rmdir', true);
204
-			unset(self::$moveOutOfSharedFolder[$this->mountPoint . $path]);
204
+			unset(self::$moveOutOfSharedFolder[$this->mountPoint.$path]);
205 205
 		} else {
206 206
 			$result = $this->doDelete($path, 'rmdir');
207 207
 		}
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 	 * @param $path
217 217
 	 * @return bool
218 218
 	 */
219
-	protected function shouldMoveToTrash($path){
219
+	protected function shouldMoveToTrash($path) {
220 220
 
221 221
 		// check if there is a app which want to disable the trash bin for this file
222 222
 		$fileId = $this->storage->getCache()->getId($path);
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 			}
230 230
 		}
231 231
 
232
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
232
+		$normalized = Filesystem::normalizePath($this->mountPoint.'/'.$path);
233 233
 		$parts = explode('/', $normalized);
234 234
 		if (count($parts) < 4) {
235 235
 			return false;
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 			return false;
278 278
 		}
279 279
 
280
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path, true, false, true);
280
+		$normalized = Filesystem::normalizePath($this->mountPoint.'/'.$path, true, false, true);
281 281
 		$result = true;
282 282
 		$view = Filesystem::getView();
283 283
 		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 	 * Setup the storate wrapper callback
306 306
 	 */
307 307
 	public static function setupStorage() {
308
-		\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
308
+		\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function($mountPoint, $storage) {
309 309
 			return new \OCA\Files_Trashbin\Storage(
310 310
 				array('storage' => $storage, 'mountPoint' => $mountPoint),
311 311
 				\OC::$server->getUserManager(),
Please login to merge, or discard this patch.
settings/Hooks.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 			$template->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
127 127
 			$template->addHeader();
128 128
 			$template->addHeading($this->l->t('Password changed for %s', [$user->getDisplayName()]), false);
129
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
129
+			$template->addBodyText($text.' '.$this->l->t('If you did not request this, please contact an administrator.'));
130 130
 			$template->addFooter();
131 131
 
132 132
 
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 			$template->setSubject($this->l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
197 197
 			$template->addHeader();
198 198
 			$template->addHeading($this->l->t('Email address changed for %s', [$user->getDisplayName()]), false);
199
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
199
+			$template->addBodyText($text.' '.$this->l->t('If you did not request this, please contact an administrator.'));
200 200
 			if ($user->getEMailAddress()) {
201 201
 				$template->addBodyText($this->l->t('The new email address is %s', [$user->getEMailAddress()]));
202 202
 			}
Please login to merge, or discard this patch.
lib/private/Contacts/ContactsMenu/ContactsStore.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 		if ($excludedGroups) {
118 118
 			$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
119 119
 			$decodedExcludeGroups = json_decode($excludedGroups, true);
120
-			$excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups :  [];
120
+			$excludeGroupsList = ($decodedExcludeGroups !== null) ? $decodedExcludeGroups : [];
121 121
 
122 122
 			if (count(array_intersect($excludeGroupsList, $selfGroups)) !== 0) {
123 123
 				// a group of the current user is excluded -> filter all local users
@@ -133,22 +133,22 @@  discard block
 block discarded – undo
133 133
 			}
134 134
 
135 135
 			// Prevent enumerating local users
136
-			if($disallowEnumeration && $entry->getProperty('isLocalSystemBook')) {
136
+			if ($disallowEnumeration && $entry->getProperty('isLocalSystemBook')) {
137 137
 				$filterUser = true;
138 138
 
139 139
 				$mailAddresses = $entry->getEMailAddresses();
140
-				foreach($mailAddresses as $mailAddress) {
141
-					if($mailAddress === $filter) {
140
+				foreach ($mailAddresses as $mailAddress) {
141
+					if ($mailAddress === $filter) {
142 142
 						$filterUser = false;
143 143
 						break;
144 144
 					}
145 145
 				}
146 146
 
147
-				if($entry->getProperty('UID') && $entry->getProperty('UID') === $filter) {
147
+				if ($entry->getProperty('UID') && $entry->getProperty('UID') === $filter) {
148 148
 					$filterUser = false;
149 149
 				}
150 150
 
151
-				if($filterUser) {
151
+				if ($filterUser) {
152 152
 					return false;
153 153
 				}
154 154
 			}
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 	 * @return IEntry|null
173 173
 	 */
174 174
 	public function findOne(IUser $user, $shareType, $shareWith) {
175
-		switch($shareType) {
175
+		switch ($shareType) {
176 176
 			case 0:
177 177
 			case 6:
178 178
 				$filter = ['UID'];
Please login to merge, or discard this patch.
apps/theming/lib/IconBuilder.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
 			$icon->setImageFormat("png32");
64 64
 
65 65
 			$clone = clone $icon;
66
-			$clone->scaleImage(16,0);
66
+			$clone->scaleImage(16, 0);
67 67
 			$favicon->addImage($clone);
68 68
 
69 69
 			$clone = clone $icon;
70
-			$clone->scaleImage(32,0);
70
+			$clone->scaleImage(32, 0);
71 71
 			$favicon->addImage($clone);
72 72
 
73 73
 			$clone = clone $icon;
74
-			$clone->scaleImage(64,0);
74
+			$clone->scaleImage(64, 0);
75 75
 			$favicon->addImage($clone);
76 76
 
77 77
 			$clone = clone $icon;
78
-			$clone->scaleImage(128,0);
78
+			$clone->scaleImage(128, 0);
79 79
 			$favicon->addImage($clone);
80 80
 
81 81
 			$data = $favicon->getImagesBlob();
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 	 */
118 118
 	public function renderAppIcon($app, $size) {
119 119
 		$appIcon = $this->util->getAppIcon($app);
120
-		if($appIcon === false) {
120
+		if ($appIcon === false) {
121 121
 			return false;
122 122
 		}
123 123
 		if ($appIcon instanceof ISimpleFile) {
@@ -128,20 +128,20 @@  discard block
 block discarded – undo
128 128
 			$mime = mime_content_type($appIcon);
129 129
 		}
130 130
 
131
-		if($appIconContent === false || $appIconContent === "") {
131
+		if ($appIconContent === false || $appIconContent === "") {
132 132
 			return false;
133 133
 		}
134 134
 
135 135
 		$color = $this->themingDefaults->getColorPrimary();
136 136
 
137 137
 		// generate background image with rounded corners
138
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
139
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
140
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
138
+		$background = '<?xml version="1.0" encoding="UTF-8"?>'.
139
+			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">'.
140
+			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:'.$color.';" />'.
141 141
 			'</svg>';
142 142
 		// resize svg magic as this seems broken in Imagemagick
143
-		if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
144
-			if(substr($appIconContent, 0, 5) !== "<?xml") {
143
+		if ($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
144
+			if (substr($appIconContent, 0, 5) !== "<?xml") {
145 145
 				$svg = "<?xml version=\"1.0\"?>".$appIconContent;
146 146
 			} else {
147 147
 				$svg = $appIconContent;
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 			$res = $tmp->getImageResolution();
154 154
 			$tmp->destroy();
155 155
 
156
-			if($x>$y) {
156
+			if ($x > $y) {
157 157
 				$max = $x;
158 158
 			} else {
159 159
 				$max = $y;
@@ -161,8 +161,8 @@  discard block
 block discarded – undo
161 161
 
162 162
 			// convert svg to resized image
163 163
 			$appIconFile = new Imagick();
164
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
165
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
164
+			$resX = (int) (512 * $res['x'] / $max * 2.53);
165
+			$resY = (int) (512 * $res['y'] / $max * 2.53);
166 166
 			$appIconFile->setResolution($resX, $resY);
167 167
 			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
168 168
 			$appIconFile->readImageBlob($svg);
@@ -185,10 +185,10 @@  discard block
 block discarded – undo
185 185
 			$appIconFile->scaleImage(512, 512, true);
186 186
 		}
187 187
 		// offset for icon positioning
188
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
189
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
190
-		$innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
191
-		$innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
188
+		$border_w = (int) ($appIconFile->getImageWidth() * 0.05);
189
+		$border_h = (int) ($appIconFile->getImageHeight() * 0.05);
190
+		$innerWidth = (int) ($appIconFile->getImageWidth() - $border_w * 2);
191
+		$innerHeight = (int) ($appIconFile->getImageHeight() - $border_h * 2);
192 192
 		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
193 193
 		// center icon
194 194
 		$offset_w = 512 / 2 - $innerWidth / 2;
Please login to merge, or discard this patch.
lib/public/ICacheFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
  * @package OCP
30 30
  * @since 7.0.0
31 31
  */
32
-interface ICacheFactory{
32
+interface ICacheFactory {
33 33
 	/**
34 34
 	 * Get a distributed memory cache instance
35 35
 	 *
Please login to merge, or discard this patch.
lib/private/NavigationManager.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -88,13 +88,13 @@  discard block
 block discarded – undo
88 88
 		}
89 89
 
90 90
 		$entry['active'] = false;
91
-		if(!isset($entry['icon'])) {
91
+		if (!isset($entry['icon'])) {
92 92
 			$entry['icon'] = '';
93 93
 		}
94
-		if(!isset($entry['classes'])) {
94
+		if (!isset($entry['classes'])) {
95 95
 			$entry['classes'] = '';
96 96
 		}
97
-		if(!isset($entry['type'])) {
97
+		if (!isset($entry['type'])) {
98 98
 			$entry['type'] = 'link';
99 99
 		}
100 100
 		$this->entries[] = $entry;
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 			]);
192 192
 
193 193
 			$logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
194
-			if($logoutUrl !== '') {
194
+			if ($logoutUrl !== '') {
195 195
 				// Logout
196 196
 				$this->add([
197 197
 					'type' => 'settings',
Please login to merge, or discard this patch.