@@ -109,7 +109,7 @@ |
||
| 109 | 109 | * check if it is a file located in data/user/files only files in the |
| 110 | 110 | * 'files' directory should be moved to the trash |
| 111 | 111 | * |
| 112 | - * @param $path |
|
| 112 | + * @param string $path |
|
| 113 | 113 | * @return bool |
| 114 | 114 | */ |
| 115 | 115 | protected function shouldMoveToTrash($path){ |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | |
| 81 | 81 | /** |
| 82 | 82 | * @param array $parameters |
| 83 | - * @return int |
|
| 83 | + * @return string |
|
| 84 | 84 | */ |
| 85 | 85 | protected function getPath($parameters) { |
| 86 | 86 | $node = \OC::$server->getRootFolder() |
@@ -101,6 +101,10 @@ |
||
| 101 | 101 | // TODO: dont check/enforce 2FA if a auth token is used |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | + /** |
|
| 105 | + * @param Controller $controller |
|
| 106 | + * @param string $methodName |
|
| 107 | + */ |
|
| 104 | 108 | private function checkTwoFactor($controller, $methodName) { |
| 105 | 109 | // If two-factor auth is in progress disallow access to any controllers |
| 106 | 110 | // defined within "LoginController". |
@@ -402,6 +402,9 @@ |
||
| 402 | 402 | } |
| 403 | 403 | } |
| 404 | 404 | |
| 405 | + /** |
|
| 406 | + * @param string $path |
|
| 407 | + */ |
|
| 405 | 408 | private function getParentPath($path) { |
| 406 | 409 | $parent = dirname($path); |
| 407 | 410 | if ($parent === '.') { |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | /** |
| 75 | 75 | * @param array $entry |
| 76 | - * @return array |
|
| 76 | + * @return string |
|
| 77 | 77 | */ |
| 78 | 78 | protected function formatCacheEntry($entry) { |
| 79 | 79 | if (isset($entry['path'])) { |
@@ -192,6 +192,9 @@ discard block |
||
| 192 | 192 | return $this->cache->getStatus($this->getSourcePath($file)); |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | + /** |
|
| 196 | + * @param \OCP\Files\Cache\ICacheEntry[] $results |
|
| 197 | + */ |
|
| 195 | 198 | private function formatSearchResults($results) { |
| 196 | 199 | $results = array_filter($results, [$this, 'filterCacheEntry']); |
| 197 | 200 | $results = array_values($results); |
@@ -29,7 +29,6 @@ |
||
| 29 | 29 | |
| 30 | 30 | use OC\Files\Filesystem; |
| 31 | 31 | use OC\Files\External\StorageConfig; |
| 32 | - |
|
| 33 | 32 | use OCP\Files\External\IStorageConfig; |
| 34 | 33 | use OCP\Files\External\Backend\Backend; |
| 35 | 34 | use OCP\Files\External\Auth\AuthMechanism; |
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | namespace OC\Files\External; |
| 24 | 24 | |
| 25 | 25 | use OCP\IConfig; |
| 26 | - |
|
| 27 | 26 | use OCP\Files\External\Backend\Backend; |
| 28 | 27 | use OCP\Files\External\Auth\AuthMechanism; |
| 29 | 28 | use OCP\Files\External\Config\IBackendProvider; |
@@ -155,6 +155,9 @@ |
||
| 155 | 155 | return true; |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | + /** |
|
| 159 | + * @param string $path |
|
| 160 | + */ |
|
| 158 | 161 | private function rmObjects($path) { |
| 159 | 162 | $children = $this->getCache()->getFolderContents($path); |
| 160 | 163 | foreach ($children as $child) { |
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | |
| 24 | 24 | use OCP\Files\IMimeTypeLoader; |
| 25 | 25 | use OCP\IDBConnection; |
| 26 | - |
|
| 27 | 26 | use Doctrine\DBAL\Exception\UniqueConstraintViolationException; |
| 28 | 27 | |
| 29 | 28 | /** |