summaryrefslogtreecommitdiffstats
path: root/lib/private/connector
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-06-29 17:11:14 +0200
committerVincent Petry <pvince81@owncloud.com>2015-06-29 17:11:14 +0200
commit2fa432dfb8ce8267c719f4b4685a4ccc050160f5 (patch)
treea2f677e6ee676791e860785b506c0f40a3415d1a /lib/private/connector
parentb88a0e7080cd5b1844cfb286b06744f3a2fead20 (diff)
downloadnextcloud-server-2fa432dfb8ce8267c719f4b4685a4ccc050160f5.tar.gz
nextcloud-server-2fa432dfb8ce8267c719f4b4685a4ccc050160f5.zip
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.
Diffstat (limited to 'lib/private/connector')
-rw-r--r--lib/private/connector/sabre/maintenanceplugin.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/private/connector/sabre/maintenanceplugin.php b/lib/private/connector/sabre/maintenanceplugin.php
index 634e5a68128..5b48abbc517 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);
}