Introduce Storage::getMetaData() to allow storage implementations more control over...

diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index c1ba7c014612e0f70baa4fdedc71454a6efbd48f..713dcda3ac3a0e25b50c1cb09bf947b9cfd0de2e 100644 (file)
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -110,7 +110,7 @@ class Scanner extends BasicEmitter {
                        return null;
                }
 
-               $data = $this->storage->getData($path);
+               $data = $this->storage->getMetaData($path);
                $data['permissions'] = $permissions;
 
                return $data;

diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 0294fc4b5bea2a3e67344d7c860175d32ae9d74a..7667821805446329b8b58cc0f97dae726767c3da 100644 (file)
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -584,7 +584,7 @@ abstract class Common implements Storage {
        /**
         * @inheritdoc
         */
-       public function getData($path) {
+       public function getMetaData($path) {
                $data = [];
                $data['mimetype'] = $this->getMimeType($path);
                $data['mtime'] = $this->filemtime($path);

diff --git a/lib/private/files/storage/storage.php b/lib/private/files/storage/storage.php
index 9fda743afcf5beb9ecc17c3fb5fad3d5564ca533..07b5633c90887faa4b6167ebe7c9c786a6ddc587 100644 (file)
--- a/lib/private/files/storage/storage.php
+++ b/lib/private/files/storage/storage.php
@@ -71,9 +71,9 @@ interface Storage extends \OCP\Files\Storage {
        public function getStorageCache();
 
        /**
-        * @param $path
+        * @param string $path
         * @return array
         */
-       public function getData($path);
+       public function getMetaData($path);
 
 }

diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index df91b7189dc2e75d2e2c240b26ef3d5f3fdc02a2..125e5f0f57e787ad84922503709b62d4b9965991 100644 (file)
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -111,11 +111,11 @@ class Encryption extends Wrapper {
        }
 
        /**
-        * @param $path
+        * @param string $path
         * @return array
         */
-       public function getData($path) {
-               $data = $this->storage->getData($path);
+       public function getMetaData($path) {
+               $data = $this->storage->getMetaData($path);
                $fullPath = $this->getFullPath($path);
 
                if (isset($this->unencryptedSize[$fullPath])) {

diff --git a/lib/private/files/storage/wrapper/wrapper.php b/lib/private/files/storage/wrapper/wrapper.php
index 0bea457c87725cdaf74d1036fa66ec22121b9439..f3dc09db13848a9c1fe5cab2c9e7bf9b8d74fa11 100644 (file)
--- a/lib/private/files/storage/wrapper/wrapper.php
+++ b/lib/private/files/storage/wrapper/wrapper.php
@@ -527,10 +527,10 @@ class Wrapper implements \OC\Files\Storage\Storage {
        }
 
        /**
-        * @param $path
+        * @param string $path
         * @return array
         */
-       public function getData($path) {
-               return $this->storage->getData($path);
+       public function getMetaData($path) {
+               return $this->storage->getMetaData($path);
        }
 }