upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-23 07:08:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Fix remaining "PHP Inspection" warnings

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-02-23 10:37:49 +01:00
parent 62ef59616d
commit 088f4422f9
No known key found for this signature in database
GPG key ID: E166FD8976B3BAC8
2 changed files with 27 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
apps/dav/lib/CalDAV/Calendar.php
View file

@ -30,6 +30,12 @@ use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\PropPatch;
/**
* Class Calendar
*
* @package OCA\DAV\CalDAV
* @property BackendInterface|CalDavBackend $caldavBackend
*/
class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
public function __construct(BackendInterface $caldavBackend, $calendarInfo, IL10N $l10n) {
@ -67,9 +73,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
if ($this->isShared()) {
throw new Forbidden();
}
/** @var CalDavBackend $calDavBackend */
$calDavBackend = $this->caldavBackend;
$calDavBackend->updateShares($this, $add, $remove);
$this->caldavBackend->updateShares($this, $add, $remove);
}
/**
@ -88,9 +92,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
if ($this->isShared()) {
return [];
}
/** @var CalDavBackend $calDavBackend */
$calDavBackend = $this->caldavBackend;
return $calDavBackend->getShares($this->getResourceId());
return $this->caldavBackend->getShares($this->getResourceId());
}
/**
@ -147,9 +149,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
return $acl;
}
/** @var CalDavBackend $calDavBackend */
$calDavBackend = $this->caldavBackend;
return $calDavBackend->applyShareAcl($this->getResourceId(), $acl);
return $this->caldavBackend->applyShareAcl($this->getResourceId(), $acl);
}
public function getChildACL() {
@ -175,9 +175,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
throw new Forbidden();
}
/** @var CalDavBackend $calDavBackend */
$calDavBackend = $this->caldavBackend;
$calDavBackend->updateShares($this, [], [
$this->caldavBackend->updateShares($this, [], [
'href' => $principal
]);
return;
@ -201,7 +199,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
throw new NotFound('Calendar object not found');
}
if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
throw new NotFound('Calendar object not found');
}
@ -216,7 +214,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
$children = [];
foreach ($objs as $obj) {
if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
continue;
}
$obj['acl'] = $this->getChildACL();
@ -231,7 +229,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
$objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
$children = [];
foreach ($objs as $obj) {
if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
continue;
}
$obj['acl'] = $this->getChildACL();
@ -246,7 +244,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
if (!$obj) {
return false;
}
if ($this->isShared() && $obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE && $this->isShared()) {
return false;
}

31
apps/dav/lib/CardDAV/AddressBook.php
View file

@ -29,6 +29,12 @@ use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\PropPatch;
/**
* Class AddressBook
*
* @package OCA\DAV\CardDAV
* @property BackendInterface|CardDavBackend $carddavBackend
*/
class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
/**
@ -41,8 +47,8 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
public function __construct(BackendInterface $carddavBackend, array $addressBookInfo, IL10N $l10n) {
parent::__construct($carddavBackend, $addressBookInfo);
if ($this->getName() === CardDavBackend::PERSONAL_ADDRESSBOOK_URI &&
$this->addressBookInfo['{DAV:}displayname'] === CardDavBackend::PERSONAL_ADDRESSBOOK_NAME) {
if ($this->addressBookInfo['{DAV:}displayname'] === CardDavBackend::PERSONAL_ADDRESSBOOK_NAME &&
$this->getName() === CardDavBackend::PERSONAL_ADDRESSBOOK_URI) {
$this->addressBookInfo['{DAV:}displayname'] = $l10n->t('Contacts');
}
}
@ -70,9 +76,7 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
if ($this->isShared()) {
throw new Forbidden();
}
/** @var CardDavBackend $carddavBackend */
$carddavBackend = $this->carddavBackend;
$carddavBackend->updateShares($this, $add, $remove);
$this->carddavBackend->updateShares($this, $add, $remove);
}
/**
@ -91,9 +95,7 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
if ($this->isShared()) {
return [];
}
/** @var CardDavBackend $carddavBackend */
$carddavBackend = $this->carddavBackend;
return $carddavBackend->getShares($this->getResourceId());
return $this->carddavBackend->getShares($this->getResourceId());
}
public function getACL() {
@ -134,9 +136,7 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
return $acl;
}
/** @var CardDavBackend $carddavBackend */
$carddavBackend = $this->carddavBackend;
return $carddavBackend->applyShareAcl($this->getResourceId(), $acl);
return $this->carddavBackend->applyShareAcl($this->getResourceId(), $acl);
}
public function getChildACL() {
@ -179,9 +179,7 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
throw new Forbidden();
}
/** @var CardDavBackend $cardDavBackend */
$cardDavBackend = $this->carddavBackend;
$cardDavBackend->updateShares($this, [], [
$this->carddavBackend->updateShares($this, [], [
'href' => $principal
]);
return;
@ -197,10 +195,7 @@ class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
}
public function getContactsGroups() {
/** @var CardDavBackend $cardDavBackend */
$cardDavBackend = $this->carddavBackend;
return $cardDavBackend->collectCardProperties($this->getResourceId(), 'CATEGORIES');
return $this->carddavBackend->collectCardProperties($this->getResourceId(), 'CATEGORIES');
}
private function isShared() {