@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $result = $this->zip->addFromString($path, $source); |
| 73 | 73 | } |
| 74 | 74 | if ($result) { |
| 75 | - $this->zip->close();//close and reopen to save the zip |
|
| 75 | + $this->zip->close(); //close and reopen to save the zip |
|
| 76 | 76 | $this->zip->open($this->path); |
| 77 | 77 | } |
| 78 | 78 | return $result; |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | public function getFiles() { |
| 131 | 131 | $fileCount = $this->zip->numFiles; |
| 132 | 132 | $files = []; |
| 133 | - for ($i = 0;$i < $fileCount;$i++) { |
|
| 133 | + for ($i = 0; $i < $fileCount; $i++) { |
|
| 134 | 134 | $files[] = $this->zip->getNameIndex($i); |
| 135 | 135 | } |
| 136 | 136 | return $files; |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | $this->extractFile($path, $tmpFile); |
| 205 | 205 | } |
| 206 | 206 | $handle = fopen($tmpFile, $mode); |
| 207 | - return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
| 207 | + return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) { |
|
| 208 | 208 | $this->writeBack($tmpFile, $path); |
| 209 | 209 | }); |
| 210 | 210 | } |
@@ -35,17 +35,17 @@ |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $excludedFolders = [ |
| 38 | - rtrim($root . '/data', '/'), |
|
| 39 | - rtrim($root . '/themes', '/'), |
|
| 40 | - rtrim($root . '/config', '/'), |
|
| 41 | - rtrim($root . '/apps', '/'), |
|
| 42 | - rtrim($root . '/assets', '/'), |
|
| 43 | - rtrim($root . '/lost+found', '/'), |
|
| 38 | + rtrim($root.'/data', '/'), |
|
| 39 | + rtrim($root.'/themes', '/'), |
|
| 40 | + rtrim($root.'/config', '/'), |
|
| 41 | + rtrim($root.'/apps', '/'), |
|
| 42 | + rtrim($root.'/assets', '/'), |
|
| 43 | + rtrim($root.'/lost+found', '/'), |
|
| 44 | 44 | // Ignore folders generated by updater since the updater is replaced |
| 45 | 45 | // after the integrity check is run. |
| 46 | 46 | // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846 |
| 47 | - rtrim($root . '/updater', '/'), |
|
| 48 | - rtrim($root . '/_oc_upgrade', '/'), |
|
| 47 | + rtrim($root.'/updater', '/'), |
|
| 48 | + rtrim($root.'/_oc_upgrade', '/'), |
|
| 49 | 49 | ]; |
| 50 | 50 | $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', ''); |
| 51 | 51 | if ($customDataDir !== '') { |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | * @return bool |
| 33 | 33 | */ |
| 34 | 34 | private function isValidVersionString($versionString) { |
| 35 | - return (bool)preg_match('/^[0-9.]+$/', $versionString); |
|
| 35 | + return (bool) preg_match('/^[0-9.]+$/', $versionString); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | /** @var IShare[] $deletedShares */ |
| 67 | 67 | $deletedShares = $e->getArgument('deletedShares'); |
| 68 | 68 | |
| 69 | - $formattedDeletedShares = array_map(function ($share) { |
|
| 69 | + $formattedDeletedShares = array_map(function($share) { |
|
| 70 | 70 | return $this->formatHookParams($share); |
| 71 | 71 | }, $deletedShares); |
| 72 | 72 | |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public function setId($id) { |
| 88 | 88 | if (is_int($id)) { |
| 89 | - $id = (string)$id; |
|
| 89 | + $id = (string) $id; |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | if (!is_string($id)) { |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | if ($this->providerId === null || $this->id === null) { |
| 116 | 116 | throw new \UnexpectedValueException; |
| 117 | 117 | } |
| 118 | - return $this->providerId . ':' . $this->id; |
|
| 118 | + return $this->providerId.':'.$this->id; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | |
| 164 | 164 | $nodes = $userFolder->getById($this->fileId); |
| 165 | 165 | if (empty($nodes)) { |
| 166 | - throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId); |
|
| 166 | + throw new NotFoundException('Node for share not found, fileid: '.$this->fileId); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | $this->node = $nodes[0]; |
@@ -43,19 +43,19 @@ |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public function run(IOutput $output) { |
| 46 | - $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data'); |
|
| 46 | + $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data'); |
|
| 47 | 47 | $instanceId = $this->config->getSystemValue('instanceid', null); |
| 48 | 48 | |
| 49 | 49 | if (!is_string($instanceId) || empty($instanceId)) { |
| 50 | 50 | return; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - $updaterFolderPath = $dataDir . '/updater-' . $instanceId; |
|
| 54 | - $stepFile = $updaterFolderPath . '/.step'; |
|
| 53 | + $updaterFolderPath = $dataDir.'/updater-'.$instanceId; |
|
| 54 | + $stepFile = $updaterFolderPath.'/.step'; |
|
| 55 | 55 | if (file_exists($stepFile)) { |
| 56 | 56 | $output->info('.step file exists'); |
| 57 | 57 | |
| 58 | - $previousStepFile = $updaterFolderPath . '/.step-previous-update'; |
|
| 58 | + $previousStepFile = $updaterFolderPath.'/.step-previous-update'; |
|
| 59 | 59 | |
| 60 | 60 | // cleanup |
| 61 | 61 | if (file_exists($previousStepFile)) { |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | public function sort($a, $b) { |
| 54 | 54 | if (!isset($a[$this->key]) || !isset($b[$this->key])) { |
| 55 | 55 | if (!is_null($this->log)) { |
| 56 | - $this->log->error('Sharing dialogue: cannot sort due to ' . |
|
| 56 | + $this->log->error('Sharing dialogue: cannot sort due to '. |
|
| 57 | 57 | 'missing array key', ['app' => 'core']); |
| 58 | 58 | } |
| 59 | 59 | return 0; |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | $capabilities = array_replace_recursive($capabilities, $c->getCapabilities()); |
| 61 | 61 | } |
| 62 | 62 | } else { |
| 63 | - throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface'); |
|
| 63 | + throw new \InvalidArgumentException('The given Capability ('.get_class($c).') does not implement the ICapability interface'); |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | |
@@ -135,7 +135,7 @@ |
||
| 135 | 135 | * @return $this |
| 136 | 136 | */ |
| 137 | 137 | public function addHeader($name, $value) { |
| 138 | - $name = trim($name); // always remove leading and trailing whitespace |
|
| 138 | + $name = trim($name); // always remove leading and trailing whitespace |
|
| 139 | 139 | // to be able to reliably check for security |
| 140 | 140 | // headers |
| 141 | 141 | |