@@ -41,13 +41,13 @@ |
||
41 | 41 | */ |
42 | 42 | public function cas($key, $old, $new) { |
43 | 43 | //no native cas, emulate with locking |
44 | - if ($this->add($key . '_lock', true)) { |
|
44 | + if ($this->add($key.'_lock', true)) { |
|
45 | 45 | if ($this->get($key) === $old) { |
46 | 46 | $this->set($key, $new); |
47 | - $this->remove($key . '_lock'); |
|
47 | + $this->remove($key.'_lock'); |
|
48 | 48 | return true; |
49 | 49 | } else { |
50 | - $this->remove($key . '_lock'); |
|
50 | + $this->remove($key.'_lock'); |
|
51 | 51 | return false; |
52 | 52 | } |
53 | 53 | } else { |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | use CADTrait; |
38 | 38 | |
39 | 39 | public function get($key) { |
40 | - $result = apcu_fetch($this->getPrefix() . $key, $success); |
|
40 | + $result = apcu_fetch($this->getPrefix().$key, $success); |
|
41 | 41 | if (!$success) { |
42 | 42 | return null; |
43 | 43 | } |
@@ -45,24 +45,24 @@ discard block |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | public function set($key, $value, $ttl = 0) { |
48 | - return apcu_store($this->getPrefix() . $key, $value, $ttl); |
|
48 | + return apcu_store($this->getPrefix().$key, $value, $ttl); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | public function hasKey($key) { |
52 | - return apcu_exists($this->getPrefix() . $key); |
|
52 | + return apcu_exists($this->getPrefix().$key); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | public function remove($key) { |
56 | - return apcu_delete($this->getPrefix() . $key); |
|
56 | + return apcu_delete($this->getPrefix().$key); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | public function clear($prefix = '') { |
60 | - $ns = $this->getPrefix() . $prefix; |
|
60 | + $ns = $this->getPrefix().$prefix; |
|
61 | 61 | $ns = preg_quote($ns, '/'); |
62 | - if(class_exists('\APCIterator')) { |
|
63 | - $iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY); |
|
62 | + if (class_exists('\APCIterator')) { |
|
63 | + $iter = new \APCIterator('user', '/^'.$ns.'/', APC_ITER_KEY); |
|
64 | 64 | } else { |
65 | - $iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY); |
|
65 | + $iter = new \APCUIterator('/^'.$ns.'/', APC_ITER_KEY); |
|
66 | 66 | } |
67 | 67 | return apcu_delete($iter); |
68 | 68 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * @return bool |
77 | 77 | */ |
78 | 78 | public function add($key, $value, $ttl = 0) { |
79 | - return apcu_add($this->getPrefix() . $key, $value, $ttl); |
|
79 | + return apcu_add($this->getPrefix().$key, $value, $ttl); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221 |
101 | 101 | * for details |
102 | 102 | */ |
103 | - return apcu_exists($this->getPrefix() . $key) |
|
104 | - ? apcu_inc($this->getPrefix() . $key, $step) |
|
103 | + return apcu_exists($this->getPrefix().$key) |
|
104 | + ? apcu_inc($this->getPrefix().$key, $step) |
|
105 | 105 | : false; |
106 | 106 | } |
107 | 107 | |
@@ -125,8 +125,8 @@ discard block |
||
125 | 125 | * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221 |
126 | 126 | * for details |
127 | 127 | */ |
128 | - return apcu_exists($this->getPrefix() . $key) |
|
129 | - ? apcu_dec($this->getPrefix() . $key, $step) |
|
128 | + return apcu_exists($this->getPrefix().$key) |
|
129 | + ? apcu_dec($this->getPrefix().$key, $step) |
|
130 | 130 | : false; |
131 | 131 | } |
132 | 132 | |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | public function cas($key, $old, $new) { |
142 | 142 | // apc only does cas for ints |
143 | 143 | if (is_int($old) and is_int($new)) { |
144 | - return apcu_cas($this->getPrefix() . $key, $old, $new); |
|
144 | + return apcu_cas($this->getPrefix().$key, $old, $new); |
|
145 | 145 | } else { |
146 | 146 | return $this->casEmulated($key, $old, $new); |
147 | 147 | } |
@@ -38,13 +38,13 @@ |
||
38 | 38 | */ |
39 | 39 | public function cad($key, $old) { |
40 | 40 | //no native cas, emulate with locking |
41 | - if ($this->add($key . '_lock', true)) { |
|
41 | + if ($this->add($key.'_lock', true)) { |
|
42 | 42 | if ($this->get($key) === $old) { |
43 | 43 | $this->remove($key); |
44 | - $this->remove($key . '_lock'); |
|
44 | + $this->remove($key.'_lock'); |
|
45 | 45 | return true; |
46 | 46 | } else { |
47 | - $this->remove($key . '_lock'); |
|
47 | + $this->remove($key.'_lock'); |
|
48 | 48 | return false; |
49 | 49 | } |
50 | 50 | } else { |
@@ -103,10 +103,10 @@ discard block |
||
103 | 103 | $meta['status'] = $this->succeeded() ? 'ok' : 'failure'; |
104 | 104 | $meta['statuscode'] = $this->statusCode; |
105 | 105 | $meta['message'] = $this->message; |
106 | - if(isset($this->items)) { |
|
106 | + if (isset($this->items)) { |
|
107 | 107 | $meta['totalitems'] = $this->items; |
108 | 108 | } |
109 | - if(isset($this->perPage)) { |
|
109 | + if (isset($this->perPage)) { |
|
110 | 110 | $meta['itemsperpage'] = $this->perPage; |
111 | 111 | } |
112 | 112 | return $meta; |
@@ -136,11 +136,11 @@ discard block |
||
136 | 136 | * @return $this |
137 | 137 | */ |
138 | 138 | public function addHeader($name, $value) { |
139 | - $name = trim($name); // always remove leading and trailing whitespace |
|
139 | + $name = trim($name); // always remove leading and trailing whitespace |
|
140 | 140 | // to be able to reliably check for security |
141 | 141 | // headers |
142 | 142 | |
143 | - if(is_null($value)) { |
|
143 | + if (is_null($value)) { |
|
144 | 144 | unset($this->headers[$name]); |
145 | 145 | } else { |
146 | 146 | $this->headers[$name] = $value; |
@@ -372,12 +372,12 @@ |
||
372 | 372 | \OC\Files\Filesystem::initMountPoints($userId); |
373 | 373 | |
374 | 374 | try { |
375 | - $folder = $this->get('/' . $userId . '/files'); |
|
375 | + $folder = $this->get('/'.$userId.'/files'); |
|
376 | 376 | } catch (NotFoundException $e) { |
377 | - if (!$this->nodeExists('/' . $userId)) { |
|
378 | - $this->newFolder('/' . $userId); |
|
377 | + if (!$this->nodeExists('/'.$userId)) { |
|
378 | + $this->newFolder('/'.$userId); |
|
379 | 379 | } |
380 | - $folder = $this->newFolder('/' . $userId . '/files'); |
|
380 | + $folder = $this->newFolder('/'.$userId.'/files'); |
|
381 | 381 | } |
382 | 382 | |
383 | 383 | $this->userFolderCache->set($userId, $folder); |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | $path = str_replace('\\', '/', $path); |
289 | 289 | //add leading slash |
290 | 290 | if ($path[0] !== '/') { |
291 | - $path = '/' . $path; |
|
291 | + $path = '/'.$path; |
|
292 | 292 | } |
293 | 293 | //remove duplicate slashes |
294 | 294 | while (strpos($path, '//') !== false) { |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | */ |
309 | 309 | public function isValidPath($path) { |
310 | 310 | if (!$path || $path[0] !== '/') { |
311 | - $path = '/' . $path; |
|
311 | + $path = '/'.$path; |
|
312 | 312 | } |
313 | 313 | if (strstr($path, '/../') || strrchr($path, '/') === '/..') { |
314 | 314 | return false; |
@@ -389,14 +389,14 @@ discard block |
||
389 | 389 | $this->root->emit('\OC\Files', 'preCopy', [$this, $nonExisting]); |
390 | 390 | $this->root->emit('\OC\Files', 'preWrite', [$nonExisting]); |
391 | 391 | if (!$this->view->copy($this->path, $targetPath)) { |
392 | - throw new NotPermittedException('Could not copy ' . $this->path . ' to ' . $targetPath); |
|
392 | + throw new NotPermittedException('Could not copy '.$this->path.' to '.$targetPath); |
|
393 | 393 | } |
394 | 394 | $targetNode = $this->root->get($targetPath); |
395 | 395 | $this->root->emit('\OC\Files', 'postCopy', [$this, $targetNode]); |
396 | 396 | $this->root->emit('\OC\Files', 'postWrite', [$targetNode]); |
397 | 397 | return $targetNode; |
398 | 398 | } else { |
399 | - throw new NotPermittedException('No permission to copy to path ' . $targetPath); |
|
399 | + throw new NotPermittedException('No permission to copy to path '.$targetPath); |
|
400 | 400 | } |
401 | 401 | } |
402 | 402 | |
@@ -413,7 +413,7 @@ discard block |
||
413 | 413 | $this->root->emit('\OC\Files', 'preRename', [$this, $nonExisting]); |
414 | 414 | $this->root->emit('\OC\Files', 'preWrite', [$nonExisting]); |
415 | 415 | if (!$this->view->rename($this->path, $targetPath)) { |
416 | - throw new NotPermittedException('Could not move ' . $this->path . ' to ' . $targetPath); |
|
416 | + throw new NotPermittedException('Could not move '.$this->path.' to '.$targetPath); |
|
417 | 417 | } |
418 | 418 | $targetNode = $this->root->get($targetPath); |
419 | 419 | $this->root->emit('\OC\Files', 'postRename', [$this, $targetNode]); |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | $this->path = $targetPath; |
422 | 422 | return $targetNode; |
423 | 423 | } else { |
424 | - throw new NotPermittedException('No permission to move to path ' . $targetPath); |
|
424 | + throw new NotPermittedException('No permission to move to path '.$targetPath); |
|
425 | 425 | } |
426 | 426 | } |
427 | 427 |
@@ -64,7 +64,7 @@ |
||
64 | 64 | return null; |
65 | 65 | } |
66 | 66 | |
67 | - return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/' . $user->getUID(), $config['arguments'], $loader); |
|
67 | + return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/'.$user->getUID(), $config['arguments'], $loader); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
@@ -39,6 +39,6 @@ |
||
39 | 39 | */ |
40 | 40 | public function getHomeMountForUser(IUser $user, IStorageFactory $loader) { |
41 | 41 | $arguments = ['user' => $user]; |
42 | - return new MountPoint('\OC\Files\Storage\Home', '/' . $user->getUID(), $arguments, $loader); |
|
42 | + return new MountPoint('\OC\Files\Storage\Home', '/'.$user->getUID(), $arguments, $loader); |
|
43 | 43 | } |
44 | 44 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | throw new \RuntimeException('no instance id!'); |
74 | 74 | } |
75 | 75 | |
76 | - $name = 'appdata_' . $instanceId; |
|
76 | + $name = 'appdata_'.$instanceId; |
|
77 | 77 | |
78 | 78 | try { |
79 | 79 | $appDataFolder = $this->rootFolder->get($name); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | try { |
92 | 92 | $appDataFolder = $appDataFolder->newFolder($this->appId); |
93 | 93 | } catch (NotPermittedException $e) { |
94 | - throw new \RuntimeException('Could not get appdata folder for ' . $this->appId); |
|
94 | + throw new \RuntimeException('Could not get appdata folder for '.$this->appId); |
|
95 | 95 | } |
96 | 96 | } |
97 | 97 |