diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-02-15 20:49:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 20:49:06 +0100 |
| commit | 79a16bc2d3408b2240489b0ddd4e27c52c72884c (patch) | |
| tree | b1b085cf60cfcd40a94a497792c1b1204bb82f44 | |
| parent | b1c4b445dac526f9eddc43bf6f4814e17a1a0726 (diff) | |
| parent | 25dc1405116dcbabb1ccf31f75c088e80bd8c6e1 (diff) | |
| download | nextcloud-server-79a16bc2d3408b2240489b0ddd4e27c52c72884c.tar.gz nextcloud-server-79a16bc2d3408b2240489b0ddd4e27c52c72884c.zip | |
Merge pull request #3495 from nextcloud/dav-protected
Make it easier to subclass DAV storage
| -rw-r--r-- | lib/private/Files/Storage/DAV.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php index 31f87d16b04..76a6155df24 100644 --- a/lib/private/Files/Storage/DAV.php +++ b/lib/private/Files/Storage/DAV.php @@ -74,11 +74,11 @@ class DAV extends Common { /** @var bool */ protected $ready; /** @var Client */ - private $client; + protected $client; /** @var ArrayCache */ - private $statCache; + protected $statCache; /** @var \OCP\Http\Client\IClientService */ - private $httpClientService; + protected $httpClientService; /** * @param array $params @@ -127,7 +127,7 @@ class DAV extends Common { } } - private function init() { + protected function init() { if ($this->ready) { return; } @@ -627,7 +627,7 @@ class DAV extends Common { * @param string $path to encode * @return string encoded path */ - private function encodePath($path) { + protected function encodePath($path) { // slashes need to stay return str_replace('%2F', '/', rawurlencode($path)); } @@ -641,7 +641,7 @@ class DAV extends Common { * @throws StorageInvalidException * @throws StorageNotAvailableException */ - private function simpleResponse($method, $path, $body, $expected) { + protected function simpleResponse($method, $path, $body, $expected) { $path = $this->cleanPath($path); try { $response = $this->client->request($method, $this->encodePath($path), $body); @@ -815,7 +815,7 @@ class DAV extends Common { * @throws StorageNotAvailableException if the storage is not available, * which might be temporary */ - private function convertException(Exception $e, $path = '') { + protected function convertException(Exception $e, $path = '') { \OC::$server->getLogger()->logException($e); Util::writeLog('files_external', $e->getMessage(), Util::ERROR); if ($e instanceof ClientHttpException) { |