diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2017-01-25 08:52:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 08:52:32 +0100 |
| commit | 933fd9c94d78eb965cd458c6f2ceecb1dd659f7c (patch) | |
| tree | 187b9fff5a5b603c7ccfe0aaeb45bdc145ea286e /lib/public | |
| parent | 5d985deb4d981c61e4e7620c4fde7c2d888519e2 (diff) | |
| parent | f73527c42f775f1905521448f4a7b4c7dbb96317 (diff) | |
| download | nextcloud-server-933fd9c94d78eb965cd458c6f2ceecb1dd659f7c.tar.gz nextcloud-server-933fd9c94d78eb965cd458c6f2ceecb1dd659f7c.zip | |
Merge pull request #3240 from nextcloud/storage-interface-tweaks
minor storage interface tweaks
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/Files/Cache/IScanner.php | 1 | ||||
| -rw-r--r-- | lib/public/Files/Storage/IStorage.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/public/Files/Cache/IScanner.php b/lib/public/Files/Cache/IScanner.php index 60282996232..8aa4dc04aa9 100644 --- a/lib/public/Files/Cache/IScanner.php +++ b/lib/public/Files/Cache/IScanner.php @@ -32,6 +32,7 @@ interface IScanner { const SCAN_RECURSIVE = true; const SCAN_SHALLOW = false; + const REUSE_NONE = 0; const REUSE_ETAG = 1; const REUSE_SIZE = 2; diff --git a/lib/public/Files/Storage/IStorage.php b/lib/public/Files/Storage/IStorage.php index b806dc3b7d1..27b8f1d0697 100644 --- a/lib/public/Files/Storage/IStorage.php +++ b/lib/public/Files/Storage/IStorage.php @@ -383,7 +383,7 @@ interface IStorage { public function verifyPath($path, $fileName); /** - * @param \OCP\Files\Storage $sourceStorage + * @param \OCP\Files\Storage|\OCP\Files\Storage\IStorage $sourceStorage * @param string $sourceInternalPath * @param string $targetInternalPath * @return bool @@ -392,7 +392,7 @@ interface IStorage { public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath); /** - * @param \OCP\Files\Storage $sourceStorage + * @param \OCP\Files\Storage|\OCP\Files\Storage\IStorage $sourceStorage * @param string $sourceInternalPath * @param string $targetInternalPath * @return bool |