Skip to content

Commit 8033655

Browse files
ChristophWurstChristophWurst
committed
Migrate encryption to the PSR container
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
1 parent 678ef84 commit 8033655

1 file changed

Lines changed: 77 additions & 74 deletions

File tree

‎apps/encryption/lib/AppInfo/Application.php‎

Lines changed: 77 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@
4444
use OCA\Encryption\Session;
4545
use OCA\Encryption\Users\Setup;
4646
use OCA\Encryption\Util;
47-
use OCP\AppFramework\IAppContainer;
4847
use OCP\Encryption\IManager;
4948
use OCP\IConfig;
49+
use OCP\IServerContainer;
50+
use Psr\Container\ContainerInterface;
5051
use Symfony\Component\Console\Helper\QuestionHelper;
5152

5253
class Application extends \OCP\AppFramework\App {
@@ -127,137 +128,139 @@ function () use ($container) {
127128
public function registerServices() {
128129
$container = $this->getContainer();
129130

130-
$container->registerService('Crypt',
131-
function (IAppContainer $c) {
132-
$server = $c->getServer();
133-
return new Crypt($server->getLogger(),
131+
$container->registerService('Crypt', function (ContainerInterface $c) {
132+
/** @var IServerContainer $server */
133+
$server = $c->get(IServerContainer::class);
134+
return new Crypt($server->getLogger(),
134135
$server->getUserSession(),
135136
$server->getConfig(),
136-
$server->getL10N($c->getAppName()));
137-
});
137+
$server->getL10N($c->get('AppName')));
138+
});
138139

139-
$container->registerService('Session',
140-
function (IAppContainer $c) {
141-
$server = $c->getServer();
142-
return new Session($server->getSession());
143-
}
140+
$container->registerService('Session', function (ContainerInterface $c) {
141+
/** @var IServerContainer $server */
142+
$server = $c->get(IServerContainer::class);
143+
return new Session($server->getSession());
144+
}
144145
);
145146

146-
$container->registerService('KeyManager',
147-
function (IAppContainer $c) {
148-
$server = $c->getServer();
147+
$container->registerService('KeyManager', function (ContainerInterface $c) {
148+
/** @var IServerContainer $server */
149+
$server = $c->get(IServerContainer::class);
149150

150-
return new KeyManager($server->getEncryptionKeyStorage(),
151-
$c->query('Crypt'),
151+
return new KeyManager($server->getEncryptionKeyStorage(),
152+
$c->get('Crypt'),
152153
$server->getConfig(),
153154
$server->getUserSession(),
154155
new Session($server->getSession()),
155156
$server->getLogger(),
156-
$c->query('Util'),
157+
$c->get('Util'),
157158
$server->getLockingProvider()
158159
);
159-
});
160+
});
160161

161-
$container->registerService('Recovery',
162-
function (IAppContainer $c) {
163-
$server = $c->getServer();
162+
$container->registerService('Recovery', function (ContainerInterface $c) {
163+
/** @var IServerContainer $server */
164+
$server = $c->get(IServerContainer::class);
164165

165-
return new Recovery(
166+
return new Recovery(
166167
$server->getUserSession(),
167-
$c->query('Crypt'),
168-
$c->query('KeyManager'),
168+
$c->get('Crypt'),
169+
$c->get('KeyManager'),
169170
$server->getConfig(),
170171
$server->getEncryptionFilesHelper(),
171172
new View());
172-
});
173+
});
173174

174-
$container->registerService('RecoveryController', function (IAppContainer $c) {
175-
$server = $c->getServer();
175+
$container->registerService('RecoveryController', function (ContainerInterface $c) {
176+
/** @var IServerContainer $server */
177+
$server = $c->get(IServerContainer::class);
176178
return new RecoveryController(
177-
$c->getAppName(),
179+
$c->get('AppName'),
178180
$server->getRequest(),
179181
$server->getConfig(),
180-
$server->getL10N($c->getAppName()),
181-
$c->query('Recovery'));
182+
$server->getL10N($c->get('AppName')),
183+
$c->get('Recovery'));
182184
});
183185

184-
$container->registerService('StatusController', function (IAppContainer $c) {
185-
$server = $c->getServer();
186+
$container->registerService('StatusController', function (ContainerInterface $c) {
187+
/** @var IServerContainer $server */
188+
$server = $c->get(IServerContainer::class);
186189
return new StatusController(
187-
$c->getAppName(),
190+
$c->get('AppName'),
188191
$server->getRequest(),
189-
$server->getL10N($c->getAppName()),
190-
$c->query('Session'),
192+
$server->getL10N($c->get('AppName')),
193+
$c->get('Session'),
191194
$server->getEncryptionManager()
192195
);
193196
});
194197

195-
$container->registerService('SettingsController', function (IAppContainer $c) {
196-
$server = $c->getServer();
198+
$container->registerService('SettingsController', function (ContainerInterface $c) {
199+
/** @var IServerContainer $server */
200+
$server = $c->get(IServerContainer::class);
197201
return new SettingsController(
198-
$c->getAppName(),
202+
$c->get('AppName'),
199203
$server->getRequest(),
200-
$server->getL10N($c->getAppName()),
204+
$server->getL10N($c->get('AppName')),
201205
$server->getUserManager(),
202206
$server->getUserSession(),
203-
$c->query('KeyManager'),
204-
$c->query('Crypt'),
205-
$c->query('Session'),
207+
$c->get('KeyManager'),
208+
$c->get('Crypt'),
209+
$c->get('Session'),
206210
$server->getSession(),
207-
$c->query('Util')
211+
$c->get('Util')
208212
);
209213
});
210214

211-
$container->registerService('UserSetup',
212-
function (IAppContainer $c) {
213-
$server = $c->getServer();
214-
return new Setup($server->getLogger(),
215+
$container->registerService('UserSetup', function (ContainerInterface $c) {
216+
/** @var IServerContainer $server */
217+
$server = $c->get(IServerContainer::class);
218+
return new Setup($server->getLogger(),
215219
$server->getUserSession(),
216-
$c->query('Crypt'),
217-
$c->query('KeyManager'));
218-
});
220+
$c->get('Crypt'),
221+
$c->get('KeyManager'));
222+
});
219223

220-
$container->registerService('Util',
221-
function (IAppContainer $c) {
222-
$server = $c->getServer();
224+
$container->registerService('Util', function (ContainerInterface $c) {
225+
/** @var IServerContainer $server */
226+
$server = $c->get(IServerContainer::class);
223227

224-
return new Util(
228+
return new Util(
225229
new View(),
226-
$c->query('Crypt'),
230+
$c->get('Crypt'),
227231
$server->getLogger(),
228232
$server->getUserSession(),
229233
$server->getConfig(),
230234
$server->getUserManager());
231-
});
235+
});
232236

233-
$container->registerService('EncryptAll',
234-
function (IAppContainer $c) {
235-
$server = $c->getServer();
236-
return new EncryptAll(
237-
$c->query('UserSetup'),
238-
$c->getServer()->getUserManager(),
237+
$container->registerService('EncryptAll', function (ContainerInterface $c) {
238+
/** @var IServerContainer $server */
239+
$server = $c->get(IServerContainer::class);
240+
return new EncryptAll(
241+
$c->get('UserSetup'),
242+
$server->getUserManager(),
239243
new View(),
240-
$c->query('KeyManager'),
241-
$c->query('Util'),
244+
$c->get('KeyManager'),
245+
$c->get('Util'),
242246
$server->getConfig(),
243247
$server->getMailer(),
244248
$server->getL10N('encryption'),
245249
new QuestionHelper(),
246250
$server->getSecureRandom()
247251
);
248-
}
252+
}
249253
);
250254

251-
$container->registerService('DecryptAll',
252-
function (IAppContainer $c) {
253-
return new DecryptAll(
254-
$c->query('Util'),
255-
$c->query('KeyManager'),
256-
$c->query('Crypt'),
257-
$c->query('Session'),
255+
$container->registerService('DecryptAll',function (ContainerInterface $c) {
256+
return new DecryptAll(
257+
$c->get('Util'),
258+
$c->get('KeyManager'),
259+
$c->get('Crypt'),
260+
$c->get('Session'),
258261
new QuestionHelper()
259262
);
260-
}
263+
}
261264
);
262265
}
263266
}

0 commit comments

Comments
 (0)