diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-30 15:07:48 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2015-07-01 07:48:35 +0200 |
commit | eb2e8d99cc237a908bfda0dbbbb3d8e895ffbf31 (patch) | |
tree | 54a74ae9c8bc562ed05d8a02d6df54649e3bb393 /lib | |
parent | 82493e9789c7625341d77186adad67285cfdd155 (diff) | |
download | nextcloud-server-eb2e8d99cc237a908bfda0dbbbb3d8e895ffbf31.tar.gz nextcloud-server-eb2e8d99cc237a908bfda0dbbbb3d8e895ffbf31.zip |
Avoid namespace clash
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/connector/sabre/auth.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php index 2255b2c0466..8a6eaab5bf8 100644 --- a/lib/private/connector/sabre/auth.php +++ b/lib/private/connector/sabre/auth.php @@ -34,7 +34,6 @@ use Exception; use Sabre\DAV\Auth\Backend\AbstractBasic; use Sabre\DAV\Exception\NotAuthenticated; use Sabre\DAV\Exception\ServiceUnavailable; -use Sabre\DAV\Server; class Auth extends AbstractBasic { const DAV_AUTHENTICATED = 'AUTHENTICATED_TO_DAV_BACKEND'; @@ -112,12 +111,12 @@ class Auth extends AbstractBasic { * even if there are no HTTP Basic Auth headers. * In other case, just fallback to the parent implementation. * - * @param Server $server + * @param \Sabre\DAV\Server $server * @param string $realm * @return bool * @throws ServiceUnavailable */ - public function authenticate(Server $server, $realm) { + public function authenticate(\Sabre\DAV\Server $server, $realm) { try { $result = $this->auth($server, $realm); @@ -132,11 +131,11 @@ class Auth extends AbstractBasic { } /** - * @param Server $server + * @param \Sabre\DAV\Server $server * @param $realm * @return bool */ - private function auth(Server $server, $realm) { + private function auth(\Sabre\DAV\Server $server, $realm) { if (\OC_User::handleApacheAuth() || (\OC_User::isLoggedIn() && is_null(\OC::$server->getSession()->get(self::DAV_AUTHENTICATED))) ) { |