[Pkg-owncloud-commits] [owncloud] 10/118: Update scanFile() and scanChildren() to the new signature of the parent class

[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 2f6eaa3832d01214a1c566e9483d2de15972e754
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Wed Mar 4 09:22:53 2015 +0100

    Update scanFile() and scanChildren() to the new signature of the parent class
---
 lib/private/files/objectstore/noopscanner.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/private/files/objectstore/noopscanner.php b/lib/private/files/objectstore/noopscanner.php
index 59ca177..7750a8d 100644
--- a/lib/private/files/objectstore/noopscanner.php
+++ b/lib/private/files/objectstore/noopscanner.php
@@ -33,10 +33,11 @@ class NoopScanner extends Scanner {
 	 *
 	 * @param string $file
 	 * @param int $reuseExisting
-	 * @param bool $parentExistsInCache
-	 * @return array with metadata of the scanned file
+	 * @param int $parentId
+	 * @param array|null $cacheData existing data in the cache for the file to be scanned
+	 * @return array an array of metadata of the scanned file
 	 */
-	public function scanFile($file, $reuseExisting = 0, $parentExistsInCache = false) {
+	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null) {
 		return array();
 	}
 
@@ -58,11 +59,11 @@ class NoopScanner extends Scanner {
 	 * @param string $path
 	 * @param bool $recursive
 	 * @param int $reuse
+	 * @param array $folderData existing cache data for the folder to be scanned
 	 * @return int the size of the scanned folder or -1 if the size is unknown at this stage
 	 */
-	public function scanChildren($path, $recursive = Storage::SCAN_RECURSIVE, $reuse = -1) {
-		$size = 0;
-		return $size;
+	protected function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $folderData = null) {
+		return 0;
 	}
 
 	/**

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