Skip to content

Commit

Permalink
Fix PHP CS
Browse files Browse the repository at this point in the history 
Signed-off-by: Joas Schilling <coding@schilljs.com>
  • Loading branch information
@nickvergessen
nickvergessen committed May 21, 2021
1 parent 6fff0b8 commit 9626138
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 57 deletions.
5 changes: 2 additions & 3 deletions apps/dav/lib/CardDAV/Activity/Backend.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
namespace OCA\DAV\CardDAV\Activity;

use OCA\DAV\CardDAV\Activity\Provider\Addressbook;
use OCA\DAV\CardDAV\Activity\Provider\Card;
use OCP\Activity\IEvent;
use OCP\Activity\IManager as IActivityManager;
use OCP\App\IAppManager;
Expand Down Expand Up @@ -102,7 +101,7 @@ public function onAddressbookDelete(array $calendarData, array $shares): void {
* @param array $shares
* @param array $changedProperties
*/
protected function triggerAddressbookActivity($action, array $addressbookData, array $shares = [], array $changedProperties = []) {
protected function triggerAddressbookActivity(string $action, array $addressbookData, array $shares = [], array $changedProperties = []): void {
if (!isset($addressbookData['principaluri'])) {
return;
}
Expand Down Expand Up @@ -160,7 +159,7 @@ protected function triggerAddressbookActivity($action, array $addressbookData, a
* @param array $add
* @param array $remove
*/
public function onAddressbookUpdateShares(array $addressbookData, array $shares, array $add, array $remove) {
public function onAddressbookUpdateShares(array $addressbookData, array $shares, array $add, array $remove): void {
$principal = explode('/', $addressbookData['principaluri']);
$owner = $principal[2];

Expand Down
53 changes: 25 additions & 28 deletions apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ class Addressbook extends Base {
/** @var IFactory */
protected $languageFactory;

/** @var IL10N */
protected $l;

/** @var IManager */
protected $activityManager;

Expand Down Expand Up @@ -88,7 +85,7 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null): I
throw new \InvalidArgumentException();
}

$this->l = $this->languageFactory->get('dav', $language);
$l = $this->languageFactory->get('dav', $language);

if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts-dark.png')));
Expand All @@ -97,44 +94,44 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null): I
}

if ($event->getSubject() === self::SUBJECT_ADD) {
$subject = $this->l->t('{actor} created addressbook {addressbook}');
$subject = $l->t('{actor} created addressbook {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
$subject = $this->l->t('You created addressbook {addressbook}');
$subject = $l->t('You created addressbook {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
$subject = $this->l->t('{actor} deleted addressbook {addressbook}');
$subject = $l->t('{actor} deleted addressbook {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
$subject = $this->l->t('You deleted addressbook {addressbook}');
$subject = $l->t('You deleted addressbook {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
$subject = $this->l->t('{actor} updated addressbook {addressbook}');
$subject = $l->t('{actor} updated addressbook {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
$subject = $this->l->t('You updated addressbook {addressbook}');
$subject = $l->t('You updated addressbook {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
$subject = $this->l->t('{actor} shared addressbook {addressbook} with you');
$subject = $l->t('{actor} shared addressbook {addressbook} with you');
} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
$subject = $this->l->t('You shared addressbook {addressbook} with {user}');
$subject = $l->t('You shared addressbook {addressbook} with {user}');
} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
$subject = $this->l->t('{actor} shared addressbook {addressbook} with {user}');
$subject = $l->t('{actor} shared addressbook {addressbook} with {user}');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
$subject = $this->l->t('{actor} unshared addressbook {addressbook} from you');
$subject = $l->t('{actor} unshared addressbook {addressbook} from you');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
$subject = $this->l->t('You unshared addressbook {addressbook} from {user}');
$subject = $l->t('You unshared addressbook {addressbook} from {user}');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
$subject = $this->l->t('{actor} unshared addressbook {addressbook} from {user}');
$subject = $l->t('{actor} unshared addressbook {addressbook} from {user}');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
$subject = $this->l->t('{actor} unshared addressbook {addressbook} from themselves');
$subject = $l->t('{actor} unshared addressbook {addressbook} from themselves');
} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
$subject = $this->l->t('You shared addressbook {addressbook} with group {group}');
$subject = $l->t('You shared addressbook {addressbook} with group {group}');
} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
$subject = $this->l->t('{actor} shared addressbook {addressbook} with group {group}');
$subject = $l->t('{actor} shared addressbook {addressbook} with group {group}');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
$subject = $this->l->t('You unshared addressbook {addressbook} from group {group}');
$subject = $l->t('You unshared addressbook {addressbook} from group {group}');
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
$subject = $this->l->t('{actor} unshared addressbook {addressbook} from group {group}');
$subject = $l->t('{actor} unshared addressbook {addressbook} from group {group}');
} else {
throw new \InvalidArgumentException();
}

$parsedParameters = $this->getParameters($event);
$parsedParameters = $this->getParameters($event, $l);
$this->setSubjects($event, $subject, $parsedParameters);

$event = $this->eventMerger->mergeEvents('addressbook', $event, $previousEvent);
Expand All @@ -152,7 +149,7 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null): I
return $event;
}

protected function getParameters(IEvent $event): array {
protected function getParameters(IEvent $event, IL10N $l): array {
$subject = $event->getSubject();
$parameters = $event->getSubjectParameters();

Expand All @@ -168,32 +165,32 @@ protected function getParameters(IEvent $event): array {
case self::SUBJECT_UNSHARE_USER . '_self':
return [
'actor' => $this->generateUserParameter($parameters['actor']),
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
];
case self::SUBJECT_SHARE_USER . '_you':
case self::SUBJECT_UNSHARE_USER . '_you':
return [
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
'user' => $this->generateUserParameter($parameters['user']),
];
case self::SUBJECT_SHARE_USER . '_by':
case self::SUBJECT_UNSHARE_USER . '_by':
return [
'actor' => $this->generateUserParameter($parameters['actor']),
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
'user' => $this->generateUserParameter($parameters['user']),
];
case self::SUBJECT_SHARE_GROUP . '_you':
case self::SUBJECT_UNSHARE_GROUP . '_you':
return [
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
'group' => $this->generateGroupParameter($parameters['group']),
];
case self::SUBJECT_SHARE_GROUP . '_by':
case self::SUBJECT_UNSHARE_GROUP . '_by':
return [
'actor' => $this->generateUserParameter($parameters['actor']),
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
'group' => $this->generateGroupParameter($parameters['group']),
];
}
Expand Down
28 changes: 12 additions & 16 deletions apps/dav/lib/CardDAV/Activity/Provider/Card.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ class Card extends Base {
/** @var IFactory */
protected $languageFactory;

/** @var IL10N */
protected $l;

/** @var IManager */
protected $activityManager;

Expand Down Expand Up @@ -77,12 +74,12 @@ public function __construct(IFactory $languageFactory,
* @throws \InvalidArgumentException
* @since 11.0.0
*/
public function parse($language, IEvent $event, IEvent $previousEvent = null) {
public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
if ($event->getApp() !== 'dav' || $event->getType() !== 'card') {
throw new \InvalidArgumentException();
}

$this->l = $this->languageFactory->get('dav', $language);
$l = $this->languageFactory->get('dav', $language);

if ($this->activityManager->getRequirePNG()) {
$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/contacts-dark.png')));
Expand All @@ -91,29 +88,29 @@ public function parse($language, IEvent $event, IEvent $previousEvent = null) {
}

if ($event->getSubject() === self::SUBJECT_ADD) {
$subject = $this->l->t('{actor} created contact {card} in addressbook {addressbook}');
$subject = $l->t('{actor} created contact {card} in addressbook {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
$subject = $this->l->t('You created contact {card} in addressbook {addressbook}');
$subject = $l->t('You created contact {card} in addressbook {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_DELETE ) {
$subject = $this->l->t('{actor} deleted contact {card} from addressbook {addressbook}');
$subject = $l->t('{actor} deleted contact {card} from addressbook {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
$subject = $this->l->t('You deleted contact {card} from addressbook {addressbook}');
$subject = $l->t('You deleted contact {card} from addressbook {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
$subject = $this->l->t('{actor} updated contact {card} in addressbook {addressbook}');
$subject = $l->t('{actor} updated contact {card} in addressbook {addressbook}');
} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
$subject = $this->l->t('You updated contact {card} in addressbook {addressbook}');
$subject = $l->t('You updated contact {card} in addressbook {addressbook}');
} else {
throw new \InvalidArgumentException();
}

$parsedParameters = $this->getParameters($event);
$parsedParameters = $this->getParameters($event, $l);
$this->setSubjects($event, $subject, $parsedParameters);

$event = $this->eventMerger->mergeEvents('card', $event, $previousEvent);
return $event;
}

protected function getParameters(IEvent $event): array {
protected function getParameters(IEvent $event, IL10N $l): array {
$subject = $event->getSubject();
$parameters = $event->getSubjectParameters();

Expand All @@ -123,14 +120,14 @@ protected function getParameters(IEvent $event): array {
case self::SUBJECT_UPDATE:
return [
'actor' => $this->generateUserParameter($parameters['actor']),
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
'card' => $this->generateCardParameter($parameters['card']),
];
case self::SUBJECT_ADD . '_self':
case self::SUBJECT_DELETE . '_self':
case self::SUBJECT_UPDATE . '_self':
return [
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
'card' => $this->generateCardParameter($parameters['card']),
];
}
Expand All @@ -143,7 +140,6 @@ private function generateCardParameter(array $cardData): array {
'type' => 'addressbook-contact',
'id' => $cardData['id'],
'name' => $cardData['name'],

];
}
}
8 changes: 3 additions & 5 deletions apps/dav/lib/Listener/AddressbookListener.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php

declare(strict_types=1);

/**
* @copyright Copyright (c) 2021 Joas Schilling <coding@schilljs.com>
*
Expand Down Expand Up @@ -37,7 +36,6 @@
use function sprintf;

class AddressbookListener implements IEventListener {

/** @var ActivityBackend */
private $activityBackend;

Expand Down Expand Up @@ -66,7 +64,7 @@ public function handle(Event $event): void {
'exception' => $e,
]);
}
} else if ($event instanceof AddressBookUpdatedEvent) {
} elseif ($event instanceof AddressBookUpdatedEvent) {
try {
$this->activityBackend->onAddressbookUpdate(
$event->getAddressBookData(),
Expand All @@ -83,7 +81,7 @@ public function handle(Event $event): void {
'exception' => $e,
]);
}
} else if ($event instanceof AddressBookDeletedEvent) {
} elseif ($event instanceof AddressBookDeletedEvent) {
try {
$this->activityBackend->onAddressbookDelete(
$event->getAddressBookData(),
Expand All @@ -99,7 +97,7 @@ public function handle(Event $event): void {
'exception' => $e,
]);
}
} else if ($event instanceof AddressBookShareUpdatedEvent) {
} elseif ($event instanceof AddressBookShareUpdatedEvent) {
try {
$this->activityBackend->onAddressbookUpdateShares(
$event->getAddressBookData(),
Expand Down
7 changes: 2 additions & 5 deletions apps/dav/lib/Listener/CardListener.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php

declare(strict_types=1);

/**
* @copyright Copyright (c) 2021 Joas Schilling <coding@schilljs.com>
*
Expand All @@ -27,7 +26,6 @@

use OCA\DAV\CardDAV\Activity\Provider\Card;
use OCA\DAV\CardDAV\Activity\Backend as ActivityBackend;
use OCA\DAV\CardDAV\CardDavBackend;
use OCA\DAV\Events\CardCreatedEvent;
use OCA\DAV\Events\CardDeletedEvent;
use OCA\DAV\Events\CardUpdatedEvent;
Expand All @@ -38,7 +36,6 @@
use function sprintf;

class CardListener implements IEventListener {

/** @var ActivityBackend */
private $activityBackend;

Expand Down Expand Up @@ -70,7 +67,7 @@ public function handle(Event $event): void {
'exception' => $e,
]);
}
} else if ($event instanceof CardUpdatedEvent) {
} elseif ($event instanceof CardUpdatedEvent) {
try {
$this->activityBackend->triggerCardActivity(
Card::SUBJECT_UPDATE,
Expand All @@ -88,7 +85,7 @@ public function handle(Event $event): void {
'exception' => $e,
]);
}
} else if ($event instanceof CardDeletedEvent) {
} elseif ($event instanceof CardDeletedEvent) {
try {
$this->activityBackend->triggerCardActivity(
Card::SUBJECT_DELETE,
Expand Down

0 comments on commit 9626138

Please sign in to comment.