minor storage interface tweaks

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/public/Files/Cache/IScanner.php b/lib/public/Files/Cache/IScanner.php
index 60282996232488238e2d1e791f98258ac6c63b7f..8aa4dc04aa90a4a6bc0a0ddb205ede5f4a6537e1 100644 (file)
--- 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 b806dc3b7d12458e8a51db63b836b8a1ddd45cf6..27b8f1d0697f12da4905453dad1d60baaec800d6 100644 (file)
--- 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