@@ -26,7 +26,7 @@ |
||
| 26 | 26 | use OCP\Files\NotPermittedException; |
| 27 | 27 | use OCP\Files\SimpleFS\ISimpleFile; |
| 28 | 28 | |
| 29 | -class SimpleFile implements ISimpleFile { |
|
| 29 | +class SimpleFile implements ISimpleFile { |
|
| 30 | 30 | |
| 31 | 31 | /** @var File $file */ |
| 32 | 32 | private $file; |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | use OCP\Files\NotFoundException; |
| 29 | 29 | use OCP\Files\SimpleFS\ISimpleFolder; |
| 30 | 30 | |
| 31 | -class SimpleFolder implements ISimpleFolder { |
|
| 31 | +class SimpleFolder implements ISimpleFolder { |
|
| 32 | 32 | |
| 33 | 33 | /** @var Folder */ |
| 34 | 34 | private $folder; |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | // no point in continuing if the section was not found, use original path |
| 81 | 81 | return $fullPath; |
| 82 | 82 | } |
| 83 | - $path = $convertedPath . '/'; |
|
| 83 | + $path = $convertedPath.'/'; |
|
| 84 | 84 | } |
| 85 | 85 | $path = rtrim($path, '/'); |
| 86 | 86 | return $path; |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | * @return string|null original or converted path, or null if none of the forms was found |
| 97 | 97 | */ |
| 98 | 98 | private function findPathToUseLastSection($basePath, $lastSection) { |
| 99 | - $fullPath = $basePath . $lastSection; |
|
| 99 | + $fullPath = $basePath.$lastSection; |
|
| 100 | 100 | if ($lastSection === '' || $this->isAscii($lastSection) || $this->storage->file_exists($fullPath)) { |
| 101 | 101 | $this->namesCache[$fullPath] = $fullPath; |
| 102 | 102 | return $fullPath; |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | } else { |
| 109 | 109 | $otherFormPath = \Normalizer::normalize($lastSection, \Normalizer::FORM_C); |
| 110 | 110 | } |
| 111 | - $otherFullPath = $basePath . $otherFormPath; |
|
| 111 | + $otherFullPath = $basePath.$otherFormPath; |
|
| 112 | 112 | if ($this->storage->file_exists($otherFullPath)) { |
| 113 | 113 | $this->namesCache[$fullPath] = $otherFullPath; |
| 114 | 114 | return $otherFullPath; |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | if ($path === '') { |
| 54 | 54 | return $this->rootPath; |
| 55 | 55 | } else { |
| 56 | - return $this->rootPath . '/' . $path; |
|
| 56 | + return $this->rootPath.'/'.$path; |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | public function __construct($arguments) { |
| 50 | 50 | $this->user = $arguments['user']; |
| 51 | 51 | $datadir = $this->user->getHome(); |
| 52 | - $this->id = 'home::' . $this->user->getUID(); |
|
| 52 | + $this->id = 'home::'.$this->user->getUID(); |
|
| 53 | 53 | |
| 54 | 54 | parent::__construct(array('datadir' => $datadir)); |
| 55 | 55 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | /** |
| 29 | 29 | * local storage backend in temporary folder for testing purpose |
| 30 | 30 | */ |
| 31 | -class Temporary extends Local{ |
|
| 31 | +class Temporary extends Local { |
|
| 32 | 32 | public function __construct($arguments = null) { |
| 33 | 33 | parent::__construct(array('datadir' => \OC::$server->getTempManager()->getTemporaryFolder())); |
| 34 | 34 | } |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | if ($this->datadir === '/') { |
| 59 | 59 | $this->realDataDir = $this->datadir; |
| 60 | 60 | } else { |
| 61 | - $this->realDataDir = rtrim(realpath($this->datadir), '/') . '/'; |
|
| 61 | + $this->realDataDir = rtrim(realpath($this->datadir), '/').'/'; |
|
| 62 | 62 | } |
| 63 | 63 | if (substr($this->datadir, -1) !== '/') { |
| 64 | 64 | $this->datadir .= '/'; |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | public function getId() { |
| 73 | - return 'local::' . $this->datadir; |
|
| 73 | + return 'local::'.$this->datadir; |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | public function mkdir($path) { |
@@ -228,17 +228,17 @@ discard block |
||
| 228 | 228 | $dstParent = dirname($path2); |
| 229 | 229 | |
| 230 | 230 | if (!$this->isUpdatable($srcParent)) { |
| 231 | - \OCP\Util::writeLog('core', 'unable to rename, source directory is not writable : ' . $srcParent, \OCP\Util::ERROR); |
|
| 231 | + \OCP\Util::writeLog('core', 'unable to rename, source directory is not writable : '.$srcParent, \OCP\Util::ERROR); |
|
| 232 | 232 | return false; |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | if (!$this->isUpdatable($dstParent)) { |
| 236 | - \OCP\Util::writeLog('core', 'unable to rename, destination directory is not writable : ' . $dstParent, \OCP\Util::ERROR); |
|
| 236 | + \OCP\Util::writeLog('core', 'unable to rename, destination directory is not writable : '.$dstParent, \OCP\Util::ERROR); |
|
| 237 | 237 | return false; |
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | if (!$this->file_exists($path1)) { |
| 241 | - \OCP\Util::writeLog('core', 'unable to rename, file does not exists : ' . $path1, \OCP\Util::ERROR); |
|
| 241 | + \OCP\Util::writeLog('core', 'unable to rename, file does not exists : '.$path1, \OCP\Util::ERROR); |
|
| 242 | 242 | return false; |
| 243 | 243 | } |
| 244 | 244 | |
@@ -319,13 +319,13 @@ discard block |
||
| 319 | 319 | foreach (scandir($physicalDir) as $item) { |
| 320 | 320 | if (\OC\Files\Filesystem::isIgnoredDir($item)) |
| 321 | 321 | continue; |
| 322 | - $physicalItem = $physicalDir . '/' . $item; |
|
| 322 | + $physicalItem = $physicalDir.'/'.$item; |
|
| 323 | 323 | |
| 324 | 324 | if (strstr(strtolower($item), strtolower($query)) !== false) { |
| 325 | - $files[] = $dir . '/' . $item; |
|
| 325 | + $files[] = $dir.'/'.$item; |
|
| 326 | 326 | } |
| 327 | 327 | if (is_dir($physicalItem)) { |
| 328 | - $files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item)); |
|
| 328 | + $files = array_merge($files, $this->searchInDir($query, $dir.'/'.$item)); |
|
| 329 | 329 | } |
| 330 | 330 | } |
| 331 | 331 | return $files; |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | * @throws ForbiddenException |
| 355 | 355 | */ |
| 356 | 356 | public function getSourcePath($path) { |
| 357 | - $fullPath = $this->datadir . $path; |
|
| 357 | + $fullPath = $this->datadir.$path; |
|
| 358 | 358 | if ($this->allowSymlinks || $path === '') { |
| 359 | 359 | return $fullPath; |
| 360 | 360 | } |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | $realPath = realpath($pathToResolve); |
| 366 | 366 | } |
| 367 | 367 | if ($realPath) { |
| 368 | - $realPath = $realPath . '/'; |
|
| 368 | + $realPath = $realPath.'/'; |
|
| 369 | 369 | } |
| 370 | 370 | if (substr($realPath, 0, $this->dataDirLength) === $this->realDataDir) { |
| 371 | 371 | return $fullPath; |
@@ -391,9 +391,9 @@ discard block |
||
| 391 | 391 | if ($this->is_file($path)) { |
| 392 | 392 | $stat = $this->stat($path); |
| 393 | 393 | return md5( |
| 394 | - $stat['mtime'] . |
|
| 395 | - $stat['ino'] . |
|
| 396 | - $stat['dev'] . |
|
| 394 | + $stat['mtime']. |
|
| 395 | + $stat['ino']. |
|
| 396 | + $stat['dev']. |
|
| 397 | 397 | $stat['size'] |
| 398 | 398 | ); |
| 399 | 399 | } else { |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | $this->mkdir($path2); |
| 217 | 217 | while ($file = readdir($dir)) { |
| 218 | 218 | if (!Filesystem::isIgnoredDir($file)) { |
| 219 | - if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file)) { |
|
| 219 | + if (!$this->copy($path1.'/'.$file, $path2.'/'.$file)) { |
|
| 220 | 220 | return false; |
| 221 | 221 | } |
| 222 | 222 | } |
@@ -267,12 +267,12 @@ discard block |
||
| 267 | 267 | if (is_resource($dh)) { |
| 268 | 268 | while (($file = readdir($dh)) !== false) { |
| 269 | 269 | if (!\OC\Files\Filesystem::isIgnoredDir($file)) { |
| 270 | - if ($this->is_dir($path . '/' . $file)) { |
|
| 271 | - mkdir($target . '/' . $file); |
|
| 272 | - $this->addLocalFolder($path . '/' . $file, $target . '/' . $file); |
|
| 270 | + if ($this->is_dir($path.'/'.$file)) { |
|
| 271 | + mkdir($target.'/'.$file); |
|
| 272 | + $this->addLocalFolder($path.'/'.$file, $target.'/'.$file); |
|
| 273 | 273 | } else { |
| 274 | - $tmp = $this->toTmpFile($path . '/' . $file); |
|
| 275 | - rename($tmp, $target . '/' . $file); |
|
| 274 | + $tmp = $this->toTmpFile($path.'/'.$file); |
|
| 275 | + rename($tmp, $target.'/'.$file); |
|
| 276 | 276 | } |
| 277 | 277 | } |
| 278 | 278 | } |
@@ -291,10 +291,10 @@ discard block |
||
| 291 | 291 | while (($item = readdir($dh)) !== false) { |
| 292 | 292 | if (\OC\Files\Filesystem::isIgnoredDir($item)) continue; |
| 293 | 293 | if (strstr(strtolower($item), strtolower($query)) !== false) { |
| 294 | - $files[] = $dir . '/' . $item; |
|
| 294 | + $files[] = $dir.'/'.$item; |
|
| 295 | 295 | } |
| 296 | - if ($this->is_dir($dir . '/' . $item)) { |
|
| 297 | - $files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item)); |
|
| 296 | + if ($this->is_dir($dir.'/'.$item)) { |
|
| 297 | + $files = array_merge($files, $this->searchInDir($query, $dir.'/'.$item)); |
|
| 298 | 298 | } |
| 299 | 299 | } |
| 300 | 300 | } |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | if (!isset($this->watcher)) { |
| 346 | 346 | $this->watcher = new Watcher($storage); |
| 347 | 347 | $globalPolicy = \OC::$server->getConfig()->getSystemValue('filesystem_check_changes', Watcher::CHECK_NEVER); |
| 348 | - $this->watcher->setPolicy((int)$this->getMountOption('filesystem_check_changes', $globalPolicy)); |
|
| 348 | + $this->watcher->setPolicy((int) $this->getMountOption('filesystem_check_changes', $globalPolicy)); |
|
| 349 | 349 | } |
| 350 | 350 | return $this->watcher; |
| 351 | 351 | } |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | */ |
| 420 | 420 | public function cleanPath($path) { |
| 421 | 421 | if (strlen($path) == 0 or $path[0] != '/') { |
| 422 | - $path = '/' . $path; |
|
| 422 | + $path = '/'.$path; |
|
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | $output = array(); |
@@ -595,7 +595,7 @@ discard block |
||
| 595 | 595 | if (is_resource($dh)) { |
| 596 | 596 | while ($result and ($file = readdir($dh)) !== false) { |
| 597 | 597 | if (!Filesystem::isIgnoredDir($file)) { |
| 598 | - $result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath . '/' . $file, $targetInternalPath . '/' . $file); |
|
| 598 | + $result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath.'/'.$file, $targetInternalPath.'/'.$file); |
|
| 599 | 599 | } |
| 600 | 600 | } |
| 601 | 601 | } |
@@ -621,7 +621,7 @@ discard block |
||
| 621 | 621 | $this->getCache()->remove($targetInternalPath); |
| 622 | 622 | } |
| 623 | 623 | } |
| 624 | - return (bool)$result; |
|
| 624 | + return (bool) $result; |
|
| 625 | 625 | } |
| 626 | 626 | |
| 627 | 627 | /** |
@@ -701,7 +701,7 @@ discard block |
||
| 701 | 701 | ); |
| 702 | 702 | } |
| 703 | 703 | try { |
| 704 | - $provider->acquireLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type); |
|
| 704 | + $provider->acquireLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type); |
|
| 705 | 705 | } catch (LockedException $e) { |
| 706 | 706 | if ($logger) { |
| 707 | 707 | $logger->logException($e); |
@@ -733,7 +733,7 @@ discard block |
||
| 733 | 733 | ); |
| 734 | 734 | } |
| 735 | 735 | try { |
| 736 | - $provider->releaseLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type); |
|
| 736 | + $provider->releaseLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type); |
|
| 737 | 737 | } catch (LockedException $e) { |
| 738 | 738 | if ($logger) { |
| 739 | 739 | $logger->logException($e); |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | ); |
| 766 | 766 | } |
| 767 | 767 | try { |
| 768 | - $provider->changeLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type); |
|
| 768 | + $provider->changeLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type); |
|
| 769 | 769 | } catch (LockedException $e) { |
| 770 | 770 | if ($logger) { |
| 771 | 771 | $logger->logException($e); |
@@ -90,11 +90,11 @@ |
||
| 90 | 90 | */ |
| 91 | 91 | public function wrap(IMountPoint $mountPoint, $storage) { |
| 92 | 92 | $wrappers = array_values($this->storageWrappers); |
| 93 | - usort($wrappers, function ($a, $b) { |
|
| 93 | + usort($wrappers, function($a, $b) { |
|
| 94 | 94 | return $b['priority'] - $a['priority']; |
| 95 | 95 | }); |
| 96 | 96 | /** @var callable[] $wrappers */ |
| 97 | - $wrappers = array_map(function ($wrapper) { |
|
| 97 | + $wrappers = array_map(function($wrapper) { |
|
| 98 | 98 | return $wrapper['wrapper']; |
| 99 | 99 | }, $wrappers); |
| 100 | 100 | foreach ($wrappers as $wrapper) { |