From 2fa432dfb8ce8267c719f4b4685a4ccc050160f5 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 29 Jun 2015 17:11:14 +0200
Subject: [PATCH] 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 634e5a6812..5b48abbc51 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);
}
--
GitLab