Skip to content

Commit 2e80ec0

Browse files
nickvergessennickvergessen
committed
Fix PHP CS
Signed-off-by: Joas Schilling <coding@schilljs.com>
1 parent 6fff0b8 commit 2e80ec0

5 files changed

Lines changed: 39 additions & 52 deletions

File tree

‎apps/dav/lib/CardDAV/Activity/Backend.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
namespace OCA\DAV\CardDAV\Activity;
3030

3131
use OCA\DAV\CardDAV\Activity\Provider\Addressbook;
32-
use OCA\DAV\CardDAV\Activity\Provider\Card;
3332
use OCP\Activity\IEvent;
3433
use OCP\Activity\IManager as IActivityManager;
3534
use OCP\App\IAppManager;
@@ -102,7 +101,7 @@ public function onAddressbookDelete(array $calendarData, array $shares): void {
102101
* @param array $shares
103102
* @param array $changedProperties
104103
*/
105-
protected function triggerAddressbookActivity($action, array $addressbookData, array $shares = [], array $changedProperties = []) {
104+
protected function triggerAddressbookActivity(string $action, array $addressbookData, array $shares = [], array $changedProperties = []): void {
106105
if (!isset($addressbookData['principaluri'])) {
107106
return;
108107
}
@@ -160,7 +159,7 @@ protected function triggerAddressbookActivity($action, array $addressbookData, a
160159
* @param array $add
161160
* @param array $remove
162161
*/
163-
public function onAddressbookUpdateShares(array $addressbookData, array $shares, array $add, array $remove) {
162+
public function onAddressbookUpdateShares(array $addressbookData, array $shares, array $add, array $remove): void {
164163
$principal = explode('/', $addressbookData['principaluri']);
165164
$owner = $principal[2];
166165

‎apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ class Addressbook extends Base {
4646
/** @var IFactory */
4747
protected $languageFactory;
4848

49-
/** @var IL10N */
50-
protected $l;
51-
5249
/** @var IManager */
5350
protected $activityManager;
5451

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

91-
$this->l = $this->languageFactory->get('dav', $language);
88+
$l = $this->languageFactory->get('dav', $language);
9289

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

9996
if ($event->getSubject() === self::SUBJECT_ADD) {
100-
$subject = $this->l->t('{actor} created addressbook {addressbook}');
97+
$subject = $l->t('{actor} created addressbook {addressbook}');
10198
} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
102-
$subject = $this->l->t('You created addressbook {addressbook}');
99+
$subject = $l->t('You created addressbook {addressbook}');
103100
} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
104-
$subject = $this->l->t('{actor} deleted addressbook {addressbook}');
101+
$subject = $l->t('{actor} deleted addressbook {addressbook}');
105102
} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
106-
$subject = $this->l->t('You deleted addressbook {addressbook}');
103+
$subject = $l->t('You deleted addressbook {addressbook}');
107104
} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
108-
$subject = $this->l->t('{actor} updated addressbook {addressbook}');
105+
$subject = $l->t('{actor} updated addressbook {addressbook}');
109106
} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
110-
$subject = $this->l->t('You updated addressbook {addressbook}');
107+
$subject = $l->t('You updated addressbook {addressbook}');
111108
} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
112-
$subject = $this->l->t('{actor} shared addressbook {addressbook} with you');
109+
$subject = $l->t('{actor} shared addressbook {addressbook} with you');
113110
} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
114-
$subject = $this->l->t('You shared addressbook {addressbook} with {user}');
111+
$subject = $l->t('You shared addressbook {addressbook} with {user}');
115112
} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
116-
$subject = $this->l->t('{actor} shared addressbook {addressbook} with {user}');
113+
$subject = $l->t('{actor} shared addressbook {addressbook} with {user}');
117114
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
118-
$subject = $this->l->t('{actor} unshared addressbook {addressbook} from you');
115+
$subject = $l->t('{actor} unshared addressbook {addressbook} from you');
119116
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
120-
$subject = $this->l->t('You unshared addressbook {addressbook} from {user}');
117+
$subject = $l->t('You unshared addressbook {addressbook} from {user}');
121118
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
122-
$subject = $this->l->t('{actor} unshared addressbook {addressbook} from {user}');
119+
$subject = $l->t('{actor} unshared addressbook {addressbook} from {user}');
123120
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
124-
$subject = $this->l->t('{actor} unshared addressbook {addressbook} from themselves');
121+
$subject = $l->t('{actor} unshared addressbook {addressbook} from themselves');
125122
} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
126-
$subject = $this->l->t('You shared addressbook {addressbook} with group {group}');
123+
$subject = $l->t('You shared addressbook {addressbook} with group {group}');
127124
} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
128-
$subject = $this->l->t('{actor} shared addressbook {addressbook} with group {group}');
125+
$subject = $l->t('{actor} shared addressbook {addressbook} with group {group}');
129126
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
130-
$subject = $this->l->t('You unshared addressbook {addressbook} from group {group}');
127+
$subject = $l->t('You unshared addressbook {addressbook} from group {group}');
131128
} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
132-
$subject = $this->l->t('{actor} unshared addressbook {addressbook} from group {group}');
129+
$subject = $l->t('{actor} unshared addressbook {addressbook} from group {group}');
133130
} else {
134131
throw new \InvalidArgumentException();
135132
}
136133

