Completed
Pull Request — master (#8630)
by Blizzz
25:22 queued 01:35
created
settings/BackgroundJobs/VerifyUserData.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -103,9 +103,9 @@  discard block
 block discarded – undo
103 103
 
104 104
 	protected function run($argument) {
105 105
 
106
-		$try = (int)$argument['try'] + 1;
106
+		$try = (int) $argument['try'] + 1;
107 107
 
108
-		switch($argument['type']) {
108
+		switch ($argument['type']) {
109 109
 			case AccountManager::PROPERTY_WEBSITE:
110 110
 				$result = $this->verifyWebsite($argument);
111 111
 				break;
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 				break;
116 116
 			default:
117 117
 				// no valid type given, no need to retry
118
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
118
+				$this->logger->error($argument['type'].' is no valid type for user account data.');
119 119
 				$result = true;
120 120
 		}
121 121
 
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
 		$result = false;
136 136
 
137
-		$url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
137
+		$url = rtrim($argument['data'], '/').'/.well-known/'.'CloudIdVerificationCode.txt';
138 138
 
139 139
 		$client = $this->httpClientService->newClient();
140 140
 		try {
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 			$user = $this->userManager->get($argument['uid']);
152 152
 			// we don't check a valid user -> give up
153 153
 			if ($user === null) {
154
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
154
+				$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
155 155
 				return $result;
156 156
 			}
157 157
 			$userData = $this->accountManager->getUser($user);
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 
182 182
 		// we don't check a valid user -> give up
183 183
 		if ($user === null) {
184
-			$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
184
+			$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
185 185
 			return true;
186 186
 		}
187 187
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 		try {
221 221
 			$client = $this->httpClientService->newClient();
222 222
 			$response = $client->get(
223
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
223
+				$this->lookupServerUrl.'/users?search='.urlencode($cloudId).'&exactCloudId=1',
224 224
 				[
225 225
 					'timeout' => 10,
226 226
 					'connect_timeout' => 3,
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 				'data' => $argument['data'],
254 254
 				'type' => $argument['type'],
255 255
 				'uid' => $argument['uid'],
256
-				'try' => (int)$argument['try'] + 1,
256
+				'try' => (int) $argument['try'] + 1,
257 257
 				'lastRun' => time()
258 258
 			]
259 259
 		);
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 	 * @return bool
267 267
 	 */
268 268
 	protected function shouldRun(array $argument) {
269
-		$lastRun = (int)$argument['lastRun'];
269
+		$lastRun = (int) $argument['lastRun'];
270 270
 		return ((time() - $lastRun) > $this->interval);
271 271
 	}
272 272
 
Please login to merge, or discard this patch.
themes/example/defaults.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	 */
123 123
 	public function getShortFooter() {
124 124
 		$footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
125
-			'<br/>' . $this->getSlogan();
125
+			'<br/>'.$this->getSlogan();
126 126
 
127 127
 		return $footer;
128 128
 	}
@@ -133,13 +133,13 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	public function getLongFooter() {
135 135
 		$footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
136
-			'<br/>' . $this->getSlogan();
136
+			'<br/>'.$this->getSlogan();
137 137
 
138 138
 		return $footer;
139 139
 	}
140 140
 
141 141
 	public function buildDocLinkToKey($key) {
142
-		return $this->getDocBaseUrl() . '/server/12/go.php?to=' . $key;
142
+		return $this->getDocBaseUrl().'/server/12/go.php?to='.$key;
143 143
 	}
144 144
 
145 145
 
Please login to merge, or discard this patch.
lib/private/App/AppStore/Fetcher/AppFetcher.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
63 63
 
64 64
 		$ncVersion = $this->getVersion();
65 65
 		$ncMajorVersion = explode('.', $ncVersion)[0];
66
-		foreach($response['data'] as $dataKey => $app) {
66
+		foreach ($response['data'] as $dataKey => $app) {
67 67
 			$releases = [];
68 68
 
69 69
 			// Filter all compatible releases
70
-			foreach($app['releases'] as $release) {
70
+			foreach ($app['releases'] as $release) {
71 71
 				// Exclude all nightly and pre-releases
72
-				if($release['isNightly'] === false
72
+				if ($release['isNightly'] === false
73 73
 					&& strpos($release['version'], '-') === false) {
74 74
 					// Exclude all versions not compatible with the current version
75 75
 					$versionParser = new VersionParser();
@@ -87,23 +87,23 @@  discard block
 block discarded – undo
87 87
 
88 88
 			// Get the highest version
89 89
 			$versions = [];
90
-			foreach($releases as $release) {
90
+			foreach ($releases as $release) {
91 91
 				$versions[] = $release['version'];
92 92
 			}
93 93
 			usort($versions, 'version_compare');
94 94
 			$versions = array_reverse($versions);
95 95
 			$compatible = false;
96
-			if(isset($versions[0])) {
96
+			if (isset($versions[0])) {
97 97
 				$highestVersion = $versions[0];
98 98
 				foreach ($releases as $release) {
99
-					if ((string)$release['version'] === (string)$highestVersion) {
99
+					if ((string) $release['version'] === (string) $highestVersion) {
100 100
 						$compatible = true;
101 101
 						$response['data'][$dataKey]['releases'] = [$release];
102 102
 						break;
103 103
 					}
104 104
 				}
105 105
 			}
106
-			if(!$compatible) {
106
+			if (!$compatible) {
107 107
 				unset($response['data'][$dataKey]);
108 108
 			}
109 109
 		}
Please login to merge, or discard this patch.
lib/private/App/AppStore/Fetcher/Fetcher.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@
 block discarded – undo
132 132
 				if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
133 133
 
134 134
 					// If the timestamp is older than 300 seconds request the files new
135
-					if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
135
+					if ((int) $jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
136 136
 						return $jsonBlob['data'];
137 137
 					}
138 138
 
Please login to merge, or discard this patch.
apps/dav/lib/CardDAV/PhotoCache.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 					$ext = 'gif';
82 82
 					break;
83 83
 			}
84
-			$file = $folder->newFile('photo.' . $ext);
84
+			$file = $folder->newFile('photo.'.$ext);
85 85
 			$file->putContent($data['body']);
86 86
 		}
87 87
 	}
@@ -94,9 +94,9 @@  discard block
 block discarded – undo
94 94
 		$ext = $this->getExtension($folder);
95 95
 
96 96
 		if ($size === -1) {
97
-			$path = 'photo.' . $ext;
97
+			$path = 'photo.'.$ext;
98 98
 		} else {
99
-			$path = 'photo.' . $size . '.' . $ext;
99
+			$path = 'photo.'.$size.'.'.$ext;
100 100
 		}
101 101
 
102 102
 		try {
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
 
109 109
 			$photo = new \OC_Image();
110 110
 			/** @var ISimpleFile $file */
111
-			$file = $folder->getFile('photo.' . $ext);
111
+			$file = $folder->getFile('photo.'.$ext);
112 112
 			$photo->loadFromData($file->getContent());
113 113
 
114 114
 			$ratio = $photo->width() / $photo->height();
115 115
 			if ($ratio < 1) {
116
-				$ratio = 1/$ratio;
116
+				$ratio = 1 / $ratio;
117 117
 			}
118
-			$size = (int)($size * $ratio);
118
+			$size = (int) ($size * $ratio);
119 119
 
120 120
 			if ($size !== -1) {
121 121
 				$photo->resize($size);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	 * @return ISimpleFolder
139 139
 	 */
140 140
 	private function getFolder($addressBookId, $cardUri) {
141
-		$hash = md5($addressBookId . ' ' . $cardUri);
141
+		$hash = md5($addressBookId.' '.$cardUri);
142 142
 		try {
143 143
 			return $this->appData->getFolder($hash);
144 144
 		} catch (NotFoundException $e) {
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 				'image/gif',
194 194
 			];
195 195
 
196
-			if(!in_array($type, $allowedContentTypes, true)) {
196
+			if (!in_array($type, $allowedContentTypes, true)) {
197 197
 				$type = 'application/octet-stream';
198 198
 			}
199 199
 
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 				'Content-Type' => $type,
202 202
 				'body' => $val
203 203
 			];
204
-		} catch(\Exception $ex) {
204
+		} catch (\Exception $ex) {
205 205
 
206 206
 		}
207 207
 		return false;
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 			if (strpos($type, 'image/') === 0) {
230 230
 				return $type;
231 231
 			} else {
232
-				return 'image/' . strtolower($type);
232
+				return 'image/'.strtolower($type);
233 233
 			}
234 234
 		}
235 235
 		return '';
Please login to merge, or discard this patch.
apps/dav/lib/CardDAV/ImageExportPlugin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 			return true;
73 73
 		}
74 74
 
75
-		$size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
75
+		$size = isset($queryParams['size']) ? (int) $queryParams['size'] : -1;
76 76
 
77 77
 		$path = $request->getPath();
78 78
 		$node = $this->server->tree->getNodeForPath($path);
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 		$addressbook = $this->server->tree->getNodeForPath($addressbookpath);
98 98
 
99 99
 		$response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
100
-		$response->setHeader('Etag', $node->getETag() );
100
+		$response->setHeader('Etag', $node->getETag());
101 101
 		$response->setHeader('Pragma', 'public');
102 102
 
103 103
 		try {
Please login to merge, or discard this patch.
lib/private/Config.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	 * @return mixed the value or $default
86 86
 	 */
87 87
 	public function getValue($key, $default = null) {
88
-		$envValue = getenv(self::ENV_PREFIX . $key);
88
+		$envValue = getenv(self::ENV_PREFIX.$key);
89 89
 		if ($envValue !== false) {
90 90
 			return $envValue;
91 91
 		}
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 		foreach ($configFiles as $file) {
198 198
 			$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
199 199
 			$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
200
-			if($file === $this->configFilePath &&
200
+			if ($file === $this->configFilePath &&
201 201
 				$filePointer === false) {
202 202
 				// Opening the main config might not be possible, e.g. if the wrong
203 203
 				// permissions are set (likely on a new installation)
@@ -205,13 +205,13 @@  discard block
 block discarded – undo
205 205
 			}
206 206
 
207 207
 			// Try to acquire a file lock
208
-			if(!flock($filePointer, LOCK_SH)) {
208
+			if (!flock($filePointer, LOCK_SH)) {
209 209
 				throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
210 210
 			}
211 211
 
212 212
 			unset($CONFIG);
213 213
 			include $file;
214
-			if(isset($CONFIG) && is_array($CONFIG)) {
214
+			if (isset($CONFIG) && is_array($CONFIG)) {
215 215
 				$this->cache = array_merge($this->cache, $CONFIG);
216 216
 			}
217 217
 
@@ -236,29 +236,29 @@  discard block
 block discarded – undo
236 236
 		$content .= var_export($this->cache, true);
237 237
 		$content .= ";\n";
238 238
 
239
-		touch ($this->configFilePath);
239
+		touch($this->configFilePath);
240 240
 		$filePointer = fopen($this->configFilePath, 'r+');
241 241
 
242 242
 		// Prevent others not to read the config
243 243
 		chmod($this->configFilePath, 0640);
244 244
 
245 245
 		// File does not exist, this can happen when doing a fresh install
246
-		if(!is_resource ($filePointer)) {
246
+		if (!is_resource($filePointer)) {
247 247
 			// TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
248 248
 			// currently this breaks app routes but also could have other side effects especially during setup and exception handling
249 249
 			$url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
250 250
 			throw new HintException(
251 251
 				"Can't write into config directory!",
252
-				'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
252
+				'This can usually be fixed by giving the webserver write access to the config directory. See '.$url);
253 253
 		}
254 254
 
255 255
 		// Try to acquire a file lock
256
-		if(!flock($filePointer, LOCK_EX)) {
256
+		if (!flock($filePointer, LOCK_EX)) {
257 257
 			throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
258 258
 		}
259 259
 
260 260
 		// Write the config and release the lock
261
-		ftruncate ($filePointer, 0);
261
+		ftruncate($filePointer, 0);
262 262
 		fwrite($filePointer, $content);
263 263
 		fflush($filePointer);
264 264
 		flock($filePointer, LOCK_UN);
Please login to merge, or discard this patch.
lib/private/App/CodeChecker/LanguageParseChecker.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,12 +35,12 @@  discard block
 block discarded – undo
35 35
 			throw new \RuntimeException("No app with given id <$appId> known.");
36 36
 		}
37 37
 
38
-		if (!is_dir($appPath . '/l10n/')) {
38
+		if (!is_dir($appPath.'/l10n/')) {
39 39
 			return [];
40 40
 		}
41 41
 
42 42
 		$errors = [];
43
-		$directory = new \DirectoryIterator($appPath . '/l10n/');
43
+		$directory = new \DirectoryIterator($appPath.'/l10n/');
44 44
 
45 45
 		foreach ($directory as $file) {
46 46
 			if ($file->getExtension() !== 'json') {
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 			json_decode($content, true);
52 52
 
53 53
 			if (json_last_error() !== JSON_ERROR_NONE) {
54
-				$errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
54
+				$errors[] = 'Invalid language file found: l10n/'.$file->getFilename().': '.json_last_error_msg();
55 55
 			}
56 56
 		}
57 57
 
Please login to merge, or discard this patch.
core/Application.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 
46 46
 		$container = $this->getContainer();
47 47
 
48
-		$container->registerService('defaultMailAddress', function () {
48
+		$container->registerService('defaultMailAddress', function() {
49 49
 			return Util::getDefaultEmailAddress('lostpassword-noreply');
50 50
 		});
51 51
 	}
Please login to merge, or discard this patch.