@@ -96,20 +96,20 @@ discard block |
||
96 | 96 | |
97 | 97 | $cachedGroups = &$this->cachedGroups; |
98 | 98 | $cachedUserGroups = &$this->cachedUserGroups; |
99 | - $this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) { |
|
99 | + $this->listen('\OC\Group', 'postDelete', function($group) use (&$cachedGroups, &$cachedUserGroups) { |
|
100 | 100 | /** |
101 | 101 | * @var \OC\Group\Group $group |
102 | 102 | */ |
103 | 103 | unset($cachedGroups[$group->getGID()]); |
104 | 104 | $cachedUserGroups = []; |
105 | 105 | }); |
106 | - $this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) { |
|
106 | + $this->listen('\OC\Group', 'postAddUser', function($group) use (&$cachedUserGroups) { |
|
107 | 107 | /** |
108 | 108 | * @var \OC\Group\Group $group |
109 | 109 | */ |
110 | 110 | $cachedUserGroups = []; |
111 | 111 | }); |
112 | - $this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) { |
|
112 | + $this->listen('\OC\Group', 'postRemoveUser', function($group) use (&$cachedUserGroups) { |
|
113 | 113 | /** |
114 | 114 | * @var \OC\Group\Group $group |
115 | 115 | */ |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | if ($aGroup instanceof IGroup) { |
250 | 250 | $groups[$groupId] = $aGroup; |
251 | 251 | } else { |
252 | - $this->logger->debug('Group "' . $groupId . '" was returned by search but not found through direct access', ['app' => 'core']); |
|
252 | + $this->logger->debug('Group "'.$groupId.'" was returned by search but not found through direct access', ['app' => 'core']); |
|
253 | 253 | } |
254 | 254 | } |
255 | 255 | if (!is_null($limit) and $limit <= 0) { |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | if ($aGroup instanceof IGroup) { |
283 | 283 | $groups[$groupId] = $aGroup; |
284 | 284 | } else { |
285 | - $this->logger->debug('User "' . $uid . '" belongs to deleted group: "' . $groupId . '"', ['app' => 'core']); |
|
285 | + $this->logger->debug('User "'.$uid.'" belongs to deleted group: "'.$groupId.'"', ['app' => 'core']); |
|
286 | 286 | } |
287 | 287 | } |
288 | 288 | |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | * @return array ['displayName' => displayname] |
359 | 359 | */ |
360 | 360 | public function getUserGroupNames(IUser $user) { |
361 | - return array_map(function ($group) { |
|
361 | + return array_map(function($group) { |
|
362 | 362 | return ['displayName' => $this->displayNameCache->getDisplayName($group->getGID())]; |
363 | 363 | }, $this->getUserGroups($user)); |
364 | 364 | } |
@@ -293,10 +293,10 @@ discard block |
||
293 | 293 | $this->registerParameter('isCLI', \OC::$CLI); |
294 | 294 | $this->registerParameter('serverRoot', \OC::$SERVERROOT); |
295 | 295 | |
296 | - $this->registerService(ContainerInterface::class, function (ContainerInterface $c) { |
|
296 | + $this->registerService(ContainerInterface::class, function(ContainerInterface $c) { |
|
297 | 297 | return $c; |
298 | 298 | }); |
299 | - $this->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) { |
|
299 | + $this->registerService(\OCP\IServerContainer::class, function(ContainerInterface $c) { |
|
300 | 300 | return $c; |
301 | 301 | }); |
302 | 302 | |
@@ -321,11 +321,11 @@ discard block |
||
321 | 321 | |
322 | 322 | $this->registerAlias(IActionFactory::class, ActionFactory::class); |
323 | 323 | |
324 | - $this->registerService(View::class, function (Server $c) { |
|
324 | + $this->registerService(View::class, function(Server $c) { |
|
325 | 325 | return new View(); |
326 | 326 | }, false); |
327 | 327 | |
328 | - $this->registerService(IPreview::class, function (ContainerInterface $c) { |
|
328 | + $this->registerService(IPreview::class, function(ContainerInterface $c) { |
|
329 | 329 | return new PreviewManager( |
330 | 330 | $c->get(\OCP\IConfig::class), |
331 | 331 | $c->get(IRootFolder::class), |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | /** @deprecated 19.0.0 */ |
346 | 346 | $this->registerDeprecatedAlias('PreviewManager', IPreview::class); |
347 | 347 | |
348 | - $this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) { |
|
348 | + $this->registerService(\OC\Preview\Watcher::class, function(ContainerInterface $c) { |
|
349 | 349 | return new \OC\Preview\Watcher( |
350 | 350 | new \OC\Preview\Storage\Root( |
351 | 351 | $c->get(IRootFolder::class), |
@@ -354,11 +354,11 @@ discard block |
||
354 | 354 | ); |
355 | 355 | }); |
356 | 356 | |
357 | - $this->registerService(IProfiler::class, function (Server $c) { |
|
357 | + $this->registerService(IProfiler::class, function(Server $c) { |
|
358 | 358 | return new Profiler($c->get(SystemConfig::class)); |
359 | 359 | }); |
360 | 360 | |
361 | - $this->registerService(\OCP\Encryption\IManager::class, function (Server $c): Encryption\Manager { |
|
361 | + $this->registerService(\OCP\Encryption\IManager::class, function(Server $c): Encryption\Manager { |
|
362 | 362 | $view = new View(); |
363 | 363 | $util = new Encryption\Util( |
364 | 364 | $view, |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | |
381 | 381 | /** @deprecated 21.0.0 */ |
382 | 382 | $this->registerDeprecatedAlias('EncryptionFileHelper', IFile::class); |
383 | - $this->registerService(IFile::class, function (ContainerInterface $c) { |
|
383 | + $this->registerService(IFile::class, function(ContainerInterface $c) { |
|
384 | 384 | $util = new Encryption\Util( |
385 | 385 | new View(), |
386 | 386 | $c->get(IUserManager::class), |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | |
397 | 397 | /** @deprecated 21.0.0 */ |
398 | 398 | $this->registerDeprecatedAlias('EncryptionKeyStorage', IStorage::class); |
399 | - $this->registerService(IStorage::class, function (ContainerInterface $c) { |
|
399 | + $this->registerService(IStorage::class, function(ContainerInterface $c) { |
|
400 | 400 | $view = new View(); |
401 | 401 | $util = new Encryption\Util( |
402 | 402 | $view, |
@@ -419,22 +419,22 @@ discard block |
||
419 | 419 | /** @deprecated 19.0.0 */ |
420 | 420 | $this->registerDeprecatedAlias('TagManager', \OCP\ITagManager::class); |
421 | 421 | |
422 | - $this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) { |
|
422 | + $this->registerService('SystemTagManagerFactory', function(ContainerInterface $c) { |
|
423 | 423 | /** @var \OCP\IConfig $config */ |
424 | 424 | $config = $c->get(\OCP\IConfig::class); |
425 | 425 | $factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class); |
426 | 426 | return new $factoryClass($this); |
427 | 427 | }); |
428 | - $this->registerService(ISystemTagManager::class, function (ContainerInterface $c) { |
|
428 | + $this->registerService(ISystemTagManager::class, function(ContainerInterface $c) { |
|
429 | 429 | return $c->get('SystemTagManagerFactory')->getManager(); |
430 | 430 | }); |
431 | 431 | /** @deprecated 19.0.0 */ |
432 | 432 | $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class); |
433 | 433 | |
434 | - $this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) { |
|
434 | + $this->registerService(ISystemTagObjectMapper::class, function(ContainerInterface $c) { |
|
435 | 435 | return $c->get('SystemTagManagerFactory')->getObjectMapper(); |
436 | 436 | }); |
437 | - $this->registerService('RootFolder', function (ContainerInterface $c) { |
|
437 | + $this->registerService('RootFolder', function(ContainerInterface $c) { |
|
438 | 438 | $manager = \OC\Files\Filesystem::getMountManager(null); |
439 | 439 | $view = new View(); |
440 | 440 | $root = new Root( |
@@ -455,7 +455,7 @@ discard block |
||
455 | 455 | |
456 | 456 | return $root; |
457 | 457 | }); |
458 | - $this->registerService(HookConnector::class, function (ContainerInterface $c) { |
|
458 | + $this->registerService(HookConnector::class, function(ContainerInterface $c) { |
|
459 | 459 | return new HookConnector( |
460 | 460 | $c->get(IRootFolder::class), |
461 | 461 | new View(), |
@@ -467,8 +467,8 @@ discard block |
||
467 | 467 | /** @deprecated 19.0.0 */ |
468 | 468 | $this->registerDeprecatedAlias('SystemTagObjectMapper', ISystemTagObjectMapper::class); |
469 | 469 | |
470 | - $this->registerService(IRootFolder::class, function (ContainerInterface $c) { |
|
471 | - return new LazyRoot(function () use ($c) { |
|
470 | + $this->registerService(IRootFolder::class, function(ContainerInterface $c) { |
|
471 | + return new LazyRoot(function() use ($c) { |
|
472 | 472 | return $c->get('RootFolder'); |
473 | 473 | }); |
474 | 474 | }); |
@@ -479,53 +479,53 @@ discard block |
||
479 | 479 | $this->registerDeprecatedAlias('UserManager', \OC\User\Manager::class); |
480 | 480 | $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class); |
481 | 481 | |
482 | - $this->registerService(DisplayNameCache::class, function (ContainerInterface $c) { |
|
482 | + $this->registerService(DisplayNameCache::class, function(ContainerInterface $c) { |
|
483 | 483 | return $c->get(\OC\User\Manager::class)->getDisplayNameCache(); |
484 | 484 | }); |
485 | 485 | |
486 | - $this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) { |
|
486 | + $this->registerService(\OCP\IGroupManager::class, function(ContainerInterface $c) { |
|
487 | 487 | $groupManager = new \OC\Group\Manager( |
488 | 488 | $this->get(IUserManager::class), |
489 | 489 | $c->get(SymfonyAdapter::class), |
490 | 490 | $this->get(LoggerInterface::class), |
491 | 491 | $this->get(ICacheFactory::class) |
492 | 492 | ); |
493 | - $groupManager->listen('\OC\Group', 'preCreate', function ($gid) { |
|
493 | + $groupManager->listen('\OC\Group', 'preCreate', function($gid) { |
|
494 | 494 | /** @var IEventDispatcher $dispatcher */ |
495 | 495 | $dispatcher = $this->get(IEventDispatcher::class); |
496 | 496 | $dispatcher->dispatchTyped(new BeforeGroupCreatedEvent($gid)); |
497 | 497 | }); |
498 | - $groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $group) { |
|
498 | + $groupManager->listen('\OC\Group', 'postCreate', function(\OC\Group\Group $group) { |
|
499 | 499 | /** @var IEventDispatcher $dispatcher */ |
500 | 500 | $dispatcher = $this->get(IEventDispatcher::class); |
501 | 501 | $dispatcher->dispatchTyped(new GroupCreatedEvent($group)); |
502 | 502 | }); |
503 | - $groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) { |
|
503 | + $groupManager->listen('\OC\Group', 'preDelete', function(\OC\Group\Group $group) { |
|
504 | 504 | /** @var IEventDispatcher $dispatcher */ |
505 | 505 | $dispatcher = $this->get(IEventDispatcher::class); |
506 | 506 | $dispatcher->dispatchTyped(new BeforeGroupDeletedEvent($group)); |
507 | 507 | }); |
508 | - $groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) { |
|
508 | + $groupManager->listen('\OC\Group', 'postDelete', function(\OC\Group\Group $group) { |
|
509 | 509 | /** @var IEventDispatcher $dispatcher */ |
510 | 510 | $dispatcher = $this->get(IEventDispatcher::class); |
511 | 511 | $dispatcher->dispatchTyped(new GroupDeletedEvent($group)); |
512 | 512 | }); |
513 | - $groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) { |
|
513 | + $groupManager->listen('\OC\Group', 'preAddUser', function(\OC\Group\Group $group, \OC\User\User $user) { |
|
514 | 514 | /** @var IEventDispatcher $dispatcher */ |
515 | 515 | $dispatcher = $this->get(IEventDispatcher::class); |
516 | 516 | $dispatcher->dispatchTyped(new BeforeUserAddedEvent($group, $user)); |
517 | 517 | }); |
518 | - $groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) { |
|
518 | + $groupManager->listen('\OC\Group', 'postAddUser', function(\OC\Group\Group $group, \OC\User\User $user) { |
|
519 | 519 | /** @var IEventDispatcher $dispatcher */ |
520 | 520 | $dispatcher = $this->get(IEventDispatcher::class); |
521 | 521 | $dispatcher->dispatchTyped(new UserAddedEvent($group, $user)); |
522 | 522 | }); |
523 | - $groupManager->listen('\OC\Group', 'preRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) { |
|
523 | + $groupManager->listen('\OC\Group', 'preRemoveUser', function(\OC\Group\Group $group, \OC\User\User $user) { |
|
524 | 524 | /** @var IEventDispatcher $dispatcher */ |
525 | 525 | $dispatcher = $this->get(IEventDispatcher::class); |
526 | 526 | $dispatcher->dispatchTyped(new BeforeUserRemovedEvent($group, $user)); |
527 | 527 | }); |
528 | - $groupManager->listen('\OC\Group', 'postRemoveUser', function (\OC\Group\Group $group, \OC\User\User $user) { |
|
528 | + $groupManager->listen('\OC\Group', 'postRemoveUser', function(\OC\Group\Group $group, \OC\User\User $user) { |
|
529 | 529 | /** @var IEventDispatcher $dispatcher */ |
530 | 530 | $dispatcher = $this->get(IEventDispatcher::class); |
531 | 531 | $dispatcher->dispatchTyped(new UserRemovedEvent($group, $user)); |
@@ -535,7 +535,7 @@ discard block |
||
535 | 535 | /** @deprecated 19.0.0 */ |
536 | 536 | $this->registerDeprecatedAlias('GroupManager', \OCP\IGroupManager::class); |
537 | 537 | |
538 | - $this->registerService(Store::class, function (ContainerInterface $c) { |
|
538 | + $this->registerService(Store::class, function(ContainerInterface $c) { |
|
539 | 539 | $session = $c->get(ISession::class); |
540 | 540 | if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) { |
541 | 541 | $tokenProvider = $c->get(IProvider::class); |
@@ -548,7 +548,7 @@ discard block |
||
548 | 548 | $this->registerAlias(IStore::class, Store::class); |
549 | 549 | $this->registerAlias(IProvider::class, Authentication\Token\Manager::class); |
550 | 550 | |
551 | - $this->registerService(\OC\User\Session::class, function (Server $c) { |
|
551 | + $this->registerService(\OC\User\Session::class, function(Server $c) { |
|
552 | 552 | $manager = $c->get(IUserManager::class); |
553 | 553 | $session = new \OC\Session\Memory(''); |
554 | 554 | $timeFactory = new TimeFactory(); |
@@ -574,26 +574,26 @@ discard block |
||
574 | 574 | $c->get(IEventDispatcher::class) |
575 | 575 | ); |
576 | 576 | /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */ |
577 | - $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) { |
|
577 | + $userSession->listen('\OC\User', 'preCreateUser', function($uid, $password) { |
|
578 | 578 | \OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]); |
579 | 579 | }); |
580 | 580 | /** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */ |
581 | - $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) { |
|
581 | + $userSession->listen('\OC\User', 'postCreateUser', function($user, $password) { |
|
582 | 582 | /** @var \OC\User\User $user */ |
583 | 583 | \OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]); |
584 | 584 | }); |
585 | 585 | /** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */ |
586 | - $userSession->listen('\OC\User', 'preDelete', function ($user) use ($legacyDispatcher) { |
|
586 | + $userSession->listen('\OC\User', 'preDelete', function($user) use ($legacyDispatcher) { |
|
587 | 587 | /** @var \OC\User\User $user */ |
588 | 588 | \OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]); |
589 | 589 | $legacyDispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user)); |
590 | 590 | }); |
591 | 591 | /** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */ |
592 | - $userSession->listen('\OC\User', 'postDelete', function ($user) { |
|
592 | + $userSession->listen('\OC\User', 'postDelete', function($user) { |
|
593 | 593 | /** @var \OC\User\User $user */ |
594 | 594 | \OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]); |
595 | 595 | }); |
596 | - $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) { |
|
596 | + $userSession->listen('\OC\User', 'preSetPassword', function($user, $password, $recoveryPassword) { |
|
597 | 597 | /** @var \OC\User\User $user */ |
598 | 598 | \OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]); |
599 | 599 | |
@@ -601,7 +601,7 @@ discard block |
||
601 | 601 | $dispatcher = $this->get(IEventDispatcher::class); |
602 | 602 | $dispatcher->dispatchTyped(new BeforePasswordUpdatedEvent($user, $password, $recoveryPassword)); |
603 | 603 | }); |
604 | - $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) { |
|
604 | + $userSession->listen('\OC\User', 'postSetPassword', function($user, $password, $recoveryPassword) { |
|
605 | 605 | /** @var \OC\User\User $user */ |
606 | 606 | \OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]); |
607 | 607 | |
@@ -609,14 +609,14 @@ discard block |
||
609 | 609 | $dispatcher = $this->get(IEventDispatcher::class); |
610 | 610 | $dispatcher->dispatchTyped(new PasswordUpdatedEvent($user, $password, $recoveryPassword)); |
611 | 611 | }); |
612 | - $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) { |
|
612 | + $userSession->listen('\OC\User', 'preLogin', function($uid, $password) { |
|
613 | 613 | \OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]); |
614 | 614 | |
615 | 615 | /** @var IEventDispatcher $dispatcher */ |
616 | 616 | $dispatcher = $this->get(IEventDispatcher::class); |
617 | 617 | $dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password)); |
618 | 618 | }); |
619 | - $userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) { |
|
619 | + $userSession->listen('\OC\User', 'postLogin', function($user, $loginName, $password, $isTokenLogin) { |
|
620 | 620 | /** @var \OC\User\User $user */ |
621 | 621 | \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]); |
622 | 622 | |
@@ -624,12 +624,12 @@ discard block |
||
624 | 624 | $dispatcher = $this->get(IEventDispatcher::class); |
625 | 625 | $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin)); |
626 | 626 | }); |
627 | - $userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) { |
|
627 | + $userSession->listen('\OC\User', 'preRememberedLogin', function($uid) { |
|
628 | 628 | /** @var IEventDispatcher $dispatcher */ |
629 | 629 | $dispatcher = $this->get(IEventDispatcher::class); |
630 | 630 | $dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid)); |
631 | 631 | }); |
632 | - $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) { |
|
632 | + $userSession->listen('\OC\User', 'postRememberedLogin', function($user, $password) { |
|
633 | 633 | /** @var \OC\User\User $user */ |
634 | 634 | \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]); |
635 | 635 | |
@@ -637,19 +637,19 @@ discard block |
||
637 | 637 | $dispatcher = $this->get(IEventDispatcher::class); |
638 | 638 | $dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password)); |
639 | 639 | }); |
640 | - $userSession->listen('\OC\User', 'logout', function ($user) { |
|
640 | + $userSession->listen('\OC\User', 'logout', function($user) { |
|
641 | 641 | \OC_Hook::emit('OC_User', 'logout', []); |
642 | 642 | |
643 | 643 | /** @var IEventDispatcher $dispatcher */ |
644 | 644 | $dispatcher = $this->get(IEventDispatcher::class); |
645 | 645 | $dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user)); |
646 | 646 | }); |
647 | - $userSession->listen('\OC\User', 'postLogout', function ($user) { |
|
647 | + $userSession->listen('\OC\User', 'postLogout', function($user) { |
|
648 | 648 | /** @var IEventDispatcher $dispatcher */ |
649 | 649 | $dispatcher = $this->get(IEventDispatcher::class); |
650 | 650 | $dispatcher->dispatchTyped(new UserLoggedOutEvent($user)); |
651 | 651 | }); |
652 | - $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) { |
|
652 | + $userSession->listen('\OC\User', 'changeUser', function($user, $feature, $value, $oldValue) { |
|
653 | 653 | /** @var \OC\User\User $user */ |
654 | 654 | \OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]); |
655 | 655 | |
@@ -673,7 +673,7 @@ discard block |
||
673 | 673 | $this->registerDeprecatedAlias('AllConfig', \OC\AllConfig::class); |
674 | 674 | $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class); |
675 | 675 | |
676 | - $this->registerService(\OC\SystemConfig::class, function ($c) use ($config) { |
|
676 | + $this->registerService(\OC\SystemConfig::class, function($c) use ($config) { |
|
677 | 677 | return new \OC\SystemConfig($config); |
678 | 678 | }); |
679 | 679 | /** @deprecated 19.0.0 */ |
@@ -683,7 +683,7 @@ discard block |
||
683 | 683 | $this->registerDeprecatedAlias('AppConfig', \OC\AppConfig::class); |
684 | 684 | $this->registerAlias(IAppConfig::class, \OC\AppConfig::class); |
685 | 685 | |
686 | - $this->registerService(IFactory::class, function (Server $c) { |
|
686 | + $this->registerService(IFactory::class, function(Server $c) { |
|
687 | 687 | return new \OC\L10N\Factory( |
688 | 688 | $c->get(\OCP\IConfig::class), |
689 | 689 | $c->getRequest(), |
@@ -703,13 +703,13 @@ discard block |
||
703 | 703 | /** @deprecated 19.0.0 */ |
704 | 704 | $this->registerDeprecatedAlias('CategoryFetcher', CategoryFetcher::class); |
705 | 705 | |
706 | - $this->registerService(ICache::class, function ($c) { |
|
706 | + $this->registerService(ICache::class, function($c) { |
|
707 | 707 | return new Cache\File(); |
708 | 708 | }); |
709 | 709 | /** @deprecated 19.0.0 */ |
710 | 710 | $this->registerDeprecatedAlias('UserCache', ICache::class); |
711 | 711 | |
712 | - $this->registerService(Factory::class, function (Server $c) { |
|
712 | + $this->registerService(Factory::class, function(Server $c) { |
|
713 | 713 | $profiler = $c->get(IProfiler::class); |
714 | 714 | $arrayCacheFactory = new \OC\Memcache\Factory('', $c->get(LoggerInterface::class), |
715 | 715 | $profiler, |
@@ -735,7 +735,7 @@ discard block |
||
735 | 735 | $version = implode(',', $v); |
736 | 736 | $instanceId = \OC_Util::getInstanceId(); |
737 | 737 | $path = \OC::$SERVERROOT; |
738 | - $prefix = md5($instanceId . '-' . $version . '-' . $path); |
|
738 | + $prefix = md5($instanceId.'-'.$version.'-'.$path); |
|
739 | 739 | return new \OC\Memcache\Factory($prefix, |
740 | 740 | $c->get(LoggerInterface::class), |
741 | 741 | $profiler, |
@@ -751,12 +751,12 @@ discard block |
||
751 | 751 | $this->registerDeprecatedAlias('MemCacheFactory', Factory::class); |
752 | 752 | $this->registerAlias(ICacheFactory::class, Factory::class); |
753 | 753 | |
754 | - $this->registerService('RedisFactory', function (Server $c) { |
|
754 | + $this->registerService('RedisFactory', function(Server $c) { |
|
755 | 755 | $systemConfig = $c->get(SystemConfig::class); |
756 | 756 | return new RedisFactory($systemConfig, $c->getEventLogger()); |
757 | 757 | }); |
758 | 758 | |
759 | - $this->registerService(\OCP\Activity\IManager::class, function (Server $c) { |
|
759 | + $this->registerService(\OCP\Activity\IManager::class, function(Server $c) { |
|
760 | 760 | $l10n = $this->get(IFactory::class)->get('lib'); |
761 | 761 | return new \OC\Activity\Manager( |
762 | 762 | $c->getRequest(), |
@@ -769,14 +769,14 @@ discard block |
||
769 | 769 | /** @deprecated 19.0.0 */ |
770 | 770 | $this->registerDeprecatedAlias('ActivityManager', \OCP\Activity\IManager::class); |
771 | 771 | |
772 | - $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) { |
|
772 | + $this->registerService(\OCP\Activity\IEventMerger::class, function(Server $c) { |
|
773 | 773 | return new \OC\Activity\EventMerger( |
774 | 774 | $c->getL10N('lib') |
775 | 775 | ); |
776 | 776 | }); |
777 | 777 | $this->registerAlias(IValidator::class, Validator::class); |
778 | 778 | |
779 | - $this->registerService(AvatarManager::class, function (Server $c) { |
|
779 | + $this->registerService(AvatarManager::class, function(Server $c) { |
|
780 | 780 | return new AvatarManager( |
781 | 781 | $c->get(IUserSession::class), |
782 | 782 | $c->get(\OC\User\Manager::class), |
@@ -797,7 +797,7 @@ discard block |
||
797 | 797 | $this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class); |
798 | 798 | $this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class); |
799 | 799 | |
800 | - $this->registerService(\OC\Log::class, function (Server $c) { |
|
800 | + $this->registerService(\OC\Log::class, function(Server $c) { |
|
801 | 801 | $logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file'); |
802 | 802 | $factory = new LogFactory($c, $this->get(SystemConfig::class)); |
803 | 803 | $logger = $factory->get($logType); |
@@ -811,7 +811,7 @@ discard block |
||
811 | 811 | // PSR-3 logger |
812 | 812 | $this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class); |
813 | 813 | |
814 | - $this->registerService(ILogFactory::class, function (Server $c) { |
|
814 | + $this->registerService(ILogFactory::class, function(Server $c) { |
|
815 | 815 | return new LogFactory($c, $this->get(SystemConfig::class)); |
816 | 816 | }); |
817 | 817 | |
@@ -819,7 +819,7 @@ discard block |
||
819 | 819 | /** @deprecated 19.0.0 */ |
820 | 820 | $this->registerDeprecatedAlias('JobList', IJobList::class); |
821 | 821 | |
822 | - $this->registerService(Router::class, function (Server $c) { |
|
822 | + $this->registerService(Router::class, function(Server $c) { |
|
823 | 823 | $cacheFactory = $c->get(ICacheFactory::class); |
824 | 824 | $logger = $c->get(LoggerInterface::class); |
825 | 825 | if ($cacheFactory->isLocalCacheAvailable()) { |
@@ -837,7 +837,7 @@ discard block |
||
837 | 837 | /** @deprecated 19.0.0 */ |
838 | 838 | $this->registerDeprecatedAlias('Search', ISearch::class); |
839 | 839 | |
840 | - $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) { |
|
840 | + $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) { |
|
841 | 841 | $cacheFactory = $c->get(ICacheFactory::class); |
842 | 842 | if ($cacheFactory->isAvailable()) { |
843 | 843 | $backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend( |
@@ -873,7 +873,7 @@ discard block |
||
873 | 873 | $this->registerDeprecatedAlias('CredentialsManager', ICredentialsManager::class); |
874 | 874 | |
875 | 875 | $this->registerAlias(IDBConnection::class, ConnectionAdapter::class); |
876 | - $this->registerService(Connection::class, function (Server $c) { |
|
876 | + $this->registerService(Connection::class, function(Server $c) { |
|
877 | 877 | $systemConfig = $c->get(SystemConfig::class); |
878 | 878 | $factory = new \OC\DB\ConnectionFactory($systemConfig); |
879 | 879 | $type = $systemConfig->getValue('dbtype', 'sqlite'); |
@@ -889,19 +889,19 @@ discard block |
||
889 | 889 | |
890 | 890 | $this->registerAlias(ICertificateManager::class, CertificateManager::class); |
891 | 891 | $this->registerAlias(IClientService::class, ClientService::class); |
892 | - $this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) { |
|
892 | + $this->registerService(NegativeDnsCache::class, function(ContainerInterface $c) { |
|
893 | 893 | return new NegativeDnsCache( |
894 | 894 | $c->get(ICacheFactory::class), |
895 | 895 | ); |
896 | 896 | }); |
897 | 897 | $this->registerDeprecatedAlias('HttpClientService', IClientService::class); |
898 | - $this->registerService(IEventLogger::class, function (ContainerInterface $c) { |
|
898 | + $this->registerService(IEventLogger::class, function(ContainerInterface $c) { |
|
899 | 899 | return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class)); |
900 | 900 | }); |
901 | 901 | /** @deprecated 19.0.0 */ |
902 | 902 | $this->registerDeprecatedAlias('EventLogger', IEventLogger::class); |
903 | 903 | |
904 | - $this->registerService(IQueryLogger::class, function (ContainerInterface $c) { |
|
904 | + $this->registerService(IQueryLogger::class, function(ContainerInterface $c) { |
|
905 | 905 | $queryLogger = new QueryLogger(); |
906 | 906 | if ($c->get(SystemConfig::class)->getValue('debug', false)) { |
907 | 907 | // In debug mode, module is being activated by default |
@@ -916,7 +916,7 @@ discard block |
||
916 | 916 | $this->registerDeprecatedAlias('TempManager', TempManager::class); |
917 | 917 | $this->registerAlias(ITempManager::class, TempManager::class); |
918 | 918 | |
919 | - $this->registerService(AppManager::class, function (ContainerInterface $c) { |
|
919 | + $this->registerService(AppManager::class, function(ContainerInterface $c) { |
|
920 | 920 | // TODO: use auto-wiring |
921 | 921 | return new \OC\App\AppManager( |
922 | 922 | $c->get(IUserSession::class), |
@@ -936,7 +936,7 @@ discard block |
||
936 | 936 | /** @deprecated 19.0.0 */ |
937 | 937 | $this->registerDeprecatedAlias('DateTimeZone', IDateTimeZone::class); |
938 | 938 | |
939 | - $this->registerService(IDateTimeFormatter::class, function (Server $c) { |
|
939 | + $this->registerService(IDateTimeFormatter::class, function(Server $c) { |
|
940 | 940 | $language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null); |
941 | 941 | |
942 | 942 | return new DateTimeFormatter( |
@@ -947,7 +947,7 @@ discard block |
||
947 | 947 | /** @deprecated 19.0.0 */ |
948 | 948 | $this->registerDeprecatedAlias('DateTimeFormatter', IDateTimeFormatter::class); |
949 | 949 | |
950 | - $this->registerService(IUserMountCache::class, function (ContainerInterface $c) { |
|
950 | + $this->registerService(IUserMountCache::class, function(ContainerInterface $c) { |
|
951 | 951 | $mountCache = new UserMountCache( |
952 | 952 | $c->get(IDBConnection::class), |
953 | 953 | $c->get(IUserManager::class), |
@@ -960,7 +960,7 @@ discard block |
||
960 | 960 | /** @deprecated 19.0.0 */ |
961 | 961 | $this->registerDeprecatedAlias('UserMountCache', IUserMountCache::class); |
962 | 962 | |
963 | - $this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) { |
|
963 | + $this->registerService(IMountProviderCollection::class, function(ContainerInterface $c) { |
|
964 | 964 | $loader = \OC\Files\Filesystem::getLoader(); |
965 | 965 | $mountCache = $c->get(IUserMountCache::class); |
966 | 966 | $manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache); |
@@ -982,7 +982,7 @@ discard block |
||
982 | 982 | |
983 | 983 | /** @deprecated 20.0.0 */ |
984 | 984 | $this->registerDeprecatedAlias('IniWrapper', IniGetWrapper::class); |
985 | - $this->registerService(IBus::class, function (ContainerInterface $c) { |
|
985 | + $this->registerService(IBus::class, function(ContainerInterface $c) { |
|
986 | 986 | $busClass = $c->get(\OCP\IConfig::class)->getSystemValue('commandbus'); |
987 | 987 | if ($busClass) { |
988 | 988 | [$app, $class] = explode('::', $busClass, 2); |
@@ -1004,7 +1004,7 @@ discard block |
||
1004 | 1004 | /** @deprecated 19.0.0 */ |
1005 | 1005 | $this->registerDeprecatedAlias('Throttler', Throttler::class); |
1006 | 1006 | $this->registerAlias(IThrottler::class, Throttler::class); |
1007 | - $this->registerService('IntegrityCodeChecker', function (ContainerInterface $c) { |
|
1007 | + $this->registerService('IntegrityCodeChecker', function(ContainerInterface $c) { |
|
1008 | 1008 | // IConfig and IAppManager requires a working database. This code |
1009 | 1009 | // might however be called when ownCloud is not yet setup. |
1010 | 1010 | if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) { |
@@ -1025,7 +1025,7 @@ discard block |
||
1025 | 1025 | $c->get(IMimeTypeDetector::class) |
1026 | 1026 | ); |
1027 | 1027 | }); |
1028 | - $this->registerService(\OCP\IRequest::class, function (ContainerInterface $c) { |
|
1028 | + $this->registerService(\OCP\IRequest::class, function(ContainerInterface $c) { |
|
1029 | 1029 | if (isset($this['urlParams'])) { |
1030 | 1030 | $urlParams = $this['urlParams']; |
1031 | 1031 | } else { |
@@ -1062,14 +1062,14 @@ discard block |
||
1062 | 1062 | /** @deprecated 19.0.0 */ |
1063 | 1063 | $this->registerDeprecatedAlias('Request', \OCP\IRequest::class); |
1064 | 1064 | |
1065 | - $this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId { |
|
1065 | + $this->registerService(IRequestId::class, function(ContainerInterface $c): IRequestId { |
|
1066 | 1066 | return new RequestId( |
1067 | 1067 | $_SERVER['UNIQUE_ID'] ?? '', |
1068 | 1068 | $this->get(ISecureRandom::class) |
1069 | 1069 | ); |
1070 | 1070 | }); |
1071 | 1071 | |
1072 | - $this->registerService(IMailer::class, function (Server $c) { |
|
1072 | + $this->registerService(IMailer::class, function(Server $c) { |
|
1073 | 1073 | return new Mailer( |
1074 | 1074 | $c->get(\OCP\IConfig::class), |
1075 | 1075 | $c->get(LoggerInterface::class), |
@@ -1086,7 +1086,7 @@ discard block |
||
1086 | 1086 | /** @deprecated 21.0.0 */ |
1087 | 1087 | $this->registerDeprecatedAlias('LDAPProvider', ILDAPProvider::class); |
1088 | 1088 | |
1089 | - $this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) { |
|
1089 | + $this->registerService(ILDAPProviderFactory::class, function(ContainerInterface $c) { |
|
1090 | 1090 | $config = $c->get(\OCP\IConfig::class); |
1091 | 1091 | $factoryClass = $config->getSystemValue('ldapProviderFactory', null); |
1092 | 1092 | if (is_null($factoryClass) || !class_exists($factoryClass)) { |
@@ -1095,11 +1095,11 @@ discard block |
||
1095 | 1095 | /** @var \OCP\LDAP\ILDAPProviderFactory $factory */ |
1096 | 1096 | return new $factoryClass($this); |
1097 | 1097 | }); |
1098 | - $this->registerService(ILDAPProvider::class, function (ContainerInterface $c) { |
|
1098 | + $this->registerService(ILDAPProvider::class, function(ContainerInterface $c) { |
|
1099 | 1099 | $factory = $c->get(ILDAPProviderFactory::class); |
1100 | 1100 | return $factory->getLDAPProvider(); |
1101 | 1101 | }); |
1102 | - $this->registerService(ILockingProvider::class, function (ContainerInterface $c) { |
|
1102 | + $this->registerService(ILockingProvider::class, function(ContainerInterface $c) { |
|
1103 | 1103 | $ini = $c->get(IniGetWrapper::class); |
1104 | 1104 | $config = $c->get(\OCP\IConfig::class); |
1105 | 1105 | $ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time'))); |
@@ -1122,12 +1122,12 @@ discard block |
||
1122 | 1122 | /** @deprecated 19.0.0 */ |
1123 | 1123 | $this->registerDeprecatedAlias('LockingProvider', ILockingProvider::class); |
1124 | 1124 | |
1125 | - $this->registerService(ILockManager::class, function (Server $c): LockManager { |
|
1125 | + $this->registerService(ILockManager::class, function(Server $c): LockManager { |
|
1126 | 1126 | return new LockManager(); |
1127 | 1127 | }); |
1128 | 1128 | |
1129 | 1129 | $this->registerAlias(ILockdownManager::class, 'LockdownManager'); |
1130 | - $this->registerService(SetupManager::class, function ($c) { |
|
1130 | + $this->registerService(SetupManager::class, function($c) { |
|
1131 | 1131 | // create the setupmanager through the mount manager to resolve the cyclic dependency |
1132 | 1132 | return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager(); |
1133 | 1133 | }); |
@@ -1135,12 +1135,12 @@ discard block |
||
1135 | 1135 | /** @deprecated 19.0.0 */ |
1136 | 1136 | $this->registerDeprecatedAlias('MountManager', IMountManager::class); |
1137 | 1137 | |
1138 | - $this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) { |
|
1138 | + $this->registerService(IMimeTypeDetector::class, function(ContainerInterface $c) { |
|
1139 | 1139 | return new \OC\Files\Type\Detection( |
1140 | 1140 | $c->get(IURLGenerator::class), |
1141 | 1141 | $c->get(LoggerInterface::class), |
1142 | 1142 | \OC::$configDir, |
1143 | - \OC::$SERVERROOT . '/resources/config/' |
|
1143 | + \OC::$SERVERROOT.'/resources/config/' |
|
1144 | 1144 | ); |
1145 | 1145 | }); |
1146 | 1146 | /** @deprecated 19.0.0 */ |
@@ -1149,22 +1149,22 @@ discard block |
||
1149 | 1149 | $this->registerAlias(IMimeTypeLoader::class, Loader::class); |
1150 | 1150 | /** @deprecated 19.0.0 */ |
1151 | 1151 | $this->registerDeprecatedAlias('MimeTypeLoader', IMimeTypeLoader::class); |
1152 | - $this->registerService(BundleFetcher::class, function () { |
|
1152 | + $this->registerService(BundleFetcher::class, function() { |
|
1153 | 1153 | return new BundleFetcher($this->getL10N('lib')); |
1154 | 1154 | }); |
1155 | 1155 | $this->registerAlias(\OCP\Notification\IManager::class, Manager::class); |
1156 | 1156 | /** @deprecated 19.0.0 */ |
1157 | 1157 | $this->registerDeprecatedAlias('NotificationManager', \OCP\Notification\IManager::class); |
1158 | 1158 | |
1159 | - $this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) { |
|
1159 | + $this->registerService(CapabilitiesManager::class, function(ContainerInterface $c) { |
|
1160 | 1160 | $manager = new CapabilitiesManager($c->get(LoggerInterface::class)); |
1161 | - $manager->registerCapability(function () use ($c) { |
|
1161 | + $manager->registerCapability(function() use ($c) { |
|
1162 | 1162 | return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class)); |
1163 | 1163 | }); |
1164 | - $manager->registerCapability(function () use ($c) { |
|
1164 | + $manager->registerCapability(function() use ($c) { |
|
1165 | 1165 | return $c->get(\OC\Security\Bruteforce\Capabilities::class); |
1166 | 1166 | }); |
1167 | - $manager->registerCapability(function () use ($c) { |
|
1167 | + $manager->registerCapability(function() use ($c) { |
|
1168 | 1168 | return $c->get(MetadataCapabilities::class); |
1169 | 1169 | }); |
1170 | 1170 | return $manager; |
@@ -1172,14 +1172,14 @@ discard block |
||
1172 | 1172 | /** @deprecated 19.0.0 */ |
1173 | 1173 | $this->registerDeprecatedAlias('CapabilitiesManager', CapabilitiesManager::class); |
1174 | 1174 | |
1175 | - $this->registerService(ICommentsManager::class, function (Server $c) { |
|
1175 | + $this->registerService(ICommentsManager::class, function(Server $c) { |
|
1176 | 1176 | $config = $c->get(\OCP\IConfig::class); |
1177 | 1177 | $factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class); |
1178 | 1178 | /** @var \OCP\Comments\ICommentsManagerFactory $factory */ |
1179 | 1179 | $factory = new $factoryClass($this); |
1180 | 1180 | $manager = $factory->getManager(); |
1181 | 1181 | |
1182 | - $manager->registerDisplayNameResolver('user', function ($id) use ($c) { |
|
1182 | + $manager->registerDisplayNameResolver('user', function($id) use ($c) { |
|
1183 | 1183 | $manager = $c->get(IUserManager::class); |
1184 | 1184 | $userDisplayName = $manager->getDisplayName($id); |
1185 | 1185 | if ($userDisplayName === null) { |
@@ -1195,7 +1195,7 @@ discard block |
||
1195 | 1195 | $this->registerDeprecatedAlias('CommentsManager', ICommentsManager::class); |
1196 | 1196 | |
1197 | 1197 | $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults'); |
1198 | - $this->registerService('ThemingDefaults', function (Server $c) { |
|
1198 | + $this->registerService('ThemingDefaults', function(Server $c) { |
|
1199 | 1199 | /* |
1200 | 1200 | * Dark magic for autoloader. |
1201 | 1201 | * If we do a class_exists it will try to load the class which will |
@@ -1232,7 +1232,7 @@ discard block |
||
1232 | 1232 | } |
1233 | 1233 | return new \OC_Defaults(); |
1234 | 1234 | }); |
1235 | - $this->registerService(JSCombiner::class, function (Server $c) { |
|
1235 | + $this->registerService(JSCombiner::class, function(Server $c) { |
|
1236 | 1236 | return new JSCombiner( |
1237 | 1237 | $c->getAppDataDir('js'), |
1238 | 1238 | $c->get(IURLGenerator::class), |
@@ -1246,7 +1246,7 @@ discard block |
||
1246 | 1246 | $this->registerDeprecatedAlias('EventDispatcher', \OC\EventDispatcher\SymfonyAdapter::class); |
1247 | 1247 | $this->registerAlias(EventDispatcherInterface::class, \OC\EventDispatcher\SymfonyAdapter::class); |
1248 | 1248 | |
1249 | - $this->registerService('CryptoWrapper', function (ContainerInterface $c) { |
|
1249 | + $this->registerService('CryptoWrapper', function(ContainerInterface $c) { |
|
1250 | 1250 | // FIXME: Instantiated here due to cyclic dependency |
1251 | 1251 | $request = new Request( |
1252 | 1252 | [ |
@@ -1273,14 +1273,14 @@ discard block |
||
1273 | 1273 | }); |
1274 | 1274 | /** @deprecated 19.0.0 */ |
1275 | 1275 | $this->registerDeprecatedAlias('CsrfTokenManager', CsrfTokenManager::class); |
1276 | - $this->registerService(SessionStorage::class, function (ContainerInterface $c) { |
|
1276 | + $this->registerService(SessionStorage::class, function(ContainerInterface $c) { |
|
1277 | 1277 | return new SessionStorage($c->get(ISession::class)); |
1278 | 1278 | }); |
1279 | 1279 | $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class); |
1280 | 1280 | /** @deprecated 19.0.0 */ |
1281 | 1281 | $this->registerDeprecatedAlias('ContentSecurityPolicyManager', ContentSecurityPolicyManager::class); |
1282 | 1282 | |
1283 | - $this->registerService(\OCP\Share\IManager::class, function (IServerContainer $c) { |
|
1283 | + $this->registerService(\OCP\Share\IManager::class, function(IServerContainer $c) { |
|
1284 | 1284 | $config = $c->get(\OCP\IConfig::class); |
1285 | 1285 | $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class); |
1286 | 1286 | /** @var \OCP\Share\IProviderFactory $factory */ |
@@ -1312,7 +1312,7 @@ discard block |
||
1312 | 1312 | /** @deprecated 19.0.0 */ |
1313 | 1313 | $this->registerDeprecatedAlias('ShareManager', \OCP\Share\IManager::class); |
1314 | 1314 | |
1315 | - $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) { |
|
1315 | + $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function(Server $c) { |
|
1316 | 1316 | $instance = new Collaboration\Collaborators\Search($c); |
1317 | 1317 | |
1318 | 1318 | // register default plugins |
@@ -1337,27 +1337,27 @@ discard block |
||
1337 | 1337 | |
1338 | 1338 | $this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class); |
1339 | 1339 | $this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class); |
1340 | - $this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) { |
|
1340 | + $this->registerService(\OC\Files\AppData\Factory::class, function(ContainerInterface $c) { |
|
1341 | 1341 | return new \OC\Files\AppData\Factory( |
1342 | 1342 | $c->get(IRootFolder::class), |
1343 | 1343 | $c->get(SystemConfig::class) |
1344 | 1344 | ); |
1345 | 1345 | }); |
1346 | 1346 | |
1347 | - $this->registerService('LockdownManager', function (ContainerInterface $c) { |
|
1348 | - return new LockdownManager(function () use ($c) { |
|
1347 | + $this->registerService('LockdownManager', function(ContainerInterface $c) { |
|
1348 | + return new LockdownManager(function() use ($c) { |
|
1349 | 1349 | return $c->get(ISession::class); |
1350 | 1350 | }); |
1351 | 1351 | }); |
1352 | 1352 | |
1353 | - $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) { |
|
1353 | + $this->registerService(\OCP\OCS\IDiscoveryService::class, function(ContainerInterface $c) { |
|
1354 | 1354 | return new DiscoveryService( |
1355 | 1355 | $c->get(ICacheFactory::class), |
1356 | 1356 | $c->get(IClientService::class) |
1357 | 1357 | ); |
1358 | 1358 | }); |
1359 | 1359 | |
1360 | - $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) { |
|
1360 | + $this->registerService(ICloudIdManager::class, function(ContainerInterface $c) { |
|
1361 | 1361 | return new CloudIdManager( |
1362 | 1362 | $c->get(\OCP\Contacts\IManager::class), |
1363 | 1363 | $c->get(IURLGenerator::class), |
@@ -1369,7 +1369,7 @@ discard block |
||
1369 | 1369 | |
1370 | 1370 | $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class); |
1371 | 1371 | |
1372 | - $this->registerService(ICloudFederationProviderManager::class, function (ContainerInterface $c) { |
|
1372 | + $this->registerService(ICloudFederationProviderManager::class, function(ContainerInterface $c) { |
|
1373 | 1373 | return new CloudFederationProviderManager( |
1374 | 1374 | $c->get(IAppManager::class), |
1375 | 1375 | $c->get(IClientService::class), |
@@ -1378,7 +1378,7 @@ discard block |
||
1378 | 1378 | ); |
1379 | 1379 | }); |
1380 | 1380 | |
1381 | - $this->registerService(ICloudFederationFactory::class, function (Server $c) { |
|
1381 | + $this->registerService(ICloudFederationFactory::class, function(Server $c) { |
|
1382 | 1382 | return new CloudFederationFactory(); |
1383 | 1383 | }); |
1384 | 1384 | |
@@ -1390,7 +1390,7 @@ discard block |
||
1390 | 1390 | /** @deprecated 19.0.0 */ |
1391 | 1391 | $this->registerDeprecatedAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class); |
1392 | 1392 | |
1393 | - $this->registerService(Defaults::class, function (Server $c) { |
|
1393 | + $this->registerService(Defaults::class, function(Server $c) { |
|
1394 | 1394 | return new Defaults( |
1395 | 1395 | $c->getThemingDefaults() |
1396 | 1396 | ); |
@@ -1398,17 +1398,17 @@ discard block |
||
1398 | 1398 | /** @deprecated 19.0.0 */ |
1399 | 1399 | $this->registerDeprecatedAlias('Defaults', \OCP\Defaults::class); |
1400 | 1400 | |
1401 | - $this->registerService(\OCP\ISession::class, function (ContainerInterface $c) { |
|
1401 | + $this->registerService(\OCP\ISession::class, function(ContainerInterface $c) { |
|
1402 | 1402 | return $c->get(\OCP\IUserSession::class)->getSession(); |
1403 | 1403 | }, false); |
1404 | 1404 | |
1405 | - $this->registerService(IShareHelper::class, function (ContainerInterface $c) { |
|
1405 | + $this->registerService(IShareHelper::class, function(ContainerInterface $c) { |
|
1406 | 1406 | return new ShareHelper( |
1407 | 1407 | $c->get(\OCP\Share\IManager::class) |
1408 | 1408 | ); |
1409 | 1409 | }); |
1410 | 1410 | |
1411 | - $this->registerService(Installer::class, function (ContainerInterface $c) { |
|
1411 | + $this->registerService(Installer::class, function(ContainerInterface $c) { |
|
1412 | 1412 | return new Installer( |
1413 | 1413 | $c->get(AppFetcher::class), |
1414 | 1414 | $c->get(IClientService::class), |
@@ -1419,11 +1419,11 @@ discard block |
||
1419 | 1419 | ); |
1420 | 1420 | }); |
1421 | 1421 | |
1422 | - $this->registerService(IApiFactory::class, function (ContainerInterface $c) { |
|
1422 | + $this->registerService(IApiFactory::class, function(ContainerInterface $c) { |
|
1423 | 1423 | return new ApiFactory($c->get(IClientService::class)); |
1424 | 1424 | }); |
1425 | 1425 | |
1426 | - $this->registerService(IInstanceFactory::class, function (ContainerInterface $c) { |
|
1426 | + $this->registerService(IInstanceFactory::class, function(ContainerInterface $c) { |
|
1427 | 1427 | $memcacheFactory = $c->get(ICacheFactory::class); |
1428 | 1428 | return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class)); |
1429 | 1429 | }); |
@@ -2359,11 +2359,11 @@ discard block |
||
2359 | 2359 | } |
2360 | 2360 | |
2361 | 2361 | private function registerDeprecatedAlias(string $alias, string $target) { |
2362 | - $this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) { |
|
2362 | + $this->registerService($alias, function(ContainerInterface $container) use ($target, $alias) { |
|
2363 | 2363 | try { |
2364 | 2364 | /** @var LoggerInterface $logger */ |
2365 | 2365 | $logger = $container->get(LoggerInterface::class); |
2366 | - $logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']); |
|
2366 | + $logger->debug('The requested alias "'.$alias.'" is deprecated. Please request "'.$target.'" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']); |
|
2367 | 2367 | } catch (ContainerExceptionInterface $e) { |
2368 | 2368 | // Could not get logger. Continue |
2369 | 2369 | } |