137-
$parsedParameters = $this->getParameters($event);
134+
$parsedParameters = $this->getParameters($event, $l);
138135
$this->setSubjects($event, $subject, $parsedParameters);
139136

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

155-
protected function getParameters(IEvent $event): array {
152+
protected function getParameters(IEvent $event, IL10N $l): array {
156153
$subject = $event->getSubject();
157154
$parameters = $event->getSubjectParameters();
158155

@@ -168,32 +165,32 @@ protected function getParameters(IEvent $event): array {
168165
case self::SUBJECT_UNSHARE_USER . '_self':
169166
return [
170167
'actor' => $this->generateUserParameter($parameters['actor']),
171-
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
168+
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
172169
];
173170
case self::SUBJECT_SHARE_USER . '_you':
174171
case self::SUBJECT_UNSHARE_USER . '_you':
175172
return [
176-
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
173+
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
177174
'user' => $this->generateUserParameter($parameters['user']),
178175
];
179176
case self::SUBJECT_SHARE_USER . '_by':
180177
case self::SUBJECT_UNSHARE_USER . '_by':
181178
return [
182179
'actor' => $this->generateUserParameter($parameters['actor']),
183-
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
180+
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
184181
'user' => $this->generateUserParameter($parameters['user']),
185182
];
186183
case self::SUBJECT_SHARE_GROUP . '_you':
187184
case self::SUBJECT_UNSHARE_GROUP . '_you':
188185
return [
189-
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
186+
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
190187
'group' => $this->generateGroupParameter($parameters['group']),
191188
];
192189
case self::SUBJECT_SHARE_GROUP . '_by':
193190
case self::SUBJECT_UNSHARE_GROUP . '_by':
194191
return [
195192
'actor' => $this->generateUserParameter($parameters['actor']),
196-
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
193+
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
197194
'group' => $this->generateGroupParameter($parameters['group']),
198195
];
199196
}

‎apps/dav/lib/CardDAV/Activity/Provider/Card.php‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ class Card extends Base {
4343
/** @var IFactory */
4444
protected $languageFactory;
4545

46-
/** @var IL10N */
47-
protected $l;
48-
4946
/** @var IManager */
5047
protected $activityManager;
5148

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

85-
$this->l = $this->languageFactory->get('dav', $language);
82+
$l = $this->languageFactory->get('dav', $language);
8683

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

9390
if ($event->getSubject() === self::SUBJECT_ADD) {
94-
$subject = $this->l->t('{actor} created contact {card} in addressbook {addressbook}');
91+
$subject = $l->t('{actor} created contact {card} in addressbook {addressbook}');
9592
} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
96-
$subject = $this->l->t('You created contact {card} in addressbook {addressbook}');
93+
$subject = $l->t('You created contact {card} in addressbook {addressbook}');
9794
} elseif ($event->getSubject() === self::SUBJECT_DELETE ) {
98-
$subject = $this->l->t('{actor} deleted contact {card} from addressbook {addressbook}');
95+
$subject = $l->t('{actor} deleted contact {card} from addressbook {addressbook}');
9996
} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
100-
$subject = $this->l->t('You deleted contact {card} from addressbook {addressbook}');
97+
$subject = $l->t('You deleted contact {card} from addressbook {addressbook}');
10198
} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
102-
$subject = $this->l->t('{actor} updated contact {card} in addressbook {addressbook}');
99+
$subject = $l->t('{actor} updated contact {card} in addressbook {addressbook}');
103100
} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
104-
$subject = $this->l->t('You updated contact {card} in addressbook {addressbook}');
101+
$subject = $l->t('You updated contact {card} in addressbook {addressbook}');
105102
} else {
106103
throw new \InvalidArgumentException();
107104
}
108105

