[Pkg-owncloud-commits] [owncloud] 04/23: Avoid namespace clash

[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 eb2e8d99cc237a908bfda0dbbbb3d8e895ffbf31
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue Jun 30 15:07:48 2015 +0200

    Avoid namespace clash
---
 lib/private/connector/sabre/auth.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php
index 2255b2c..8a6eaab 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)))
 		) {

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