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

Nicofuma · Nicofuma · commit acc91a2bbf28 · 2014-11-20T21:01:01.000+01:00
PHPBB3-12620
diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php
@@ -35,7 +35,9 @@
 */
 function phpbb_get_url_matcher(\phpbb\extension\manager $manager, RequestContext $context, $root_path, $php_ext)
 {
-	$config_cache = new ConfigCache($root_path . 'cache/' . PHPBB_ENVIRONMENT . '/url_matcher.' . $php_ext, defined('DEBUG'));
+	global $phpbb_container;
+
+	$config_cache = new ConfigCache($root_path . 'cache/' . $phpbb_container->getParameter('core.environment') . '/url_matcher.' . $php_ext, defined('DEBUG'));
 	if (!$config_cache->isFresh())
 	{
 		phpbb_create_dumped_url_matcher($manager, $root_path, $config_cache);
@@ -90,6 +92,8 @@ function phpbb_create_url_matcher(\phpbb\extension\manager $manager, RequestCont
 */
 function phpbb_load_url_matcher(RequestContext $context, $root_path, $php_ext)
 {
-	require($root_path . 'cache/' . PHPBB_ENVIRONMENT . '/url_matcher.' . $php_ext);
+	global $phpbb_container;
+
+	require($root_path . 'cache/' . $phpbb_container->getParameter('core.environment') . '/url_matcher.' . $php_ext);
 	return new phpbb_url_matcher($context);
 }
diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
@@ -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))
 		{
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
@@ -193,7 +193,7 @@ public function get_container()
 			}
 
 			$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 @@ public function set_cache_dir($cache_dir)
 	 */
 	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 @@ protected function get_core_parameters()
 			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 @@ protected function get_container_filename()
 		$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;
+	}
 }
diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php
@@ -51,7 +51,7 @@ public function __construct($config_path)
 	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);

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,9 @@`
`35`	`35`	`*/`
`36`	`36`	`function phpbb_get_url_matcher(\phpbb\extension\manager $manager, RequestContext $context, $root_path, $php_ext)`
`37`	`37`	`{`
`38`		`- $config_cache = new ConfigCache($root_path . 'cache/' . PHPBB_ENVIRONMENT . '/url_matcher.' . $php_ext, defined('DEBUG'));`
	`38`	`+ global $phpbb_container;`
	`39`	`+`
	`40`	`+ $config_cache = new ConfigCache($root_path . 'cache/' . $phpbb_container->getParameter('core.environment') . '/url_matcher.' . $php_ext, defined('DEBUG'));`
`39`	`41`	`if (!$config_cache->isFresh())`
`40`	`42`	`{`
`41`	`43`	`phpbb_create_dumped_url_matcher($manager, $root_path, $config_cache);`
`@@ -90,6 +92,8 @@ function phpbb_create_url_matcher(\phpbb\extension\manager $manager, RequestCont`
`90`	`92`	`*/`
`91`	`93`	`function phpbb_load_url_matcher(RequestContext $context, $root_path, $php_ext)`
`92`	`94`	`{`
`93`		`- require($root_path . 'cache/' . PHPBB_ENVIRONMENT . '/url_matcher.' . $php_ext);`
	`95`	`+ global $phpbb_container;`
	`96`	`+`
	`97`	`+ require($root_path . 'cache/' . $phpbb_container->getParameter('core.environment') . '/url_matcher.' . $php_ext);`
`94`	`98`	`return new phpbb_url_matcher($context);`
`95`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,9 @@ class file extends \phpbb\cache\driver\base`
`27`	`27`	`*/`
`28`	`28`	`function __construct($cache_dir = null)`
`29`	`29`	`{`
`30`		`- global $phpbb_root_path;`
`31`		`- $this->cache_dir = !is_null($cache_dir) ? $cache_dir : $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/';`
	`30`	`+ global $phpbb_root_path, $phpbb_container;`
	`31`	`+`
	`32`	`+ $this->cache_dir = !is_null($cache_dir) ? $cache_dir : $phpbb_root_path . 'cache/' . $phpbb_container->getParameter('core.environment') . '/';`
`32`	`33`
`33`	`34`	`if (!is_dir($this->cache_dir))`
`34`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function __construct($config_path)`
`51`	`51`	`public function load(array $configs, ContainerBuilder $container)`
`52`	`52`	`{`
`53`	`53`	`$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path)));`
`54`		`- $loader->load(PHPBB_ENVIRONMENT . '/container/environment.yml');`
	`54`	`+ $loader->load($container->getParameter('core.environment') . '/container/environment.yml');`
`55`	`55`
`56`	`56`	`$config = $this->getConfiguration($configs, $container);`
`57`	`57`	`$config = $this->processConfiguration($config, $configs);`