[Pkg-owncloud-commits] [owncloud] 114/165: Introduce Storage::getMetaData() to allow storage implementations more control over the data array

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 23f1bdc3d4682dbb2e8d1a82921d62dbe0b213be
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Apr 20 14:54:54 2015 +0200

    Introduce Storage::getMetaData() to allow storage implementations more control over the data array
---
 lib/private/files/cache/scanner.php              | 2 +-
 lib/private/files/storage/common.php             | 2 +-
 lib/private/files/storage/storage.php            | 4 ++--
 lib/private/files/storage/wrapper/encryption.php | 6 +++---
 lib/private/files/storage/wrapper/wrapper.php    | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index c1ba7c0..713dcda 100644
--- 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 0294fc4..7667821 100644
--- 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 9fda743..07b5633 100644
--- 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 df91b71..125e5f0 100644
--- 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 0bea457..f3dc09d 100644
--- 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);
 	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git