[Pkg-owncloud-commits] [owncloud] 180/205: Fix class name conflict

[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 2fa432dfb8ce8267c719f4b4685a4ccc050160f5
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon Jun 29 17:11:14 2015 +0200

    Fix class name conflict
    
    Looks like PHP 5.6.x doesn't like name conflicts.
    
    \Sabre\DAV\Server would overlap with \OC\Connector\Sabre\Server.
---
 lib/private/connector/sabre/maintenanceplugin.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/private/connector/sabre/maintenanceplugin.php b/lib/private/connector/sabre/maintenanceplugin.php
index 634e5a6..5b48abb 100644
--- a/lib/private/connector/sabre/maintenanceplugin.php
+++ b/lib/private/connector/sabre/maintenanceplugin.php
@@ -27,7 +27,6 @@ namespace OC\Connector\Sabre;
 
 use OCP\IConfig;
 use Sabre\DAV\Exception\ServiceUnavailable;
-use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
 
 class MaintenancePlugin extends ServerPlugin {
@@ -61,10 +60,10 @@ class MaintenancePlugin extends ServerPlugin {
 	 *
 	 * This method should set up the required event subscriptions.
 	 *
-	 * @param Server $server
+	 * @param \Sabre\DAV\Server $server
 	 * @return void
 	 */
-	public function initialize(Server $server) {
+	public function initialize(\Sabre\DAV\Server $server) {
 		$this->server = $server;
 		$this->server->on('beforeMethod', array($this, 'checkMaintenanceMode'), 10);
 	}

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