Completed
Pull Request — master (#3233)
by Jan-Christoph
12:09
created
apps/files_external/lib/Lib/Storage/SFTP.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -62,11 +62,11 @@  discard block
 block discarded – undo
62 62
 		$input = $host;
63 63
 		if (strpos($host, '://') === false) {
64 64
 			// add a protocol to fix parse_url behavior with ipv6
65
-			$host = 'http://' . $host;
65
+			$host = 'http://'.$host;
66 66
 		}
67 67
 
68 68
 		$parsed = parse_url($host);
69
-		if(is_array($parsed) && isset($parsed['port'])) {
69
+		if (is_array($parsed) && isset($parsed['port'])) {
70 70
 			return [$parsed['host'], $parsed['port']];
71 71
 		} else if (is_array($parsed)) {
72 72
 			return [$parsed['host'], 22];
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 		// Register sftp://
83 83
 		Stream::register();
84 84
 
85
-		$parsedHost =  $this->splitHost($params['host']);
85
+		$parsedHost = $this->splitHost($params['host']);
86 86
 
87 87
 		$this->host = $parsedHost[0];
88 88
 		$this->port = $parsedHost[1];
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 			= isset($params['root']) ? $this->cleanPath($params['root']) : '/';
105 105
 
106 106
 		if ($this->root[0] != '/') {
107
-			 $this->root = '/' . $this->root;
107
+			 $this->root = '/'.$this->root;
108 108
 		}
109 109
 
110 110
 		if (substr($this->root, -1, 1) != '/') {
@@ -159,15 +159,15 @@  discard block
 block discarded – undo
159 159
 	/**
160 160
 	 * {@inheritdoc}
161 161
 	 */
162
-	public function getId(){
163
-		$id = 'sftp::' . $this->user . '@' . $this->host;
162
+	public function getId() {
163
+		$id = 'sftp::'.$this->user.'@'.$this->host;
164 164
 		if ($this->port !== 22) {
165
-			$id .= ':' . $this->port;
165
+			$id .= ':'.$this->port;
166 166
 		}
167 167
 		// note: this will double the root slash,
168 168
 		// we should not change it to keep compatible with
169 169
 		// old storage ids
170
-		$id .= '/' . $this->root;
170
+		$id .= '/'.$this->root;
171 171
 		return $id;
172 172
 	}
173 173
 
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 	 * @return string
198 198
 	 */
199 199
 	private function absPath($path) {
200
-		return $this->root . $this->cleanPath($path);
200
+		return $this->root.$this->cleanPath($path);
201 201
 	}
202 202
 
203 203
 	/**
@@ -207,8 +207,8 @@  discard block
 block discarded – undo
207 207
 		try {
208 208
 			$storage_view = \OCP\Files::getStorage('files_external');
209 209
 			if ($storage_view) {
210
-				return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') .
211
-					$storage_view->getAbsolutePath('') .
210
+				return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').
211
+					$storage_view->getAbsolutePath('').
212 212
 					'ssh_hostKeys';
213 213
 			}
214 214
 		} catch (\Exception $e) {
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 			if ($keyPath && file_exists($keyPath)) {
227 227
 				$fp = fopen($keyPath, 'w');
228 228
 				foreach ($keys as $host => $key) {
229
-					fwrite($fp, $host . '::' . $key . "\n");
229
+					fwrite($fp, $host.'::'.$key."\n");
230 230
 				}
231 231
 				fclose($fp);
232 232
 				return true;
@@ -298,15 +298,15 @@  discard block
 block discarded – undo
298 298
 				return false;
299 299
 			}
300 300
 
301
-			$id = md5('sftp:' . $path);
301
+			$id = md5('sftp:'.$path);
302 302
 			$dirStream = array();
303
-			foreach($list as $file) {
303
+			foreach ($list as $file) {
304 304
 				if ($file != '.' && $file != '..') {
305 305
 					$dirStream[] = $file;
306 306
 				}
307 307
 			}
308 308
 			return IteratorDirectory::wrap($dirStream);
309
-		} catch(\Exception $e) {
309
+		} catch (\Exception $e) {
310 310
 			return false;
311 311
 		}
312 312
 	}
@@ -358,10 +358,10 @@  discard block
 block discarded – undo
358 358
 	public function fopen($path, $mode) {
359 359
 		try {
360 360
 			$absPath = $this->absPath($path);
361
-			switch($mode) {
361
+			switch ($mode) {
362 362
 				case 'r':
363 363
 				case 'rb':
364
-					if ( !$this->file_exists($path)) {
364
+					if (!$this->file_exists($path)) {
365 365
 						return false;
366 366
 					}
367 367
 				case 'w':
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
 	/**
389 389
 	 * {@inheritdoc}
390 390
 	 */
391
-	public function touch($path, $mtime=null) {
391
+	public function touch($path, $mtime = null) {
392 392
 		try {
393 393
 			if (!is_null($mtime)) {
394 394
 				return false;
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
 		// Do not pass the password here. We want to use the Net_SFTP object
464 464
 		// supplied via stream context or fail. We only supply username and
465 465
 		// hostname because this might show up in logs (they are not used).
466
-		$url = 'sftp://' . urlencode($this->user) . '@' . $this->host . ':' . $this->port . $this->root . $path;
466
+		$url = 'sftp://'.urlencode($this->user).'@'.$this->host.':'.$this->port.$this->root.$path;
467 467
 		return $url;
468 468
 	}
469 469
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Storage/FTP.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -36,28 +36,28 @@  discard block
 block discarded – undo
36 36
 use Icewind\Streams\CallbackWrapper;
37 37
 use Icewind\Streams\RetryWrapper;
38 38
 
39
-class FTP extends StreamWrapper{
39
+class FTP extends StreamWrapper {
40 40
 	private $password;
41 41
 	private $user;
42 42
 	private $host;
43 43
 	private $secure;
44 44
 	private $root;
45 45
 
46
-	private static $tempFiles=array();
46
+	private static $tempFiles = array();
47 47
 
48 48
 	public function __construct($params) {
49 49
 		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
50
-			$this->host=$params['host'];
51
-			$this->user=$params['user'];
52
-			$this->password=$params['password'];
50
+			$this->host = $params['host'];
51
+			$this->user = $params['user'];
52
+			$this->password = $params['password'];
53 53
 			if (isset($params['secure'])) {
54 54
 				$this->secure = $params['secure'];
55 55
 			} else {
56 56
 				$this->secure = false;
57 57
 			}
58
-			$this->root=isset($params['root'])?$params['root']:'/';
59
-			if ( ! $this->root || $this->root[0]!='/') {
60
-				$this->root='/'.$this->root;
58
+			$this->root = isset($params['root']) ? $params['root'] : '/';
59
+			if (!$this->root || $this->root[0] != '/') {
60
+				$this->root = '/'.$this->root;
61 61
 			}
62 62
 			if (substr($this->root, -1) !== '/') {
63 63
 				$this->root .= '/';
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 		
69 69
 	}
70 70
 
71
-	public function getId(){
72
-		return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
71
+	public function getId() {
72
+		return 'ftp::'.$this->user.'@'.$this->host.'/'.$this->root;
73 73
 	}
74 74
 
75 75
 	/**
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
 	 * @return string
79 79
 	 */
80 80
 	public function constructUrl($path) {
81
-		$url='ftp';
81
+		$url = 'ftp';
82 82
 		if ($this->secure) {
83
-			$url.='s';
83
+			$url .= 's';
84 84
 		}
85
-		$url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
85
+		$url .= '://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
86 86
 		return $url;
87 87
 	}
88 88
 
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 			return $result;
102 102
 		}
103 103
 	}
104
-	public function fopen($path,$mode) {
105
-		switch($mode) {
104
+	public function fopen($path, $mode) {
105
+		switch ($mode) {
106 106
 			case 'r':
107 107
 			case 'rb':
108 108
 			case 'w':
@@ -122,17 +122,17 @@  discard block
 block discarded – undo
122 122
 			case 'c':
123 123
 			case 'c+':
124 124
 				//emulate these
125
-				if (strrpos($path, '.')!==false) {
126
-					$ext=substr($path, strrpos($path, '.'));
125
+				if (strrpos($path, '.') !== false) {
126
+					$ext = substr($path, strrpos($path, '.'));
127 127
 				} else {
128
-					$ext='';
128
+					$ext = '';
129 129
 				}
130
-				$tmpFile=\OCP\Files::tmpFile($ext);
130
+				$tmpFile = \OCP\Files::tmpFile($ext);
131 131
 				if ($this->file_exists($path)) {
132 132
 					$this->getFile($path, $tmpFile);
133 133
 				}
134 134
 				$handle = fopen($tmpFile, $mode);
135
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
135
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
136 136
 					$this->writeBack($tmpFile, $path);
137 137
 				});
138 138
 		}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Storage/StreamWrapper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -47,10 +47,10 @@
 block discarded – undo
47 47
 				return false;
48 48
 			}
49 49
 			while (($file = readdir($dh)) !== false) {
50
-				if ($this->is_dir($path . '/' . $file)) {
51
-					$this->rmdir($path . '/' . $file);
50
+				if ($this->is_dir($path.'/'.$file)) {
51
+					$this->rmdir($path.'/'.$file);
52 52
 				} else {
53
-					$this->unlink($path . '/' . $file);
53
+					$this->unlink($path.'/'.$file);
54 54
 				}
55 55
 			}
56 56
 			$url = $this->constructUrl($path);
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Storage/Swift.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 			throw new \Exception("API Key or password, Username, Bucket and Region have to be configured.");
164 164
 		}
165 165
 
166
-		$this->id = 'swift::' . $params['user'] . md5($params['bucket']);
166
+		$this->id = 'swift::'.$params['user'].md5($params['bucket']);
167 167
 
168 168
 		$bucketUrl = Url::factory($params['bucket']);
169 169
 		if ($bucketUrl->isAbsolute()) {
@@ -236,16 +236,16 @@  discard block
 block discarded – undo
236 236
 				continue;
237 237
 			}
238 238
 
239
-			if ($this->is_dir($path . '/' . $file)) {
240
-				$this->rmdir($path . '/' . $file);
239
+			if ($this->is_dir($path.'/'.$file)) {
240
+				$this->rmdir($path.'/'.$file);
241 241
 			} else {
242
-				$this->unlink($path . '/' . $file);
242
+				$this->unlink($path.'/'.$file);
243 243
 			}
244 244
 		}
245 245
 
246 246
 		try {
247
-			$this->getContainer()->dataObject()->setName($path . '/')->delete();
248
-			$this->objectCache->remove($path . '/');
247
+			$this->getContainer()->dataObject()->setName($path.'/')->delete();
248
+			$this->objectCache->remove($path.'/');
249 249
 		} catch (Exceptions\DeleteError $e) {
250 250
 			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
251 251
 			return false;
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 		}
327 327
 
328 328
 		$stat = array();
329
-		$stat['size'] = (int)$object->getContentLength();
329
+		$stat['size'] = (int) $object->getContentLength();
330 330
 		$stat['mtime'] = $mtime;
331 331
 		$stat['atime'] = time();
332 332
 		return $stat;
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
 		try {
359 359
 			$this->getContainer()->dataObject()->setName($path)->delete();
360 360
 			$this->objectCache->remove($path);
361
-			$this->objectCache->remove($path . '/');
361
+			$this->objectCache->remove($path.'/');
362 362
 		} catch (ClientErrorResponseException $e) {
363 363
 			if ($e->getResponse()->getStatusCode() !== 404) {
364 364
 				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -383,8 +383,8 @@  discard block
 block discarded – undo
383 383
 							->get($c->getUrl($path)));
384 384
 					$streamInterface->rewind();
385 385
 					$stream = $streamInterface->getStream();
386
-					stream_context_set_option($stream, 'swift','content', $streamInterface);
387
-					if(!strrpos($streamInterface
386
+					stream_context_set_option($stream, 'swift', 'content', $streamInterface);
387
+					if (!strrpos($streamInterface
388 388
 						->getMetaData('wrapper_data')[0], '404 Not Found')) {
389 389
 						return $stream;
390 390
 					}
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
 					}
426 426
 				}
427 427
 				$handle = fopen($tmpFile, $mode);
428
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
428
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
429 429
 					$this->writeBack($tmpFile, $path);
430 430
 				});
431 431
 		}
@@ -472,10 +472,10 @@  discard block
 block discarded – undo
472 472
 
473 473
 			try {
474 474
 				$source = $this->fetchObject($path1);
475
-				$source->copy($this->bucket . '/' . $path2);
475
+				$source->copy($this->bucket.'/'.$path2);
476 476
 				// invalidate target object to force repopulation on fetch
477 477
 				$this->objectCache->remove($path2);
478
-				$this->objectCache->remove($path2 . '/');
478
+				$this->objectCache->remove($path2.'/');
479 479
 			} catch (ClientErrorResponseException $e) {
480 480
 				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
481 481
 				return false;
@@ -487,11 +487,11 @@  discard block
 block discarded – undo
487 487
 			$this->unlink($path2);
488 488
 
489 489
 			try {
490
-				$source = $this->fetchObject($path1 . '/');
491
-				$source->copy($this->bucket . '/' . $path2 . '/');
490
+				$source = $this->fetchObject($path1.'/');
491
+				$source->copy($this->bucket.'/'.$path2.'/');
492 492
 				// invalidate target object to force repopulation on fetch
493 493
 				$this->objectCache->remove($path2);
494
-				$this->objectCache->remove($path2 . '/');
494
+				$this->objectCache->remove($path2.'/');
495 495
 			} catch (ClientErrorResponseException $e) {
496 496
 				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
497 497
 				return false;
@@ -503,8 +503,8 @@  discard block
 block discarded – undo
503 503
 					continue;
504 504
 				}
505 505
 
506
-				$source = $path1 . '/' . $file;
507
-				$target = $path2 . '/' . $file;
506
+				$source = $path1.'/'.$file;
507
+				$target = $path2.'/'.$file;
508 508
 				$this->copy($source, $target);
509 509
 			}
510 510
 
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
 			$path = '';
639 639
 		}
640 640
 		$cachedContent = $this->getCache()->getFolderContents($path);
641
-		$cachedNames = array_map(function ($content) {
641
+		$cachedNames = array_map(function($content) {
642 642
 			return $content['name'];
643 643
 		}, $cachedContent);
644 644
 		sort($cachedNames);
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Storage/OwnCloud.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
  * http://%host/%context/remote.php/webdav/%root
32 32
  *
33 33
  */
34
-class OwnCloud extends \OC\Files\Storage\DAV{
34
+class OwnCloud extends \OC\Files\Storage\DAV {
35 35
 	const OC_URL_SUFFIX = 'remote.php/webdav';
36 36
 
37 37
 	public function __construct($params) {
@@ -48,27 +48,27 @@  discard block
 block discarded – undo
48 48
 		}
49 49
 		$contextPath = '';
50 50
 		$hostSlashPos = strpos($host, '/');
51
-		if ($hostSlashPos !== false){
51
+		if ($hostSlashPos !== false) {
52 52
 			$contextPath = substr($host, $hostSlashPos);
53 53
 			$host = substr($host, 0, $hostSlashPos);
54 54
 		}
55 55
 
56
-		if (substr($contextPath, -1) !== '/'){
56
+		if (substr($contextPath, -1) !== '/') {
57 57
 			$contextPath .= '/';
58 58
 		}
59 59
 
60
-		if (isset($params['root'])){
60
+		if (isset($params['root'])) {
61 61
 			$root = $params['root'];
62
-			if (substr($root, 0, 1) !== '/'){
63
-				$root = '/' . $root;
62
+			if (substr($root, 0, 1) !== '/') {
63
+				$root = '/'.$root;
64 64
 			}
65 65
 		}
66
-		else{
66
+		else {
67 67
 			$root = '/';
68 68
 		}
69 69
 
70 70
 		$params['host'] = $host;
71
-		$params['root'] = $contextPath . self::OC_URL_SUFFIX . $root;
71
+		$params['root'] = $contextPath.self::OC_URL_SUFFIX.$root;
72 72
 
73 73
 		parent::__construct($params);
74 74
 	}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Storage/AmazonS3.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
 
37 37
 namespace OCA\Files_External\Lib\Storage;
38 38
 
39
-set_include_path(get_include_path() . PATH_SEPARATOR .
40
-	\OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
39
+set_include_path(get_include_path().PATH_SEPARATOR.
40
+	\OC_App::getAppPath('files_external').'/3rdparty/aws-sdk-php');
41 41
 require_once 'aws-autoloader.php';
42 42
 
43 43
 use Aws\S3\S3Client;
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
95 95
 	 *
96 96
 	 * @param array $params
97 97
 	 */
98
-	public function updateLegacyId (array $params) {
99
-		$oldId = 'amazon::' . $params['key'] . md5($params['secret']);
98
+	public function updateLegacyId(array $params) {
99
+		$oldId = 'amazon::'.$params['key'].md5($params['secret']);
100 100
 
101 101
 		// find by old id or bucket
102 102
 		$stmt = \OC::$server->getDatabaseConnection()->prepare(
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 		try {
149 149
 			$this->getConnection()->putObject(array(
150 150
 				'Bucket' => $this->bucket,
151
-				'Key' => $path . '/',
151
+				'Key' => $path.'/',
152 152
 				'Body' => '',
153 153
 				'ContentType' => 'httpd/unix-directory'
154 154
 			));
@@ -191,12 +191,12 @@  discard block
 block discarded – undo
191 191
 		return false;
192 192
 	}
193 193
 
194
-	private function batchDelete ($path = null) {
194
+	private function batchDelete($path = null) {
195 195
 		$params = array(
196 196
 			'Bucket' => $this->bucket
197 197
 		);
198 198
 		if ($path !== null) {
199
-			$params['Prefix'] = $path . '/';
199
+			$params['Prefix'] = $path.'/';
200 200
 		}
201 201
 		try {
202 202
 			// Since there are no real directories on S3, we need
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 			$stat['atime'] = time();
280 280
 
281 281
 			return $stat;
282
-		} catch(S3Exception $e) {
282
+		} catch (S3Exception $e) {
283 283
 			\OCP\Util::logException('files_external', $e);
284 284
 			return false;
285 285
 		}
@@ -394,14 +394,14 @@  discard block
 block discarded – undo
394 394
 		$fileType = $this->filetype($path);
395 395
 		try {
396 396
 			if ($fileType !== false) {
397
-				if ($fileType === 'dir' && ! $this->isRoot($path)) {
397
+				if ($fileType === 'dir' && !$this->isRoot($path)) {
398 398
 					$path .= '/';
399 399
 				}
400 400
 				$this->getConnection()->copyObject([
401 401
 					'Bucket' => $this->bucket,
402 402
 					'Key' => $this->cleanKey($path),
403 403
 					'Metadata' => $metadata,
404
-					'CopySource' => $this->bucket . '/' . $path,
404
+					'CopySource' => $this->bucket.'/'.$path,
405 405
 					'MetadataDirective' => 'REPLACE',
406 406
 				]);
407 407
 				$this->testTimeout();
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
 				$this->getConnection()->copyObject(array(
435 435
 					'Bucket' => $this->bucket,
436 436
 					'Key' => $this->cleanKey($path2),
437
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
437
+					'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1)
438 438
 				));
439 439
 				$this->testTimeout();
440 440
 			} catch (S3Exception $e) {
@@ -447,8 +447,8 @@  discard block
 block discarded – undo
447 447
 			try {
448 448
 				$this->getConnection()->copyObject(array(
449 449
 					'Bucket' => $this->bucket,
450
-					'Key' => $path2 . '/',
451
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
450
+					'Key' => $path2.'/',
451
+					'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1.'/')
452 452
 				));
453 453
 				$this->testTimeout();
454 454
 			} catch (S3Exception $e) {
@@ -463,8 +463,8 @@  discard block
 block discarded – undo
463 463
 						continue;
464 464
 					}
465 465
 
466
-					$source = $path1 . '/' . $file;
467
-					$target = $path2 . '/' . $file;
466
+					$source = $path1.'/'.$file;
467
+					$target = $path2.'/'.$file;
468 468
 					$this->copy($source, $target);
469 469
 				}
470 470
 			}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Storage/SMB.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 
85 85
 			$this->root = isset($params['root']) ? $params['root'] : '/';
86 86
 			if (!$this->root || $this->root[0] != '/') {
87
-				$this->root = '/' . $this->root;
87
+				$this->root = '/'.$this->root;
88 88
 			}
89 89
 			if (substr($this->root, -1, 1) != '/') {
90 90
 				$this->root .= '/';
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		// FIXME: double slash to keep compatible with the old storage ids,
103 103
 		// failure to do so will lead to creation of a new storage id and
104 104
 		// loss of shares from the storage
105
-		return 'smb::' . $this->server->getUser() . '@' . $this->server->getHost() . '//' . $this->share->getName() . '/' . $this->root;
105
+		return 'smb::'.$this->server->getUser().'@'.$this->server->getHost().'//'.$this->share->getName().'/'.$this->root;
106 106
 	}
107 107
 
108 108
 	/**
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 	 * @return string
111 111
 	 */
112 112
 	protected function buildPath($path) {
113
-		return Filesystem::normalizePath($this->root . '/' . $path, true, false, true);
113
+		return Filesystem::normalizePath($this->root.'/'.$path, true, false, true);
114 114
 	}
115 115
 
116 116
 	protected function relativePath($fullPath) {
@@ -150,9 +150,9 @@  discard block
 block discarded – undo
150 150
 			$path = $this->buildPath($path);
151 151
 			$files = $this->share->dir($path);
152 152
 			foreach ($files as $file) {
153
-				$this->statCache[$path . '/' . $file->getName()] = $file;
153
+				$this->statCache[$path.'/'.$file->getName()] = $file;
154 154
 			}
155
-			return array_filter($files, function (IFileInfo $file) {
155
+			return array_filter($files, function(IFileInfo $file) {
156 156
 				return !$file->isHidden();
157 157
 			});
158 158
 		} catch (ConnectException $e) {
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 				case 'w':
298 298
 				case 'wb':
299 299
 					$source = $this->share->write($fullPath);
300
-					return CallBackWrapper::wrap($source, null, null, function () use ($fullPath) {
300
+					return CallBackWrapper::wrap($source, null, null, function() use ($fullPath) {
301 301
 						unset($this->statCache[$fullPath]);
302 302
 					});
303 303
 				case 'a':
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 					}
330 330
 					$source = fopen($tmpFile, $mode);
331 331
 					$share = $this->share;
332
-					return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath, $share) {
332
+					return CallbackWrapper::wrap($source, null, null, function() use ($tmpFile, $fullPath, $share) {
333 333
 						unset($this->statCache[$fullPath]);
334 334
 						$share->put($tmpFile, $fullPath);
335 335
 						unlink($tmpFile);
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
 			$content = $this->share->dir($this->buildPath($path));
352 352
 			foreach ($content as $file) {
353 353
 				if ($file->isDirectory()) {
354
-					$this->rmdir($path . '/' . $file->getName());
354
+					$this->rmdir($path.'/'.$file->getName());
355 355
 				} else {
356 356
 					$this->share->del($file->getPath());
357 357
 				}
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
 		} catch (ForbiddenException $e) {
389 389
 			return false;
390 390
 		}
391
-		$names = array_map(function ($info) {
391
+		$names = array_map(function($info) {
392 392
 			/** @var \Icewind\SMB\IFileInfo $info */
393 393
 			return $info->getName();
394 394
 		}, $files);
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
 	 */
471 471
 	public static function checkDependencies() {
472 472
 		return (
473
-			(bool)\OC_Helper::findBinaryPath('smbclient')
473
+			(bool) \OC_Helper::findBinaryPath('smbclient')
474 474
 			|| Server::NativeAvailable()
475 475
 		) ? true : ['smbclient'];
476 476
 	}
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 	}
490 490
 
491 491
 	public function listen($path, callable $callback) {
492
-		$this->notify($path)->listen(function (IChange $change) use ($callback) {
492
+		$this->notify($path)->listen(function(IChange $change) use ($callback) {
493 493
 			if ($change instanceof IRenameChange) {
494 494
 				return $callback($change->getType(), $change->getPath(), $change->getTargetPath());
495 495
 			} else {
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
 	}
500 500
 
501 501
 	public function notify($path) {
502
-		$path = '/' . ltrim($path, '/');
502
+		$path = '/'.ltrim($path, '/');
503 503
 		$shareNotifyHandler = $this->share->notify($this->buildPath($path));
504 504
 		return new SMBNotifyHandler($shareNotifyHandler, $this->root);
505 505
 	}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Storage/Dropbox.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 use Icewind\Streams\RetryWrapper;
37 37
 use OCP\Files\StorageNotAvailableException;
38 38
 
39
-require_once __DIR__ . '/../../../3rdparty/Dropbox/autoload.php';
39
+require_once __DIR__.'/../../../3rdparty/Dropbox/autoload.php';
40 40
 
41 41
 class Dropbox extends \OC\Files\Storage\Common {
42 42
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 			&& isset($params['token_secret'])
55 55
 		) {
56 56
 			$this->root = isset($params['root']) ? $params['root'] : '';
57
-			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
57
+			$this->id = 'dropbox::'.$params['app_key'].$params['token'].'/'.$this->root;
58 58
 			$this->oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
59 59
 			$this->oauth->setToken($params['token'], $params['token_secret']);
60 60
 			// note: Dropbox_API connection is lazy
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 */
90 90
 	private function getDropBoxMetaData($path, $list = false) {
91 91
 		$path = ltrim($this->root.$path, '/');
92
-		if ( ! $list && isset($this->metaData[$path])) {
92
+		if (!$list && isset($this->metaData[$path])) {
93 93
 			return $this->metaData[$path];
94 94
 		} else {
95 95
 			if ($list) {
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 		}
145 145
 	}
146 146
 
147
-	public function getId(){
147
+	public function getId() {
148 148
 		return $this->id;
149 149
 	}
150 150
 
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 				try {
260 260
 					// slashes need to stay
261 261
 					$encodedPath = str_replace('%2F', '/', rawurlencode(trim($path, '/')));
262
-					$downloadUrl = 'https://api-content.dropbox.com/1/files/auto/' . $encodedPath;
262
+					$downloadUrl = 'https://api-content.dropbox.com/1/files/auto/'.$encodedPath;
263 263
 					$headers = $this->oauth->getOAuthHeader($downloadUrl, [], 'GET');
264 264
 
265 265
 					$client = \OC::$server->getHTTPClientService()->newClient();
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 					file_put_contents($tmpFile, $source);
310 310
 				}
311 311
 			$handle = fopen($tmpFile, $mode);
312
-			return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
312
+			return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
313 313
 				$this->writeBack($tmpFile, $path);
314 314
 			});
315 315
 		}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/StorageModifierTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
 	 * @throws InsufficientDataForMeaningfulAnswerException
52 52
 	 * @throws StorageNotAvailableException
53 53
 	 */
54
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
54
+	public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) {
55 55
 	}
56 56
 
57 57
 	/**
Please login to merge, or discard this patch.