109-
$parsedParameters = $this->getParameters($event);
106+
$parsedParameters = $this->getParameters($event, $l);
110107
$this->setSubjects($event, $subject, $parsedParameters);
111108

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

116-
protected function getParameters(IEvent $event): array {
113+
protected function getParameters(IEvent $event, IL10N $l): array {
117114
$subject = $event->getSubject();
118115
$parameters = $event->getSubjectParameters();
119116

@@ -123,14 +120,14 @@ protected function getParameters(IEvent $event): array {
123120
case self::SUBJECT_UPDATE:
124121
return [
125122
'actor' => $this->generateUserParameter($parameters['actor']),
126-
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
123+
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
127124
'card' => $this->generateCardParameter($parameters['card']),
128125
];
129126
case self::SUBJECT_ADD . '_self':
130127
case self::SUBJECT_DELETE . '_self':
131128
case self::SUBJECT_UPDATE . '_self':
132129
return [
133-
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $this->l),
130+
'addressbook' => $this->generateAddressbookParameter($parameters['addressbook'], $l),
134131
'card' => $this->generateCardParameter($parameters['card']),
135132
];
136133
}
@@ -143,7 +140,6 @@ private function generateCardParameter(array $cardData): array {
143140
'type' => 'addressbook-contact',
144141
'id' => $cardData['id'],
145142
'name' => $cardData['name'],
146-
147143
];
148144
}
149145
}

‎apps/dav/lib/Listener/AddressbookListener.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php
22

33
declare(strict_types=1);
4-
54
/**
65
* @copyright Copyright (c) 2021 Joas Schilling <coding@schilljs.com>
76
*
@@ -37,7 +36,6 @@
3736
use function sprintf;
3837

3938
class AddressbookListener implements IEventListener {
40-
4139
/** @var ActivityBackend */
4240
private $activityBackend;
4341

‎apps/dav/lib/Listener/CardListener.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php
22

33
declare(strict_types=1);
4-
54
/**
65
* @copyright Copyright (c) 2021 Joas Schilling <coding@schilljs.com>
76
*
@@ -27,7 +26,6 @@
2726

2827
use OCA\DAV\CardDAV\Activity\Provider\Card;
2928
use OCA\DAV\CardDAV\Activity\Backend as ActivityBackend;
30-
use OCA\DAV\CardDAV\CardDavBackend;
3129
use OCA\DAV\Events\CardCreatedEvent;
3230
use OCA\DAV\Events\CardDeletedEvent;
3331
use OCA\DAV\Events\CardUpdatedEvent;
@@ -38,7 +36,6 @@
3836
use function sprintf;
3937

4038
class CardListener implements IEventListener {
41-
4239
/** @var ActivityBackend */
4340
private $activityBackend;
4441

0 commit comments

Comments
 (0)