|
@@ -263,10 +263,10 @@ discard block |
|
|
block discarded – undo |
|
263
|
263
|
$this->registerParameter('isCLI', \OC::$CLI); |
|
264
|
264
|
$this->registerParameter('serverRoot', \OC::$SERVERROOT); |
|
265
|
265
|
|
|
266
|
|
- $this->registerService(ContainerInterface::class, function (ContainerInterface $c) { |
|
|
266
|
+ $this->registerService(ContainerInterface::class, function(ContainerInterface $c) { |
|
267
|
267
|
return $c; |
|
268
|
268
|
}); |
|
269
|
|
- $this->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) { |
|
|
269
|
+ $this->registerService(\OCP\IServerContainer::class, function(ContainerInterface $c) { |
|
270
|
270
|
return $c; |
|
271
|
271
|
}); |
|
272
|
272
|
|
|
@@ -291,7 +291,7 @@ discard block |
|
|
block discarded – undo |
|
291
|
291
|
$this->registerAlias(IActionFactory::class, ActionFactory::class); |
|
292
|
292
|
|
|
293
|
293
|
|
|
294
|
|
- $this->registerService(IPreview::class, function (ContainerInterface $c) { |
|
|
294
|
+ $this->registerService(IPreview::class, function(ContainerInterface $c) { |
|
295
|
295
|
return new PreviewManager( |
|
296
|
296
|
$c->get(\OCP\IConfig::class), |
|
297
|
297
|
$c->get(IRootFolder::class), |
|
@@ -307,7 +307,7 @@ discard block |
|
|
block discarded – undo |
|
307
|
307
|
/** @deprecated 19.0.0 */ |
|
308
|
308
|
$this->registerDeprecatedAlias('PreviewManager', IPreview::class); |
|
309
|
309
|
|
|
310
|
|
- $this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) { |
|
|
310
|
+ $this->registerService(\OC\Preview\Watcher::class, function(ContainerInterface $c) { |
|
311
|
311
|
return new \OC\Preview\Watcher( |
|
312
|
312
|
new \OC\Preview\Storage\Root( |
|
313
|
313
|
$c->get(IRootFolder::class), |
|
@@ -316,7 +316,7 @@ discard block |
|
|
block discarded – undo |
|
316
|
316
|
); |
|
317
|
317
|
}); |
|
318
|
318
|
|
|
319
|
|
- $this->registerService(\OCP\Encryption\IManager::class, function (Server $c) { |
|
|
319
|
+ $this->registerService(\OCP\Encryption\IManager::class, function(Server $c) { |
|
320
|
320
|
$view = new View(); |
|
321
|
321
|
$util = new Encryption\Util( |
|
322
|
322
|
$view, |
|
@@ -338,7 +338,7 @@ discard block |
|
|
block discarded – undo |
|
338
|
338
|
|
|
339
|
339
|
/** @deprecated 21.0.0 */ |
|
340
|
340
|
$this->registerDeprecatedAlias('EncryptionFileHelper', IFile::class); |
|
341
|
|
- $this->registerService(IFile::class, function (ContainerInterface $c) { |
|
|
341
|
+ $this->registerService(IFile::class, function(ContainerInterface $c) { |
|
342
|
342
|
$util = new Encryption\Util( |
|
343
|
343
|
new View(), |
|
344
|
344
|
$c->get(IUserManager::class), |
|
@@ -354,7 +354,7 @@ discard block |
|
|
block discarded – undo |
|
354
|
354
|
|
|
355
|
355
|
/** @deprecated 21.0.0 */ |
|
356
|
356
|
$this->registerDeprecatedAlias('EncryptionKeyStorage', IStorage::class); |
|
357
|
|
- $this->registerService(IStorage::class, function (ContainerInterface $c) { |
|
|
357
|
+ $this->registerService(IStorage::class, function(ContainerInterface $c) { |
|
358
|
358
|
$view = new View(); |
|
359
|
359
|
$util = new Encryption\Util( |
|
360
|
360
|
$view, |
|
@@ -377,22 +377,22 @@ discard block |
|
|
block discarded – undo |
|
377
|
377
|
/** @deprecated 19.0.0 */ |
|
378
|
378
|
$this->registerDeprecatedAlias('TagManager', \OCP\ITagManager::class); |
|
379
|
379
|
|
|
380
|
|
- $this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) { |
|
|
380
|
+ $this->registerService('SystemTagManagerFactory', function(ContainerInterface $c) { |
|
381
|
381
|
/** @var \OCP\IConfig $config */ |
|
382
|
382
|
$config = $c->get(\OCP\IConfig::class); |
|
383
|
383
|
$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class); |
|
384
|
384
|
return new $factoryClass($this); |
|
385
|
385
|
}); |
|
386
|
|
- $this->registerService(ISystemTagManager::class, function (ContainerInterface $c) { |
|
|
386
|
+ $this->registerService(ISystemTagManager::class, function(ContainerInterface $c) { |
|
387
|
387
|
return $c->get('SystemTagManagerFactory')->getManager(); |
|
388
|
388
|
}); |
|
389
|
389
|
/** @deprecated 19.0.0 */ |
|
390
|
390
|
$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class); |
|
391
|
391
|
|
|
392
|
|
- $this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) { |
|
|
392
|
+ $this->registerService(ISystemTagObjectMapper::class, function(ContainerInterface $c) { |
|
393
|
393
|
return $c->get('SystemTagManagerFactory')->getObjectMapper(); |
|
394
|
394
|
}); |
|
395
|
|
- $this->registerService('RootFolder', function (ContainerInterface $c) { |
|
|
395
|
+ $this->registerService('RootFolder', function(ContainerInterface $c) { |
|
396
|
396
|
$manager = \OC\Files\Filesystem::getMountManager(null); |
|
397
|
397
|
$view = new View(); |
|
398
|
398
|
$root = new Root( |
|
@@ -412,7 +412,7 @@ discard block |
|
|
block discarded – undo |
|
412
|
412
|
|
|
413
|
413
|
return $root; |
|
414
|
414
|
}); |
|
415
|
|
- $this->registerService(HookConnector::class, function (ContainerInterface $c) { |
|
|
415
|
+ $this->registerService(HookConnector::class, function(ContainerInterface $c) { |
|
416
|
416
|
return new HookConnector( |
|
417
|
417
|
$c->get(IRootFolder::class), |
|
418
|
418
|
new View(), |
|
@@ -424,8 +424,8 @@ discard block |
|
|
block discarded – undo |
|
424
|
424
|
/** @deprecated 19.0.0 */ |
|
425
|
425
|
$this->registerDeprecatedAlias('SystemTagObjectMapper', ISystemTagObjectMapper::class); |
|
426
|
426
|
|
|
427
|
|
- $this->registerService(IRootFolder::class, function (ContainerInterface $c) { |
|
428
|
|
- return new LazyRoot(function () use ($c) { |
|
|
427
|
+ $this->registerService(IRootFolder::class, function(ContainerInterface $c) { |
|
|
428
|
+ return new LazyRoot(function() use ($c) { |
|
429
|
429
|
return $c->get('RootFolder'); |
|
430
|
430
|
}); |
|
431
|
431
|
}); |
|
@@ -436,44 +436,44 @@ discard block |
|
|
block discarded – undo |
|
436
|
436
|
$this->registerDeprecatedAlias('UserManager', \OC\User\Manager::class); |
|
437
|
437
|
$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class); |
|
438
|
438
|
|
|
439
|
|
- $this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) { |
|
|
439
|
+ $this->registerService(\OCP\IGroupManager::class, function(ContainerInterface $c) { |
|
440
|
440
|
$groupManager = new \OC\Group\Manager($this->get(IUserManager::class), $c->get(SymfonyAdapter::class), $this->get(ILogger::class)); |
|
441
|
|
- $groupManager->listen('\OC\Group', 'preCreate', function ($gid) { |
|
|
441
|
+ $groupManager->listen('\OC\Group', 'preCreate', function($gid) { |
|
442
|
442
|
/** @var IEventDispatcher $dispatcher */ |
|
443
|
443
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
444
|
444
|
$dispatcher->dispatchTyped(new BeforeGroupCreatedEvent($gid)); |
|
445
|
445
|
}); |
|
446
|
|
- $groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $group) { |
|
|
446
|
+ $groupManager->listen('\OC\Group', 'postCreate', function(\OC\Group\Group $group) { |
|
447
|
447
|
/** @var IEventDispatcher $dispatcher */ |
|
448
|
448
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
449
|
449
|
$dispatcher->dispatchTyped(new GroupCreatedEvent($group)); |
|
450
|
450
|
}); |
|
451
|
|
- $groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) { |
|
|
451
|
+ $groupManager->listen('\OC\Group', 'preDelete', function(\OC\Group\Group $group) { |
|
452
|
452
|
/** @var IEventDispatcher $dispatcher */ |
|
453
|
453
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
454
|
454
|
$dispatcher->dispatchTyped(new BeforeGroupDeletedEvent($group)); |
|
455
|
455
|
}); |
|
456
|
|
- $groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) { |
|
|
456
|
+ $groupManager->listen('\OC\Group', 'postDelete', function(\OC\Group\Group $group) { |
|
457
|
457
|
/** @var IEventDispatcher $dispatcher */ |
|
458
|
458
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
459
|
459
|
$dispatcher->dispatchTyped(new GroupDeletedEvent($group)); |
|
460
|
460
|
}); |
|
461
|
|
- $groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) { |
|
|
461
|
+ $groupManager->listen('\OC\Group', 'preAddUser', function(\OC\Group\Group $group, \OC\User\User $user) { |
|
462
|
462
|
/** @var IEventDispatcher $dispatcher */ |
|
463
|
463
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
464
|
464
|
$dispatcher->dispatchTyped(new BeforeUserAddedEvent($group, $user)); |
|
465
|
465
|
}); |
|
466
|
|
- $groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) { |
|
|
466
|
+ $groupManager->listen('\OC\Group', 'postAddUser', function(\OC\Group\Group $group, \OC\User\User $user) { |
|
467
|
467
|
/** @var IEventDispatcher $dispatcher */ |
|
468
|
468
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
469
|
469
|
$dispatcher->dispatchTyped(new UserAddedEvent($group, $user)); |
|
470
|
470
|
}); |
|
471
|
|
- $groupManager->listen('\OC\Group', 'preRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) { |
|
|
471
|
+ $groupManager->listen('\OC\Group', 'preRemoveUser', function(\OC\Group\Group $group, \OC\User\User $user) { |
|
472
|
472
|
/** @var IEventDispatcher $dispatcher */ |
|
473
|
473
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
474
|
474
|
$dispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $user)); |
|
475
|
475
|
}); |
|
476
|
|
- $groupManager->listen('\OC\Group', 'postRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) { |
|
|
476
|
+ $groupManager->listen('\OC\Group', 'postRemoveUser', function(\OC\Group\Group $group, \OC\User\User $user) { |
|
477
|
477
|
/** @var IEventDispatcher $dispatcher */ |
|
478
|
478
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
479
|
479
|
$dispatcher->dispatchTyped(new UserRemovedEvent($group, $user)); |
|
@@ -483,7 +483,7 @@ discard block |
|
|
block discarded – undo |
|
483
|
483
|
/** @deprecated 19.0.0 */ |
|
484
|
484
|
$this->registerDeprecatedAlias('GroupManager', \OCP\IGroupManager::class); |
|
485
|
485
|
|
|
486
|
|
- $this->registerService(Store::class, function (ContainerInterface $c) { |
|
|
486
|
+ $this->registerService(Store::class, function(ContainerInterface $c) { |
|
487
|
487
|
$session = $c->get(ISession::class); |
|
488
|
488
|
if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) { |
|
489
|
489
|
$tokenProvider = $c->get(IProvider::class); |
|
@@ -496,7 +496,7 @@ discard block |
|
|
block discarded – undo |
|
496
|
496
|
$this->registerAlias(IStore::class, Store::class); |
|
497
|
497
|
$this->registerAlias(IProvider::class, Authentication\Token\Manager::class); |
|
498
|
498
|
|
|
499
|
|
- $this->registerService(\OC\User\Session::class, function (Server $c) { |
|
|
499
|
+ $this->registerService(\OC\User\Session::class, function(Server $c) { |
|
500
|
500
|
$manager = $c->get(IUserManager::class); |
|
501
|
501
|
$session = new \OC\Session\Memory(''); |
|
502
|
502
|
$timeFactory = new TimeFactory(); |
|
@@ -521,18 +521,18 @@ discard block |
|
|
block discarded – undo |
|
521
|
521
|
$c->get(ILogger::class), |
|
522
|
522
|
$c->get(IEventDispatcher::class) |
|
523
|
523
|
); |
|
524
|
|
- $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) { |
|
|
524
|
+ $userSession->listen('\OC\User', 'preCreateUser', function($uid, $password) { |
|
525
|
525
|
\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]); |
|
526
|
526
|
|
|
527
|
527
|
/** @var IEventDispatcher $dispatcher */ |
|
528
|
528
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
529
|
529
|
$dispatcher->dispatchTyped(new BeforeUserCreatedEvent($uid, $password)); |
|
530
|
530
|
}); |
|
531
|
|
- $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) { |
|
|
531
|
+ $userSession->listen('\OC\User', 'postCreateUser', function($user, $password) { |
|
532
|
532
|
/** @var \OC\User\User $user */ |
|
533
|
533
|
\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]); |
|
534
|
534
|
}); |
|
535
|
|
- $userSession->listen('\OC\User', 'preDelete', function ($user) use ($legacyDispatcher) { |
|
|
535
|
+ $userSession->listen('\OC\User', 'preDelete', function($user) use ($legacyDispatcher) { |
|
536
|
536
|
/** @var \OC\User\User $user */ |
|
537
|
537
|
\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]); |
|
538
|
538
|
$legacyDispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user)); |
|
@@ -541,7 +541,7 @@ discard block |
|
|
block discarded – undo |
|
541
|
541
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
542
|
542
|
$dispatcher->dispatchTyped(new BeforeUserDeletedEvent($user)); |
|
543
|
543
|
}); |
|
544
|
|
- $userSession->listen('\OC\User', 'postDelete', function ($user) { |
|
|
544
|
+ $userSession->listen('\OC\User', 'postDelete', function($user) { |
|
545
|
545
|
/** @var \OC\User\User $user */ |
|
546
|
546
|
\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]); |
|
547
|
547
|
|
|
@@ -549,7 +549,7 @@ discard block |
|
|
block discarded – undo |
|
549
|
549
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
550
|
550
|
$dispatcher->dispatchTyped(new UserDeletedEvent($user)); |
|
551
|
551
|
}); |
|
552
|
|
- $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) { |
|
|
552
|
+ $userSession->listen('\OC\User', 'preSetPassword', function($user, $password, $recoveryPassword) { |
|
553
|
553
|
/** @var \OC\User\User $user */ |
|
554
|
554
|
\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]); |
|
555
|
555
|
|
|
@@ -557,7 +557,7 @@ discard block |
|
|
block discarded – undo |
|
557
|
557
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
558
|
558
|
$dispatcher->dispatchTyped(new BeforePasswordUpdatedEvent($user, $password, $recoveryPassword)); |
|
559
|
559
|
}); |
|
560
|
|
- $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) { |
|
|
560
|
+ $userSession->listen('\OC\User', 'postSetPassword', function($user, $password, $recoveryPassword) { |
|
561
|
561
|
/** @var \OC\User\User $user */ |
|
562
|
562
|
\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]); |
|
563
|
563
|
|
|
@@ -565,14 +565,14 @@ discard block |
|
|
block discarded – undo |
|
565
|
565
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
566
|
566
|
$dispatcher->dispatchTyped(new PasswordUpdatedEvent($user, $password, $recoveryPassword)); |
|
567
|
567
|
}); |
|
568
|
|
- $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) { |
|
|
568
|
+ $userSession->listen('\OC\User', 'preLogin', function($uid, $password) { |
|
569
|
569
|
\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]); |
|
570
|
570
|
|
|
571
|
571
|
/** @var IEventDispatcher $dispatcher */ |
|
572
|
572
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
573
|
573
|
$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password)); |
|
574
|
574
|
}); |
|
575
|
|
- $userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) { |
|
|
575
|
+ $userSession->listen('\OC\User', 'postLogin', function($user, $loginName, $password, $isTokenLogin) { |
|
576
|
576
|
/** @var \OC\User\User $user */ |
|
577
|
577
|
\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]); |
|
578
|
578
|
|
|
@@ -580,12 +580,12 @@ discard block |
|
|
block discarded – undo |
|
580
|
580
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
581
|
581
|
$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $password, $isTokenLogin)); |
|
582
|
582
|
}); |
|
583
|
|
- $userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) { |
|
|
583
|
+ $userSession->listen('\OC\User', 'preRememberedLogin', function($uid) { |
|
584
|
584
|
/** @var IEventDispatcher $dispatcher */ |
|
585
|
585
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
586
|
586
|
$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid)); |
|
587
|
587
|
}); |
|
588
|
|
- $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) { |
|
|
588
|
+ $userSession->listen('\OC\User', 'postRememberedLogin', function($user, $password) { |
|
589
|
589
|
/** @var \OC\User\User $user */ |
|
590
|
590
|
\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]); |
|
591
|
591
|
|
|
@@ -593,19 +593,19 @@ discard block |
|
|
block discarded – undo |
|
593
|
593
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
594
|
594
|
$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password)); |
|
595
|
595
|
}); |
|
596
|
|
- $userSession->listen('\OC\User', 'logout', function ($user) { |
|
|
596
|
+ $userSession->listen('\OC\User', 'logout', function($user) { |
|
597
|
597
|
\OC_Hook::emit('OC_User', 'logout', []); |
|
598
|
598
|
|
|
599
|
599
|
/** @var IEventDispatcher $dispatcher */ |
|
600
|
600
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
601
|
601
|
$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user)); |
|
602
|
602
|
}); |
|
603
|
|
- $userSession->listen('\OC\User', 'postLogout', function ($user) { |
|
|
603
|
+ $userSession->listen('\OC\User', 'postLogout', function($user) { |
|
604
|
604
|
/** @var IEventDispatcher $dispatcher */ |
|
605
|
605
|
$dispatcher = $this->get(IEventDispatcher::class); |
|
606
|
606
|
$dispatcher->dispatchTyped(new UserLoggedOutEvent($user)); |
|
607
|
607
|
}); |
|
608
|
|
- $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) { |
|
|
608
|
+ $userSession->listen('\OC\User', 'changeUser', function($user, $feature, $value, $oldValue) { |
|
609
|
609
|
/** @var \OC\User\User $user */ |
|
610
|
610
|
\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]); |
|
611
|
611
|
|
|
@@ -629,7 +629,7 @@ discard block |
|
|
block discarded – undo |
|
629
|
629
|
$this->registerDeprecatedAlias('AllConfig', \OC\AllConfig::class); |
|
630
|
630
|
$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class); |
|
631
|
631
|
|
|
632
|
|
- $this->registerService(\OC\SystemConfig::class, function ($c) use ($config) { |
|
|
632
|
+ $this->registerService(\OC\SystemConfig::class, function($c) use ($config) { |
|
633
|
633
|
return new \OC\SystemConfig($config); |
|
634
|
634
|
}); |
|
635
|
635
|
/** @deprecated 19.0.0 */ |
|
@@ -639,7 +639,7 @@ discard block |
|
|
block discarded – undo |
|
639
|
639
|
$this->registerDeprecatedAlias('AppConfig', \OC\AppConfig::class); |
|
640
|
640
|
$this->registerAlias(IAppConfig::class, \OC\AppConfig::class); |
|
641
|
641
|
|
|
642
|
|
- $this->registerService(IFactory::class, function (Server $c) { |
|
|
642
|
+ $this->registerService(IFactory::class, function(Server $c) { |
|
643
|
643
|
return new \OC\L10N\Factory( |
|
644
|
644
|
$c->get(\OCP\IConfig::class), |
|
645
|
645
|
$c->getRequest(), |
|
@@ -659,13 +659,13 @@ discard block |
|
|
block discarded – undo |
|
659
|
659
|
/** @deprecated 19.0.0 */ |
|
660
|
660
|
$this->registerDeprecatedAlias('CategoryFetcher', CategoryFetcher::class); |
|
661
|
661
|
|
|
662
|
|
- $this->registerService(ICache::class, function ($c) { |
|
|
662
|
+ $this->registerService(ICache::class, function($c) { |
|
663
|
663
|
return new Cache\File(); |
|
664
|
664
|
}); |
|
665
|
665
|
/** @deprecated 19.0.0 */ |
|
666
|
666
|
$this->registerDeprecatedAlias('UserCache', ICache::class); |
|
667
|
667
|
|
|
668
|
|
- $this->registerService(Factory::class, function (Server $c) { |
|
|
668
|
+ $this->registerService(Factory::class, function(Server $c) { |
|
669
|
669
|
$arrayCacheFactory = new \OC\Memcache\Factory('', $c->get(ILogger::class), |
|
670
|
670
|
ArrayCache::class, |
|
671
|
671
|
ArrayCache::class, |
|
@@ -680,7 +680,7 @@ discard block |
|
|
block discarded – undo |
|
680
|
680
|
$version = implode(',', $v); |
|
681
|
681
|
$instanceId = \OC_Util::getInstanceId(); |
|
682
|
682
|
$path = \OC::$SERVERROOT; |
|
683
|
|
- $prefix = md5($instanceId . '-' . $version . '-' . $path); |
|
|
683
|
+ $prefix = md5($instanceId.'-'.$version.'-'.$path); |
|
684
|
684
|
return new \OC\Memcache\Factory($prefix, $c->get(ILogger::class), |
|
685
|
685
|
$config->getSystemValue('memcache.local', null), |
|
686
|
686
|
$config->getSystemValue('memcache.distributed', null), |
|
@@ -693,12 +693,12 @@ discard block |
|
|
block discarded – undo |
|
693
|
693
|
$this->registerDeprecatedAlias('MemCacheFactory', Factory::class); |
|
694
|
694
|
$this->registerAlias(ICacheFactory::class, Factory::class); |
|
695
|
695
|
|
|
696
|
|
- $this->registerService('RedisFactory', function (Server $c) { |
|
|
696
|
+ $this->registerService('RedisFactory', function(Server $c) { |
|
697
|
697
|
$systemConfig = $c->get(SystemConfig::class); |
|
698
|
698
|
return new RedisFactory($systemConfig); |
|
699
|
699
|
}); |
|
700
|
700
|
|
|
701
|
|
- $this->registerService(\OCP\Activity\IManager::class, function (Server $c) { |
|
|
701
|
+ $this->registerService(\OCP\Activity\IManager::class, function(Server $c) { |
|
702
|
702
|
$l10n = $this->get(IFactory::class)->get('lib'); |
|
703
|
703
|
return new \OC\Activity\Manager( |
|
704
|
704
|
$c->getRequest(), |
|
@@ -711,14 +711,14 @@ discard block |
|
|
block discarded – undo |
|
711
|
711
|
/** @deprecated 19.0.0 */ |
|
712
|
712
|
$this->registerDeprecatedAlias('ActivityManager', \OCP\Activity\IManager::class); |
|
713
|
713
|
|
|
714
|
|
- $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) { |
|
|
714
|
+ $this->registerService(\OCP\Activity\IEventMerger::class, function(Server $c) { |
|
715
|
715
|
return new \OC\Activity\EventMerger( |
|
716
|
716
|
$c->getL10N('lib') |
|
717
|
717
|
); |
|
718
|
718
|
}); |
|
719
|
719
|
$this->registerAlias(IValidator::class, Validator::class); |
|
720
|
720
|
|
|
721
|
|
- $this->registerService(AvatarManager::class, function (Server $c) { |
|
|
721
|
+ $this->registerService(AvatarManager::class, function(Server $c) { |
|
722
|
722
|
return new AvatarManager( |
|
723
|
723
|
$c->get(\OC\User\Manager::class), |
|
724
|
724
|
$c->getAppDataDir('avatar'), |
|
@@ -734,7 +734,7 @@ discard block |
|
|
block discarded – undo |
|
734
|
734
|
$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class); |
|
735
|
735
|
$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class); |
|
736
|
736
|
|
|
737
|
|
- $this->registerService(\OC\Log::class, function (Server $c) { |
|
|
737
|
+ $this->registerService(\OC\Log::class, function(Server $c) { |
|
738
|
738
|
$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file'); |
|
739
|
739
|
$factory = new LogFactory($c, $this->get(SystemConfig::class)); |
|
740
|
740
|
$logger = $factory->get($logType); |
|
@@ -748,7 +748,7 @@ discard block |
|
|
block discarded – undo |
|
748
|
748
|
// PSR-3 logger |
|
749
|
749
|
$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class); |
|
750
|
750
|
|
|
751
|
|
- $this->registerService(ILogFactory::class, function (Server $c) { |
|
|
751
|
+ $this->registerService(ILogFactory::class, function(Server $c) { |
|
752
|
752
|
return new LogFactory($c, $this->get(SystemConfig::class)); |
|
753
|
753
|
}); |
|
754
|
754
|
|
|
@@ -756,7 +756,7 @@ discard block |
|
|
block discarded – undo |
|
756
|
756
|
/** @deprecated 19.0.0 */ |
|
757
|
757
|
$this->registerDeprecatedAlias('JobList', IJobList::class); |
|
758
|
758
|
|
|
759
|
|
- $this->registerService(IRouter::class, function (Server $c) { |
|
|
759
|
+ $this->registerService(IRouter::class, function(Server $c) { |
|
760
|
760
|
$cacheFactory = $c->get(ICacheFactory::class); |
|
761
|
761
|
$logger = $c->get(ILogger::class); |
|
762
|
762
|
if ($cacheFactory->isLocalCacheAvailable()) { |
|
@@ -773,7 +773,7 @@ discard block |
|
|
block discarded – undo |
|
773
|
773
|
/** @deprecated 19.0.0 */ |
|
774
|
774
|
$this->registerDeprecatedAlias('Search', ISearch::class); |
|
775
|
775
|
|
|
776
|
|
- $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) { |
|
|
776
|
+ $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) { |
|
777
|
777
|
return new \OC\Security\RateLimiting\Backend\MemoryCache( |
|
778
|
778
|
$this->get(ICacheFactory::class), |
|
779
|
779
|
new \OC\AppFramework\Utility\TimeFactory() |
|
@@ -796,7 +796,7 @@ discard block |
|
|
block discarded – undo |
|
796
|
796
|
/** @deprecated 19.0.0 */ |
|
797
|
797
|
$this->registerDeprecatedAlias('CredentialsManager', ICredentialsManager::class); |
|
798
|
798
|
|
|
799
|
|
- $this->registerService(IDBConnection::class, function (Server $c) { |
|
|
799
|
+ $this->registerService(IDBConnection::class, function(Server $c) { |
|
800
|
800
|
$systemConfig = $c->get(SystemConfig::class); |
|
801
|
801
|
$factory = new \OC\DB\ConnectionFactory($systemConfig); |
|
802
|
802
|
$type = $systemConfig->getValue('dbtype', 'sqlite'); |
|
@@ -814,7 +814,7 @@ discard block |
|
|
block discarded – undo |
|
814
|
814
|
$this->registerAlias(ICertificateManager::class, CertificateManager::class); |
|
815
|
815
|
$this->registerAlias(IClientService::class, ClientService::class); |
|
816
|
816
|
$this->registerDeprecatedAlias('HttpClientService', IClientService::class); |
|
817
|
|
- $this->registerService(IEventLogger::class, function (ContainerInterface $c) { |
|
|
817
|
+ $this->registerService(IEventLogger::class, function(ContainerInterface $c) { |
|
818
|
818
|
$eventLogger = new EventLogger(); |
|
819
|
819
|
if ($c->get(SystemConfig::class)->getValue('debug', false)) { |
|
820
|
820
|
// In debug mode, module is being activated by default |
|
@@ -825,7 +825,7 @@ discard block |
|
|
block discarded – undo |
|
825
|
825
|
/** @deprecated 19.0.0 */ |
|
826
|
826
|
$this->registerDeprecatedAlias('EventLogger', IEventLogger::class); |
|
827
|
827
|
|
|
828
|
|
- $this->registerService(IQueryLogger::class, function (ContainerInterface $c) { |
|
|
828
|
+ $this->registerService(IQueryLogger::class, function(ContainerInterface $c) { |
|
829
|
829
|
$queryLogger = new QueryLogger(); |
|
830
|
830
|
if ($c->get(SystemConfig::class)->getValue('debug', false)) { |
|
831
|
831
|
// In debug mode, module is being activated by default |
|
@@ -840,7 +840,7 @@ discard block |
|
|
block discarded – undo |
|
840
|
840
|
$this->registerDeprecatedAlias('TempManager', TempManager::class); |
|
841
|
841
|
$this->registerAlias(ITempManager::class, TempManager::class); |
|
842
|
842
|
|
|
843
|
|
- $this->registerService(AppManager::class, function (ContainerInterface $c) { |
|
|
843
|
+ $this->registerService(AppManager::class, function(ContainerInterface $c) { |
|
844
|
844
|
// TODO: use auto-wiring |
|
845
|
845
|
return new \OC\App\AppManager( |
|
846
|
846
|
$c->get(IUserSession::class), |
|
@@ -860,7 +860,7 @@ discard block |
|
|
block discarded – undo |
|
860
|
860
|
/** @deprecated 19.0.0 */ |
|
861
|
861
|
$this->registerDeprecatedAlias('DateTimeZone', IDateTimeZone::class); |
|
862
|
862
|
|
|
863
|
|
- $this->registerService(IDateTimeFormatter::class, function (Server $c) { |
|
|
863
|
+ $this->registerService(IDateTimeFormatter::class, function(Server $c) { |
|
864
|
864
|
$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null); |
|
865
|
865
|
|
|
866
|
866
|
return new DateTimeFormatter( |
|
@@ -871,7 +871,7 @@ discard block |
|
|
block discarded – undo |
|
871
|
871
|
/** @deprecated 19.0.0 */ |
|
872
|
872
|
$this->registerDeprecatedAlias('DateTimeFormatter', IDateTimeFormatter::class); |
|
873
|
873
|
|
|
874
|
|
- $this->registerService(IUserMountCache::class, function (ContainerInterface $c) { |
|
|
874
|
+ $this->registerService(IUserMountCache::class, function(ContainerInterface $c) { |
|
875
|
875
|
$mountCache = new UserMountCache( |
|
876
|
876
|
$c->get(IDBConnection::class), |
|
877
|
877
|
$c->get(IUserManager::class), |
|
@@ -884,7 +884,7 @@ discard block |
|
|
block discarded – undo |
|
884
|
884
|
/** @deprecated 19.0.0 */ |
|
885
|
885
|
$this->registerDeprecatedAlias('UserMountCache', IUserMountCache::class); |
|
886
|
886
|
|
|
887
|
|
- $this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) { |
|
|
887
|
+ $this->registerService(IMountProviderCollection::class, function(ContainerInterface $c) { |
|
888
|
888
|
$loader = \OC\Files\Filesystem::getLoader(); |
|
889
|
889
|
$mountCache = $c->get(IUserMountCache::class); |
|
890
|
890
|
$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache); |
|
@@ -905,7 +905,7 @@ discard block |
|
|
block discarded – undo |
|
905
|
905
|
|
|
906
|
906
|
/** @deprecated 20.0.0 */ |
|
907
|
907
|
$this->registerDeprecatedAlias('IniWrapper', IniGetWrapper::class); |
|
908
|
|
- $this->registerService(IBus::class, function (ContainerInterface $c) { |
|
|
908
|
+ $this->registerService(IBus::class, function(ContainerInterface $c) { |
|
909
|
909
|
$busClass = $c->get(\OCP\IConfig::class)->getSystemValue('commandbus'); |
|
910
|
910
|
if ($busClass) { |
|
911
|
911
|
[$app, $class] = explode('::', $busClass, 2); |
|
@@ -925,7 +925,7 @@ discard block |
|
|
block discarded – undo |
|
925
|
925
|
$this->registerDeprecatedAlias('TrustedDomainHelper', TrustedDomainHelper::class); |
|
926
|
926
|
/** @deprecated 19.0.0 */ |
|
927
|
927
|
$this->registerDeprecatedAlias('Throttler', Throttler::class); |
|
928
|
|
- $this->registerService('IntegrityCodeChecker', function (ContainerInterface $c) { |
|
|
928
|
+ $this->registerService('IntegrityCodeChecker', function(ContainerInterface $c) { |
|
929
|
929
|
// IConfig and IAppManager requires a working database. This code |
|
930
|
930
|
// might however be called when ownCloud is not yet setup. |
|
931
|
931
|
if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) { |
|
@@ -947,7 +947,7 @@ discard block |
|
|
block discarded – undo |
|
947
|
947
|
$c->get(IMimeTypeDetector::class) |
|
948
|
948
|
); |
|
949
|
949
|
}); |
|
950
|
|
- $this->registerService(\OCP\IRequest::class, function (ContainerInterface $c) { |
|
|
950
|
+ $this->registerService(\OCP\IRequest::class, function(ContainerInterface $c) { |
|
951
|
951
|
if (isset($this['urlParams'])) { |
|
952
|
952
|
$urlParams = $this['urlParams']; |
|
953
|
953
|
} else { |
|
@@ -984,7 +984,7 @@ discard block |
|
|
block discarded – undo |
|
984
|
984
|
/** @deprecated 19.0.0 */ |
|
985
|
985
|
$this->registerDeprecatedAlias('Request', \OCP\IRequest::class); |
|
986
|
986
|
|
|
987
|
|
- $this->registerService(IMailer::class, function (Server $c) { |
|
|
987
|
+ $this->registerService(IMailer::class, function(Server $c) { |
|
988
|
988
|
return new Mailer( |
|
989
|
989
|
$c->get(\OCP\IConfig::class), |
|
990
|
990
|
$c->get(ILogger::class), |
|
@@ -998,7 +998,7 @@ discard block |
|
|
block discarded – undo |
|
998
|
998
|
/** @deprecated 19.0.0 */ |
|
999
|
999
|
$this->registerDeprecatedAlias('Mailer', IMailer::class); |
|
1000
|
1000
|
|
|
1001
|
|
- $this->registerService('LDAPProvider', function (ContainerInterface $c) { |
|
|
1001
|
+ $this->registerService('LDAPProvider', function(ContainerInterface $c) { |
|
1002
|
1002
|
$config = $c->get(\OCP\IConfig::class); |
|
1003
|
1003
|
$factoryClass = $config->getSystemValue('ldapProviderFactory', null); |
|
1004
|
1004
|
if (is_null($factoryClass)) { |
|
@@ -1008,7 +1008,7 @@ discard block |
|
|
block discarded – undo |
|
1008
|
1008
|
$factory = new $factoryClass($this); |
|
1009
|
1009
|
return $factory->getLDAPProvider(); |
|
1010
|
1010
|
}); |
|
1011
|
|
- $this->registerService(ILockingProvider::class, function (ContainerInterface $c) { |
|
|
1011
|
+ $this->registerService(ILockingProvider::class, function(ContainerInterface $c) { |
|
1012
|
1012
|
$ini = $c->get(IniGetWrapper::class); |
|
1013
|
1013
|
$config = $c->get(\OCP\IConfig::class); |
|
1014
|
1014
|
$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time'))); |
|
@@ -1036,12 +1036,12 @@ discard block |
|
|
block discarded – undo |
|
1036
|
1036
|
/** @deprecated 19.0.0 */ |
|
1037
|
1037
|
$this->registerDeprecatedAlias('MountManager', IMountManager::class); |
|
1038
|
1038
|
|
|
1039
|
|
- $this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) { |
|
|
1039
|
+ $this->registerService(IMimeTypeDetector::class, function(ContainerInterface $c) { |
|
1040
|
1040
|
return new \OC\Files\Type\Detection( |
|
1041
|
1041
|
$c->get(IURLGenerator::class), |
|
1042
|
1042
|
$c->get(ILogger::class), |
|
1043
|
1043
|
\OC::$configDir, |
|
1044
|
|
- \OC::$SERVERROOT . '/resources/config/' |
|
|
1044
|
+ \OC::$SERVERROOT.'/resources/config/' |
|
1045
|
1045
|
); |
|
1046
|
1046
|
}); |
|
1047
|
1047
|
/** @deprecated 19.0.0 */ |
|
@@ -1050,19 +1050,19 @@ discard block |
|
|
block discarded – undo |
|
1050
|
1050
|
$this->registerAlias(IMimeTypeLoader::class, Loader::class); |
|
1051
|
1051
|
/** @deprecated 19.0.0 */ |
|
1052
|
1052
|
$this->registerDeprecatedAlias('MimeTypeLoader', IMimeTypeLoader::class); |
|
1053
|
|
- $this->registerService(BundleFetcher::class, function () { |
|
|
1053
|
+ $this->registerService(BundleFetcher::class, function() { |
|
1054
|
1054
|
return new BundleFetcher($this->getL10N('lib')); |
|
1055
|
1055
|
}); |
|
1056
|
1056
|
$this->registerAlias(\OCP\Notification\IManager::class, Manager::class); |
|
1057
|
1057
|
/** @deprecated 19.0.0 */ |
|
1058
|
1058
|
$this->registerDeprecatedAlias('NotificationManager', \OCP\Notification\IManager::class); |
|
1059
|
1059
|
|
|
1060
|
|
- $this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) { |
|
|
1060
|
+ $this->registerService(CapabilitiesManager::class, function(ContainerInterface $c) { |
|
1061
|
1061
|
$manager = new CapabilitiesManager($c->get(ILogger::class)); |
|
1062
|
|
- $manager->registerCapability(function () use ($c) { |
|
|
1062
|
+ $manager->registerCapability(function() use ($c) { |
|
1063
|
1063
|
return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class)); |
|
1064
|
1064
|
}); |
|
1065
|
|
- $manager->registerCapability(function () use ($c) { |
|
|
1065
|
+ $manager->registerCapability(function() use ($c) { |
|
1066
|
1066
|
return $c->get(\OC\Security\Bruteforce\Capabilities::class); |
|
1067
|
1067
|
}); |
|
1068
|
1068
|
return $manager; |
|
@@ -1070,14 +1070,14 @@ discard block |
|
|
block discarded – undo |
|
1070
|
1070
|
/** @deprecated 19.0.0 */ |
|
1071
|
1071
|
$this->registerDeprecatedAlias('CapabilitiesManager', CapabilitiesManager::class); |
|
1072
|
1072
|
|
|
1073
|
|
- $this->registerService(ICommentsManager::class, function (Server $c) { |
|
|
1073
|
+ $this->registerService(ICommentsManager::class, function(Server $c) { |
|
1074
|
1074
|
$config = $c->get(\OCP\IConfig::class); |
|
1075
|
1075
|
$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class); |
|
1076
|
1076
|
/** @var \OCP\Comments\ICommentsManagerFactory $factory */ |
|
1077
|
1077
|
$factory = new $factoryClass($this); |
|
1078
|
1078
|
$manager = $factory->getManager(); |
|
1079
|
1079
|
|
|
1080
|
|
- $manager->registerDisplayNameResolver('user', function ($id) use ($c) { |
|
|
1080
|
+ $manager->registerDisplayNameResolver('user', function($id) use ($c) { |
|
1081
|
1081
|
$manager = $c->get(IUserManager::class); |
|
1082
|
1082
|
$user = $manager->get($id); |
|
1083
|
1083
|
if (is_null($user)) { |
|
@@ -1095,7 +1095,7 @@ discard block |
|
|
block discarded – undo |
|
1095
|
1095
|
$this->registerDeprecatedAlias('CommentsManager', ICommentsManager::class); |
|
1096
|
1096
|
|
|
1097
|
1097
|
$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults'); |
|
1098
|
|
- $this->registerService('ThemingDefaults', function (Server $c) { |
|
|
1098
|
+ $this->registerService('ThemingDefaults', function(Server $c) { |
|
1099
|
1099
|
/* |
|
1100
|
1100
|
* Dark magic for autoloader. |
|
1101
|
1101
|
* If we do a class_exists it will try to load the class which will |
|
@@ -1130,7 +1130,7 @@ discard block |
|
|
block discarded – undo |
|
1130
|
1130
|
} |
|
1131
|
1131
|
return new \OC_Defaults(); |
|
1132
|
1132
|
}); |
|
1133
|
|
- $this->registerService(JSCombiner::class, function (Server $c) { |
|
|
1133
|
+ $this->registerService(JSCombiner::class, function(Server $c) { |
|
1134
|
1134
|
return new JSCombiner( |
|
1135
|
1135
|
$c->getAppDataDir('js'), |
|
1136
|
1136
|
$c->get(IURLGenerator::class), |
|
@@ -1144,7 +1144,7 @@ discard block |
|
|
block discarded – undo |
|
1144
|
1144
|
$this->registerDeprecatedAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class); |
|
1145
|
1145
|
$this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::class); |
|
1146
|
1146
|
|
|
1147
|
|
- $this->registerService('CryptoWrapper', function (ContainerInterface $c) { |
|
|
1147
|
+ $this->registerService('CryptoWrapper', function(ContainerInterface $c) { |
|
1148
|
1148
|
// FIXME: Instantiiated here due to cyclic dependency |
|
1149
|
1149
|
$request = new Request( |
|
1150
|
1150
|
[ |
|
@@ -1171,14 +1171,14 @@ discard block |
|
|
block discarded – undo |
|
1171
|
1171
|
}); |
|
1172
|
1172
|
/** @deprecated 19.0.0 */ |
|
1173
|
1173
|
$this->registerDeprecatedAlias('CsrfTokenManager', CsrfTokenManager::class); |
|
1174
|
|
- $this->registerService(SessionStorage::class, function (ContainerInterface $c) { |
|
|
1174
|
+ $this->registerService(SessionStorage::class, function(ContainerInterface $c) { |
|
1175
|
1175
|
return new SessionStorage($c->get(ISession::class)); |
|
1176
|
1176
|
}); |
|
1177
|
1177
|
$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class); |
|
1178
|
1178
|
/** @deprecated 19.0.0 */ |
|
1179
|
1179
|
$this->registerDeprecatedAlias('ContentSecurityPolicyManager', ContentSecurityPolicyManager::class); |
|
1180
|
1180
|
|
|
1181
|
|
- $this->registerService(\OCP\Share\IManager::class, function (IServerContainer $c) { |
|
|
1181
|
+ $this->registerService(\OCP\Share\IManager::class, function(IServerContainer $c) { |
|
1182
|
1182
|
$config = $c->get(\OCP\IConfig::class); |
|
1183
|
1183
|
$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class); |
|
1184
|
1184
|
/** @var \OCP\Share\IProviderFactory $factory */ |
|
@@ -1208,7 +1208,7 @@ discard block |
|
|
block discarded – undo |
|
1208
|
1208
|
/** @deprecated 19.0.0 */ |
|
1209
|
1209
|
$this->registerDeprecatedAlias('ShareManager', \OCP\Share\IManager::class); |
|
1210
|
1210
|
|
|
1211
|
|
- $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) { |
|
|
1211
|
+ $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function(Server $c) { |
|
1212
|
1212
|
$instance = new Collaboration\Collaborators\Search($c); |
|
1213
|
1213
|
|
|
1214
|
1214
|
// register default plugins |
|
@@ -1231,33 +1231,33 @@ discard block |
|
|
block discarded – undo |
|
1231
|
1231
|
|
|
1232
|
1232
|
$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class); |
|
1233
|
1233
|
$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class); |
|
1234
|
|
- $this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) { |
|
|
1234
|
+ $this->registerService(\OC\Files\AppData\Factory::class, function(ContainerInterface $c) { |
|
1235
|
1235
|
return new \OC\Files\AppData\Factory( |
|
1236
|
1236
|
$c->get(IRootFolder::class), |
|
1237
|
1237
|
$c->get(SystemConfig::class) |
|
1238
|
1238
|
); |
|
1239
|
1239
|
}); |
|
1240
|
1240
|
|
|
1241
|
|
- $this->registerService('LockdownManager', function (ContainerInterface $c) { |
|
1242
|
|
- return new LockdownManager(function () use ($c) { |
|
|
1241
|
+ $this->registerService('LockdownManager', function(ContainerInterface $c) { |
|
|
1242
|
+ return new LockdownManager(function() use ($c) { |
|
1243
|
1243
|
return $c->get(ISession::class); |
|
1244
|
1244
|
}); |
|
1245
|
1245
|
}); |
|
1246
|
1246
|
|
|
1247
|
|
- $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) { |
|
|
1247
|
+ $this->registerService(\OCP\OCS\IDiscoveryService::class, function(ContainerInterface $c) { |
|
1248
|
1248
|
return new DiscoveryService( |
|
1249
|
1249
|
$c->get(ICacheFactory::class), |
|
1250
|
1250
|
$c->get(IClientService::class) |
|
1251
|
1251
|
); |
|
1252
|
1252
|
}); |
|
1253
|
1253
|
|
|
1254
|
|
- $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) { |
|
|
1254
|
+ $this->registerService(ICloudIdManager::class, function(ContainerInterface $c) { |
|
1255
|
1255
|
return new CloudIdManager(); |
|
1256
|
1256
|
}); |
|
1257
|
1257
|
|
|
1258
|
1258
|
$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class); |
|
1259
|
1259
|
|
|
1260
|
|
- $this->registerService(ICloudFederationProviderManager::class, function (ContainerInterface $c) { |
|
|
1260
|
+ $this->registerService(ICloudFederationProviderManager::class, function(ContainerInterface $c) { |
|
1261
|
1261
|
return new CloudFederationProviderManager( |
|
1262
|
1262
|
$c->get(IAppManager::class), |
|
1263
|
1263
|
$c->get(IClientService::class), |
|
@@ -1266,7 +1266,7 @@ discard block |
|
|
block discarded – undo |
|
1266
|
1266
|
); |
|
1267
|
1267
|
}); |
|
1268
|
1268
|
|
|
1269
|
|
- $this->registerService(ICloudFederationFactory::class, function (Server $c) { |
|
|
1269
|
+ $this->registerService(ICloudFederationFactory::class, function(Server $c) { |
|
1270
|
1270
|
return new CloudFederationFactory(); |
|
1271
|
1271
|
}); |
|
1272
|
1272
|
|
|
@@ -1278,7 +1278,7 @@ discard block |
|
|
block discarded – undo |
|
1278
|
1278
|
/** @deprecated 19.0.0 */ |
|
1279
|
1279
|
$this->registerDeprecatedAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class); |
|
1280
|
1280
|
|
|
1281
|
|
- $this->registerService(Defaults::class, function (Server $c) { |
|
|
1281
|
+ $this->registerService(Defaults::class, function(Server $c) { |
|
1282
|
1282
|
return new Defaults( |
|
1283
|
1283
|
$c->getThemingDefaults() |
|
1284
|
1284
|
); |
|
@@ -1286,17 +1286,17 @@ discard block |
|
|
block discarded – undo |
|
1286
|
1286
|
/** @deprecated 19.0.0 */ |
|
1287
|
1287
|
$this->registerDeprecatedAlias('Defaults', \OCP\Defaults::class); |
|
1288
|
1288
|
|
|
1289
|
|
- $this->registerService(\OCP\ISession::class, function (ContainerInterface $c) { |
|
|
1289
|
+ $this->registerService(\OCP\ISession::class, function(ContainerInterface $c) { |
|
1290
|
1290
|
return $c->get(\OCP\IUserSession::class)->getSession(); |
|
1291
|
1291
|
}, false); |
|
1292
|
1292
|
|
|
1293
|
|
- $this->registerService(IShareHelper::class, function (ContainerInterface $c) { |
|
|
1293
|
+ $this->registerService(IShareHelper::class, function(ContainerInterface $c) { |
|
1294
|
1294
|
return new ShareHelper( |
|
1295
|
1295
|
$c->get(\OCP\Share\IManager::class) |
|
1296
|
1296
|
); |
|
1297
|
1297
|
}); |
|
1298
|
1298
|
|
|
1299
|
|
- $this->registerService(Installer::class, function (ContainerInterface $c) { |
|
|
1299
|
+ $this->registerService(Installer::class, function(ContainerInterface $c) { |
|
1300
|
1300
|
return new Installer( |
|
1301
|
1301
|
$c->get(AppFetcher::class), |
|
1302
|
1302
|
$c->get(IClientService::class), |
|
@@ -1307,11 +1307,11 @@ discard block |
|
|
block discarded – undo |
|
1307
|
1307
|
); |
|
1308
|
1308
|
}); |
|
1309
|
1309
|
|
|
1310
|
|
- $this->registerService(IApiFactory::class, function (ContainerInterface $c) { |
|
|
1310
|
+ $this->registerService(IApiFactory::class, function(ContainerInterface $c) { |
|
1311
|
1311
|
return new ApiFactory($c->get(IClientService::class)); |
|
1312
|
1312
|
}); |
|
1313
|
1313
|
|
|
1314
|
|
- $this->registerService(IInstanceFactory::class, function (ContainerInterface $c) { |
|
|
1314
|
+ $this->registerService(IInstanceFactory::class, function(ContainerInterface $c) { |
|
1315
|
1315
|
$memcacheFactory = $c->get(ICacheFactory::class); |
|
1316
|
1316
|
return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class)); |
|
1317
|
1317
|
}); |
|
@@ -1368,7 +1368,7 @@ discard block |
|
|
block discarded – undo |
|
1368
|
1368
|
$dispatcher = $this->get(SymfonyAdapter::class); |
|
1369
|
1369
|
|
|
1370
|
1370
|
// Delete avatar on user deletion |
|
1371
|
|
- $dispatcher->addListener('OCP\IUser::preDelete', function (GenericEvent $e) { |
|
|
1371
|
+ $dispatcher->addListener('OCP\IUser::preDelete', function(GenericEvent $e) { |
|
1372
|
1372
|
$logger = $this->get(ILogger::class); |
|
1373
|
1373
|
$manager = $this->getAvatarManager(); |
|
1374
|
1374
|
/** @var IUser $user */ |
|
@@ -1381,11 +1381,11 @@ discard block |
|
|
block discarded – undo |
|
1381
|
1381
|
// no avatar to remove |
|
1382
|
1382
|
} catch (\Exception $e) { |
|
1383
|
1383
|
// Ignore exceptions |
|
1384
|
|
- $logger->info('Could not cleanup avatar of ' . $user->getUID()); |
|
|
1384
|
+ $logger->info('Could not cleanup avatar of '.$user->getUID()); |
|
1385
|
1385
|
} |
|
1386
|
1386
|
}); |
|
1387
|
1387
|
|
|
1388
|
|
- $dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) { |
|
|
1388
|
+ $dispatcher->addListener('OCP\IUser::changeUser', function(GenericEvent $e) { |
|
1389
|
1389
|
$manager = $this->getAvatarManager(); |
|
1390
|
1390
|
/** @var IUser $user */ |
|
1391
|
1391
|
$user = $e->getSubject(); |
|
@@ -2276,11 +2276,11 @@ discard block |
|
|
block discarded – undo |
|
2276
|
2276
|
} |
|
2277
|
2277
|
|
|
2278
|
2278
|
private function registerDeprecatedAlias(string $alias, string $target) { |
|
2279
|
|
- $this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) { |
|
|
2279
|
+ $this->registerService($alias, function(ContainerInterface $container) use ($target, $alias) { |
|
2280
|
2280
|
try { |
|
2281
|
2281
|
/** @var ILogger $logger */ |
|
2282
|
2282
|
$logger = $container->get(ILogger::class); |
|
2283
|
|
- $logger->debug('The requested alias "' . $alias . '" is depreacted. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']); |
|
|
2283
|
+ $logger->debug('The requested alias "'.$alias.'" is depreacted. Please request "'.$target.'" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']); |
|
2284
|
2284
|
} catch (ContainerExceptionInterface $e) { |
|
2285
|
2285
|
// Could not get logger. Continue |
|
2286
|
2286
|
} |