Completed
Pull Request — master (#9355)
by Robin
15:21
created
apps/dav/lib/Connector/Sabre/Directory.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 				// exit if we can't create a new file and we don't updatable existing file
127 127
 				$chunkInfo = \OC_FileChunking::decodeName($name);
128 128
 				if (!$this->fileView->isCreatable($this->path) &&
129
-					!$this->fileView->isUpdatable($this->path . '/' . $chunkInfo['name'])
129
+					!$this->fileView->isUpdatable($this->path.'/'.$chunkInfo['name'])
130 130
 				) {
131 131
 					throw new \Sabre\DAV\Exception\Forbidden();
132 132
 				}
@@ -140,9 +140,9 @@  discard block
 block discarded – undo
140 140
 
141 141
 			$this->fileView->verifyPath($this->path, $name);
142 142
 
143
-			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
143
+			$path = $this->fileView->getAbsolutePath($this->path).'/'.$name;
144 144
 			// in case the file already exists/overwriting
145
-			$info = $this->fileView->getFileInfo($this->path . '/' . $name);
145
+			$info = $this->fileView->getFileInfo($this->path.'/'.$name);
146 146
 			if (!$info) {
147 147
 				// use a dummy FileInfo which is acceptable here since it will be refreshed after the put is complete
148 148
 				$info = new \OC\Files\FileInfo($path, null, null, [], null);
@@ -151,11 +151,11 @@  discard block
 block discarded – undo
151 151
 
152 152
 			// only allow 1 process to upload a file at once but still allow reading the file while writing the part file
153 153
 			$node->acquireLock(ILockingProvider::LOCK_SHARED);
154
-			$this->fileView->lockFile($path . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
154
+			$this->fileView->lockFile($path.'.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
155 155
 
156 156
 			$result = $node->put($data);
157 157
 
158
-			$this->fileView->unlockFile($path . '.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
158
+			$this->fileView->unlockFile($path.'.upload.part', ILockingProvider::LOCK_EXCLUSIVE);
159 159
 			$node->releaseLock(ILockingProvider::LOCK_SHARED);
160 160
 			return $result;
161 161
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
@@ -185,9 +185,9 @@  discard block
 block discarded – undo
185 185
 			}
186 186
 
187 187
 			$this->fileView->verifyPath($this->path, $name);
188
-			$newPath = $this->path . '/' . $name;
188
+			$newPath = $this->path.'/'.$name;
189 189
 			if (!$this->fileView->mkdir($newPath)) {
190
-				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
190
+				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory '.$newPath);
191 191
 			}
192 192
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
193 193
 			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 			throw new NotFound();
217 217
 		}
218 218
 
219
-		$path = $this->path . '/' . $name;
219
+		$path = $this->path.'/'.$name;
220 220
 		if (is_null($info)) {
221 221
 			try {
222 222
 				$this->fileView->verifyPath($this->path, $name);
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 		}
232 232
 
233 233
 		if (!$info) {
234
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
234
+			throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located');
235 235
 		}
236 236
 
237 237
 		if ($info['mimetype'] === 'httpd/unix-directory') {
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 		// (required old code) instead of "updateFile".
291 291
 		//
292 292
 		// TODO: resolve chunk file name here and implement "updateFile"
293
-		$path = $this->path . '/' . $name;
293
+		$path = $this->path.'/'.$name;
294 294
 		return $this->fileView->file_exists($path);
295 295
 
296 296
 	}
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 			throw new ServiceUnavailable('filesystem not setup');
386 386
 		}
387 387
 
388
-		$destinationPath = $this->getPath() . '/' . $targetName;
388
+		$destinationPath = $this->getPath().'/'.$targetName;
389 389
 
390 390
 
391 391
 		$targetNodeExists = $this->childExists($targetName);
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 		// at getNodeForPath we also check the path for isForbiddenFileOrDir
394 394
 		// with that we have covered both source and destination
395 395
 		if ($sourceNode instanceof Directory && $targetNodeExists) {
396
-			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
396
+			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory '.$sourceNode->getName().', target exists');
397 397
 		}
398 398
 
399 399
 		list($sourceDir,) = \Sabre\Uri\split($sourceNode->getPath());
Please login to merge, or discard this patch.