Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update scanFile() and scanChildren() to the new signature of the parent ... #14682

Merged
merged 1 commit into from
Mar 4, 2015
Merged

Update scanFile() and scanChildren() to the new signature of the parent ... #14682

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions lib/private/files/objectstore/noopscanner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ public function __construct(Storage $storage) {
*
* @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();
}

Expand All @@ -58,11 +59,11 @@ public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) {
* @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;
}

/**
Expand Down