sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34929 from nextcloud/chore/deprecate-app-container-aliases 

Clean up and deprecate app container parameter aliases
pull/35007/head
Roeland Jago Douma 2022-11-07 12:04:07 +07:00 committed by GitHub
parent 533e1803cf 41b2466d35
commit e50f4c445d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/private/AppFramework/DependencyInjection/DIContainer.php
Unescape Escape View File

@ -96,7 +96,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
*/
public function __construct($appName, $urlParams = [], ServerContainer $server = null) {
parent::__construct();
$this['AppName'] = $appName;
$this['appName'] = $appName;
$this['urlParams'] = $urlParams;
$this->registerAlias('Request', IRequest::class);
@ -109,9 +109,12 @@ class DIContainer extends SimpleContainer implements IAppContainer {
$this->server->registerAppContainer($appName, $this);
// aliases
$this->registerAlias('appName', 'AppName');
$this->registerAlias('webRoot', 'WebRoot');
$this->registerAlias('userId', 'UserId');
/** @deprecated inject $appName */
$this->registerAlias('AppName', 'appName');
/** @deprecated inject $webRoot*/
$this->registerAlias('WebRoot', 'webRoot');
/** @deprecated inject $userId */
$this->registerAlias('UserId', 'userId');
/**
* Core services
@ -158,11 +161,11 @@ class DIContainer extends SimpleContainer implements IAppContainer {
$this->registerAlias(IAppContainer::class, ContainerInterface::class);
// commonly used attributes
$this->registerService('UserId', function (ContainerInterface $c) {
$this->registerService('userId', function (ContainerInterface $c) {
return $c->get(IUserSession::class)->getSession()->get('user_id');
});
$this->registerService('WebRoot', function (ContainerInterface $c) {
$this->registerService('webRoot', function (ContainerInterface $c) {
return $c->get(IServerContainer::class)->getWebRoot();
});