Register app containers in the OC container
This commit is contained in:
parent
22d1b1285e
commit
412e4ed3f6
|
@ -62,6 +62,10 @@ class DIContainer extends SimpleContainer implements IAppContainer {
|
|||
$this['AppName'] = $appName;
|
||||
$this['urlParams'] = $urlParams;
|
||||
|
||||
/** @var \OC\ServerContainer $server */
|
||||
$server = $this->getServer();
|
||||
$server->registerAppContainer($appName, $this);
|
||||
|
||||
// aliases
|
||||
$this->registerAlias('appName', 'AppName');
|
||||
$this->registerAlias('webRoot', 'WebRoot');
|
||||
|
|
|
@ -78,7 +78,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
|||
*
|
||||
* TODO: hookup all manager classes
|
||||
*/
|
||||
class Server extends SimpleContainer implements IServerContainer {
|
||||
class Server extends ServerContainer implements IServerContainer {
|
||||
/** @var string */
|
||||
private $webRoot;
|
||||
|
||||
|
|
|
@ -0,0 +1,65 @@
|
|||
<?php
|
||||
/**
|
||||
* @author Joas Schilling <nickvergessen@owncloud.com>
|
||||
*
|
||||
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC;
|
||||
|
||||
|
||||
use OC\AppFramework\DependencyInjection\DIContainer;
|
||||
use OC\AppFramework\Utility\SimpleContainer;
|
||||
use OCP\AppFramework\QueryException;
|
||||
|
||||
/**
|
||||
* Class ServerContainer
|
||||
*
|
||||
* @package OC
|
||||
*/
|
||||
class ServerContainer extends SimpleContainer {
|
||||
/** @var DIContainer[] */
|
||||
protected $appContainers;
|
||||
|
||||
/**
|
||||
* ServerContainer constructor.
|
||||
*/
|
||||
public function __construct() {
|
||||
parent::__construct();
|
||||
$this->appContainers = [];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $appName
|
||||
* @param DIContainer $container
|
||||
*/
|
||||
public function registerAppContainer($appName, DIContainer $container) {
|
||||
$this->appContainers[$appName] = $container;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $appName
|
||||
* @return DIContainer
|
||||
*/
|
||||
public function getAppContainer($appName) {
|
||||
if (isset($this->appContainers[$appName])) {
|
||||
return $this->appContainers[$appName];
|
||||
}
|
||||
|
||||
return new DIContainer($appName);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue