diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-11-02 16:56:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 16:56:06 +0300 |
| commit | 3bf915a13088c9d533378b8d5b2a86c2071295b8 (patch) | |
| tree | dea59291afd37baf11a1de401b5bc3b7ccbbaea5 | |
| parent | 6d0650fcde3f6825a7b60786235985e6b80461ea (diff) | |
| parent | ed727c9c8c57fd488957682bd5d962f496717d5d (diff) | |
Merge pull request #7023 from aimakun/dev-issue-6991
Fix mismatch method signature in Nextcloud 11
| -rw-r--r-- | lib/private/Files/Storage/FailedStorage.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/Storage/Local.php | 2 | ||||
| -rw-r--r-- | lib/private/Lockdown/Filesystem/NullStorage.php | 2 | ||||
| -rw-r--r-- | tests/lib/Files/ViewTest.php | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/Files/Storage/FailedStorage.php b/lib/private/Files/Storage/FailedStorage.php index f717c798c5a..496d1364775 100644 --- a/lib/private/Files/Storage/FailedStorage.php +++ b/lib/private/Files/Storage/FailedStorage.php @@ -183,7 +183,7 @@ class FailedStorage extends Common { return true; } - public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) { + public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) { throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e); } diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index 7cdd28468a5..9f20a04b3a0 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -419,7 +419,7 @@ class Local extends \OC\Files\Storage\Common { * @param string $targetInternalPath * @return bool */ - public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) { + public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) { if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Local')) { /** * @var \OC\Files\Storage\Local $sourceStorage diff --git a/lib/private/Lockdown/Filesystem/NullStorage.php b/lib/private/Lockdown/Filesystem/NullStorage.php index ea911b90064..6845d26d735 100644 --- a/lib/private/Lockdown/Filesystem/NullStorage.php +++ b/lib/private/Lockdown/Filesystem/NullStorage.php @@ -156,7 +156,7 @@ class NullStorage extends Common { return false; } - public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) { + public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) { throw new \OC\ForbiddenException('This request is not allowed to access the filesystem'); } diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index 9d2b222e07c..de2dda52f1e 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -26,8 +26,8 @@ class TemporaryNoTouch extends \OC\Files\Storage\Temporary { } class TemporaryNoCross extends \OC\Files\Storage\Temporary { - public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) { - return Common::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); + public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) { + return Common::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime); } public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) { |