File: phpbb/di/container_builder.php
Unmodified
Added
Modified
Removed
| Line 115 | Line 115 |
|---|
/** @var \Exception */
private $build_exception;
|
/** @var \Exception */
private $build_exception;
|
| |
/**
* @var array
*/
private $env_parameters = [];
|
/**
* Constructor
|
/**
* Constructor
|
| Line 124 | Line 129 |
|---|
*/
public function __construct($phpbb_root_path, $php_ext)
{
|
*/
public function __construct($phpbb_root_path, $php_ext)
{
|
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
| $this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
$this->env_parameters = $this->get_env_parameters();
if (isset($this->env_parameters['core.cache_dir']))
{
$this->with_cache_dir($this->env_parameters['core.cache_dir']);
}
|
}
/**
| }
/**
|
| Line 581 | Line 592 |
|---|
protected function get_core_parameters()
{
return array_merge(
|
protected function get_core_parameters()
{
return array_merge(
|
array(
| [
|
'core.root_path' => $this->phpbb_root_path,
'core.php_ext' => $this->php_ext,
'core.environment' => $this->get_environment(),
'core.debug' => defined('DEBUG') ? DEBUG : false,
'core.cache_dir' => $this->get_cache_dir(),
|
'core.root_path' => $this->phpbb_root_path,
'core.php_ext' => $this->php_ext,
'core.environment' => $this->get_environment(),
'core.debug' => defined('DEBUG') ? DEBUG : false,
'core.cache_dir' => $this->get_cache_dir(),
|
),
$this->get_env_parameters()
| ],
$this->env_parameters
|
);
}
| );
}
|
