Skip to content

Commit db8267d

Browse files
nickvergessennickvergessen
committed
Use the new method everywhere
Signed-off-by: Joas Schilling <coding@schilljs.com>
1 parent b997eda commit db8267d

File tree

12 files changed

+106
-200
lines changed

12 files changed

+106
-200
lines changed

‎apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ abstract class AbstractProvider implements INotificationProvider {
5454
protected $logger;
5555

5656
/** @var L10NFactory */
57-
private $l10nFactory;
57+
protected $l10nFactory;
5858

5959
/** @var IL10N[] */
6060
private $l10ns;

‎apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
use OCP\IL10N;
3636
use OCP\ILogger;
3737
use OCP\IURLGenerator;
38-
use OCP\IUser;
3938
use OCP\L10N\IFactory as L10NFactory;
4039
use OCP\Mail\IEMailTemplate;
4140
use OCP\Mail\IMailer;
@@ -349,7 +348,7 @@ private function getEMailAddressesOfAllUsersWithWriteAccessToCalendar(array $use
349348
foreach ($users as $user) {
350349
$emailAddress = $user->getEMailAddress();
351350
if ($emailAddress) {
352-
$lang = $this->getLangForUser($user);
351+
$lang = $this->l10nFactory->getUserLanguage($user);
353352
if ($lang) {
354353
$emailAddresses[$emailAddress] = [
355354
'LANG' => $lang,
@@ -363,14 +362,6 @@ private function getEMailAddressesOfAllUsersWithWriteAccessToCalendar(array $use
363362
return $emailAddresses;
364363
}
365364

366-
/**
367-
* @param IUser $user
368-
* @return string
369-
*/
370-
private function getLangForUser(IUser $user): ?string {
371-
return $this->config->getUserValue($user->getUID(), 'core', 'lang', null);
372-
}
373-
374365
/**
375366
* @param IL10N $l10n
376367
* @param VEvent $vevent

‎apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php‎

Lines changed: 45 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,28 @@
4040
use OCP\Mail\IEMailTemplate;
4141
use OCP\Mail\IMailer;
4242
use OCP\Mail\IMessage;
43+
use PHPUnit\Framework\MockObject\MockObject;
4344
use Sabre\VObject\Component\VCalendar;
4445

4546
class EmailProviderTest extends AbstractNotificationProviderTest {
4647
public const USER_EMAIL = 'frodo@hobb.it';
4748

48-
/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
49+
/** @var ILogger|MockObject */
4950
protected $logger;
5051

51-
/** @var L10NFactory|\PHPUnit\Framework\MockObject\MockObject */
52+
/** @var L10NFactory|MockObject */
5253
protected $l10nFactory;
5354

54-
/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
55+
/** @var IL10N|MockObject */
5556
protected $l10n;
5657

57-
/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
58+
/** @var IURLGenerator|MockObject */
5859
protected $urlGenerator;
5960

60-
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
61+
/** @var IConfig|MockObject */
6162
protected $config;
6263

63-
/** @var IMailer|\PHPUnit\Framework\MockObject\MockObject */
64+
/** @var IMailer|MockObject */
6465
private $mailer;
6566

6667
protected function setUp(): void {
@@ -101,19 +102,6 @@ public function testSendWithoutAttendees():void {
101102

102103
$users = [$user1, $user2, $user3, $user4];
103104

104-
$this->config->expects($this->at(0))
105-
->method('getUserValue')
106-
->with('uid1', 'core', 'lang', null)
107-
->willReturn(null);
108-
$this->config->expects($this->at(1))
109-
->method('getUserValue')
110-
->with('uid2', 'core', 'lang', null)
111-
->willReturn('de');
112-
$this->config->expects($this->at(2))
113-
->method('getUserValue')
114-
->with('uid3', 'core', 'lang', null)
115-
->willReturn('de');
116-
117105
$enL10N = $this->createMock(IL10N::class);
118106
$enL10N->method('t')
119107
->willReturnArgument(0);
@@ -126,30 +114,31 @@ public function testSendWithoutAttendees():void {
126114
$deL10N->method('l')
127115
->willReturnArgument(0);
128116

129-
$this->l10nFactory->expects($this->at(0))
117+
$this->l10nFactory
118+
->method('getUserLanguage')
119+
->willReturnMap([
120+
[$user1, 'en'],
121+
[$user2, 'de'],
122+
[$user3, 'de'],
123+
]);
124+
125+
$this->l10nFactory
130126
->method('findLanguage')
131-
->with()
132127
->willReturn('en');
133128

134-
$this->l10nFactory->expects($this->at(1))
135-
->method('languageExists')
136-
->with('dav', 'en')
137-
->willReturn(true);
138-
139-
$this->l10nFactory->expects($this->at(2))
140-
->method('get')
141-
->with('dav', 'en')
142-
->willReturn($enL10N);
143-
144-
$this->l10nFactory->expects($this->at(3))
129+
$this->l10nFactory
145130
->method('languageExists')
146-
->with('dav', 'de')
147-
->willReturn(true);
131+
->willReturnMap([
132+
['dav', 'en', true],
133+
['dav', 'de', true],
134+
]);
148135

149-
$this->l10nFactory->expects($this->at(4))
136+
$this->l10nFactory
150137
->method('get')
151-
->with('dav', 'de')
152-
->willReturn($deL10N);
138+
->willReturnMap([
139+
['dav', 'en', null, $enL10N],
140+
['dav', 'de', null, $deL10N],
141+
]);
153142

154143
$template1 = $this->getTemplateMock();
155144
$message11 = $this->getMessageMock('uid1@example.com', $template1);
@@ -223,19 +212,6 @@ public function testSendWithAttendees(): void {
223212

224213
$users = [$user1, $user2, $user3, $user4];
225214

226-
$this->config->expects($this->at(0))
227-
->method('getUserValue')
228-
->with('uid1', 'core', 'lang', null)
229-
->willReturn(null);
230-
$this->config->expects($this->at(1))
231-
->method('getUserValue')
232-
->with('uid2', 'core', 'lang', null)
233-
->willReturn('de');
234-
$this->config->expects($this->at(2))
235-
->method('getUserValue')
236-
->with('uid3', 'core', 'lang', null)
237-
->willReturn('de');
238-
239215
$enL10N = $this->createMock(IL10N::class);
240216
$enL10N->method('t')
241217
->willReturnArgument(0);
@@ -248,30 +224,31 @@ public function testSendWithAttendees(): void {
248224
$deL10N->method('l')
249225
->willReturnArgument(0);
250226

251-
$this->l10nFactory->expects($this->at(0))
227+
$this->l10nFactory
228+
->method('getUserLanguage')
229+
->willReturnMap([
230+
[$user1, 'en'],
231+
[$user2, 'de'],
232+
[$user3, 'de'],
233+
]);
234+
235+
$this->l10nFactory
252236
->method('findLanguage')
253-
->with()
254237
->willReturn('en');
255238

256-
$this->l10nFactory->expects($this->at(1))
257-
->method('languageExists')
258-
->with('dav', 'de')
259-
->willReturn(true);
260-
261-
$this->l10nFactory->expects($this->at(2))
262-
->method('get')
263-
->with('dav', 'de')
264-
->willReturn($enL10N);
265-
266-
$this->l10nFactory->expects($this->at(3))
239+
$this->l10nFactory
267240
->method('languageExists')
268-
->with('dav', 'en')
269-
->willReturn(true);
241+
->willReturnMap([
242+
['dav', 'en', true],
243+
['dav', 'de', true],
244+
]);
270245

271-
$this->l10nFactory->expects($this->at(4))
246+
$this->l10nFactory
272247
->method('get')
273-
->with('dav', 'en')
274-
->willReturn($deL10N);
248+
->willReturnMap([
249+
['dav', 'en', null, $enL10N],
250+
['dav', 'de', null, $deL10N],
251+
]);
275252

276253
$template1 = $this->getTemplateMock();
277254
$message11 = $this->getMessageMock('foo1@example.org', $template1);

‎apps/provisioning_api/lib/Controller/AUserData.php‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
use OCP\IRequest;
4545
use OCP\IUserManager;
4646
use OCP\IUserSession;
47+
use OCP\L10N\IFactory;
4748
use OCP\User\Backend\ISetDisplayNameBackend;
4849
use OCP\User\Backend\ISetPasswordBackend;
4950

@@ -59,30 +60,25 @@ abstract class AUserData extends OCSController {
5960
protected $userSession;
6061
/** @var AccountManager */
6162
protected $accountManager;
63+
/** @var IFactory */
64+
protected $l10nFactory;
6265

63-
/**
64-
* @param string $appName
65-
* @param IRequest $request
66-
* @param IUserManager $userManager
67-
* @param IConfig $config
68-
* @param IGroupManager $groupManager
69-
* @param IUserSession $userSession
70-
* @param AccountManager $accountManager
71-
*/
7266
public function __construct(string $appName,
7367
IRequest $request,
7468
IUserManager $userManager,
7569
IConfig $config,
7670
IGroupManager $groupManager,
7771
IUserSession $userSession,
78-
AccountManager $accountManager) {
72+
AccountManager $accountManager,
73+
IFactory $l10nFactory) {
7974
parent::__construct($appName, $request);
8075

8176
$this->userManager = $userManager;
8277
$this->config = $config;
8378
$this->groupManager = $groupManager;
8479
$this->userSession = $userSession;
8580
$this->accountManager = $accountManager;
81+
$this->l10nFactory = $l10nFactory;
8682
}
8783

8884
/**
@@ -146,7 +142,7 @@ protected function getUserData(string $userId): array {
146142
$data[AccountManager::PROPERTY_WEBSITE] = $userAccount[AccountManager::PROPERTY_WEBSITE]['value'];
147143
$data[AccountManager::PROPERTY_TWITTER] = $userAccount[AccountManager::PROPERTY_TWITTER]['value'];
148144
$data['groups'] = $gids;
149-
$data['language'] = $this->config->getSystemValue('force_language', $this->config->getUserValue($targetUserObject->getUID(), 'core', 'lang'));
145+
$data['language'] = $this->l10nFactory->getUserLanguage($targetUserObject);
150146
$data['locale'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'locale');
151147

152148
$backend = $targetUserObject->getBackend();

‎apps/provisioning_api/lib/Controller/GroupsController.php‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,38 +47,31 @@
4747
use OCP\IUser;
4848
use OCP\IUserManager;
4949
use OCP\IUserSession;
50+
use OCP\L10N\IFactory;
5051

5152
class GroupsController extends AUserData {
5253

5354
/** @var ILogger */
5455
private $logger;
5556

56-
/**
57-
* @param string $appName
58-
* @param IRequest $request
59-
* @param IUserManager $userManager
60-
* @param IConfig $config
61-
* @param IGroupManager $groupManager
62-
* @param IUserSession $userSession
63-
* @param AccountManager $accountManager
64-
* @param ILogger $logger
65-
* @param UsersController $userController
66-
*/
6757
public function __construct(string $appName,
6858
IRequest $request,
6959
IUserManager $userManager,
7060
IConfig $config,
7161
IGroupManager $groupManager,
7262
IUserSession $userSession,
7363
AccountManager $accountManager,
64+
IFactory $l10nFactory,
7465
ILogger $logger) {
7566
parent::__construct($appName,
7667
$request,
7768
$userManager,
7869
$config,
7970
$groupManager,
8071
$userSession,
81-
$accountManager);
72+
$accountManager,
73+
$l10nFactory
74+
);
8275

8376
$this->logger = $logger;
8477
}

‎apps/provisioning_api/lib/Controller/UsersController.php‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class UsersController extends AUserData {
6767
/** @var ILogger */
6868
private $logger;
6969
/** @var IFactory */
70-
private $l10nFactory;
70+
protected $l10nFactory;
7171
/** @var NewUserMailHelper */
7272
private $newUserMailHelper;
7373
/** @var FederatedFileSharingFactory */
@@ -77,21 +77,6 @@ class UsersController extends AUserData {
7777
/** @var RemoteWipe */
7878
private $remoteWipe;
7979

80-
/**
81-
* @param string $appName
82-
* @param IRequest $request
83-
* @param IUserManager $userManager
84-
* @param IConfig $config
85-
* @param IAppManager $appManager
86-
* @param IGroupManager $groupManager
87-
* @param IUserSession $userSession
88-
* @param AccountManager $accountManager
89-
* @param ILogger $logger
90-
* @param IFactory $l10nFactory
91-
* @param NewUserMailHelper $newUserMailHelper
92-
* @param FederatedFileSharingFactory $federatedFileSharingFactory
93-
* @param ISecureRandom $secureRandom
94-
*/
9580
public function __construct(string $appName,
9681
IRequest $request,
9782
IUserManager $userManager,
@@ -112,7 +97,8 @@ public function __construct(string $appName,
11297
$config,
11398
$groupManager,
11499
$userSession,
115-
$accountManager);
100+
$accountManager,
101+
$l10nFactory);
116102

117103
$this->appManager = $appManager;
118104
$this->logger = $logger;

‎apps/provisioning_api/tests/Controller/GroupsControllerTest.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
use OCP\IUser;
4242
use OCP\IUserManager;
4343
use OCP\IUserSession;
44+
use OCP\L10N\IFactory;
4445
use OCP\UserInterface;
4546

4647
class GroupsControllerTest extends \Test\TestCase {
@@ -75,6 +76,7 @@ protected function setUp(): void {
7576
$this->groupManager = $this->createMock(Manager::class);
7677
$this->userSession = $this->createMock(IUserSession::class);
7778
$this->accountManager = $this->createMock(AccountManager::class);
79+
$this->l10nFactory = $this->createMock(IFactory::class);
7880
$this->logger = $this->createMock(ILogger::class);
7981

8082
$this->subAdminManager = $this->createMock(SubAdmin::class);
@@ -92,6 +94,7 @@ protected function setUp(): void {
9294
$this->groupManager,
9395
$this->userSession,
9496
$this->accountManager,
97+
$this->l10nFactory,
9598
$this->logger
9699
])
97100
->setMethods(['fillStorageInfo'])

0 commit comments

Comments
 (0)