mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/12620] Use the container to get the environment name

Browse Source 
PHPBB3-12620
This commit is contained in:
Tristan Darricau
2014-11-11 17:59:41 +01:00
parent c98efc53a8
commit acc91a2bbf
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/cache/driver/file.php vendored
View File

@@ -27,8 +27,9 @@ class file extends \phpbb\cache\driver\base
*/
function __construct($cache_dir = null)
{
global $phpbb_root_path;
$this->cache_dir = !is_null($cache_dir) ? $cache_dir : $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/';
global $phpbb_root_path, $phpbb_container;
$this->cache_dir = !is_null($cache_dir) ? $cache_dir : $phpbb_root_path . 'cache/' . $phpbb_container->getParameter('core.environment') . '/';
if (!is_dir($this->cache_dir))
{

16
phpBB/phpbb/di/container_builder.php
View File

@@ -193,7 +193,7 @@ class container_builder
}
$loader = new YamlFileLoader($this->container, new FileLocator(phpbb_realpath($this->get_config_path())));
$loader->load(PHPBB_ENVIRONMENT . '/config.yml');
$loader->load($this->container->getParameter('core.environment') . '/config.yml');
$this->inject_custom_parameters();
@@ -327,7 +327,7 @@ class container_builder
*/
protected function get_cache_dir()
{
return $this->cache_dir ?: $this->phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/';
return $this->cache_dir ?: $this->phpbb_root_path . 'cache/' . $this->get_environment() . '/';
}
/**
@@ -457,7 +457,7 @@ class container_builder
array(
'core.root_path' => $this->phpbb_root_path,
'core.php_ext' => $this->php_ext,
'core.environment' => PHPBB_ENVIRONMENT,
'core.environment' => $this->get_environment(),
'core.debug' => DEBUG,
),
$this->get_env_parameters()
@@ -495,4 +495,14 @@ class container_builder
$filename = str_replace(array('/', '.'), array('slash', 'dot'), $this->phpbb_root_path);
return $this->get_cache_dir() . 'container_' . $filename . '.' . $this->php_ext;
}
/**
* Return the name of the current environment.
*
* @return string
*/
protected function get_environment()
{
return PHPBB_ENVIRONMENT;
}
}

2
phpBB/phpbb/di/extension/core.php
View File

@@ -51,7 +51,7 @@ class core extends Extension
public function load(array $configs, ContainerBuilder $container)
{
$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path)));
$loader->load(PHPBB_ENVIRONMENT . '/container/environment.yml');
$loader->load($container->getParameter('core.environment') . '/container/environment.yml');
$config = $this->getConfiguration($configs, $container);
$config = $this->processConfiguration($config, $configs);