wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix class name conflict

Browse source 
Looks like PHP 5.6.x doesn't like name conflicts.

\Sabre\DAV\Server would overlap with \OC\Connector\Sabre\Server.
This commit is contained in:
Vincent Petry 2015-06-29 17:11:14 +02:00
parent b88a0e7080
commit 2fa432dfb8
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/connector/sabre/maintenanceplugin.php
View file

@ -27,7 +27,6 @@ namespace OC\Connector\Sabre;
use OCP\IConfig; use OCP\IConfig;
use Sabre\DAV\Exception\ServiceUnavailable; use Sabre\DAV\Exception\ServiceUnavailable;
use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin; use Sabre\DAV\ServerPlugin;
class MaintenancePlugin extends ServerPlugin { class MaintenancePlugin extends ServerPlugin {
@ -61,10 +60,10 @@ class MaintenancePlugin extends ServerPlugin {
* *
* This method should set up the required event subscriptions. * This method should set up the required event subscriptions.
* *
* @param Server $server * @param \Sabre\DAV\Server $server
* @return void * @return void
*/ */
public function initialize(Server $server) { public function initialize(\Sabre\DAV\Server $server) {
$this->server = $server; $this->server = $server;
$this->server->on('beforeMethod', array($this, 'checkMaintenanceMode'), 10); $this->server->on('beforeMethod', array($this, 'checkMaintenanceMode'), 10);
} }