mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4077 from Nicofuma/ticket/14306

Browse Source 
[ticket/14306] Automatically enable a safe mode when container building fails
This commit is contained in:
Marc Alexander
2016-01-15 18:13:34 +01:00
parent 97e002cc3d 1e0340b0cf
commit 8e584dfa6b
4 changed files with 106 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,7 @@ class container_builder
*
* @var array
*/
protected $custom_parameters = null;
protected $custom_parameters = [];
/**
* @var \phpbb\config_php_file
@@ -107,13 +107,16 @@ class container_builder
*/
private $container_extensions;
/** @var \Exception */
private $build_exception;
/**
* Constructor
*
* @param string $phpbb_root_path Path to the phpbb includes directory.
* @param string $php_ext php file extension
*/
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;
@@ -126,67 +129,96 @@ class container_builder
*/
public function get_container()
{
$container_filename = $this->get_container_filename();
$config_cache = new ConfigCache($container_filename, defined('DEBUG'));
if ($this->use_cache && $config_cache->isFresh())
try
{
require($config_cache->getPath());
$this->container = new \phpbb_cache_container();
}
else
{
$this->container_extensions = array(new extension\core($this->get_config_path()));
if ($this->use_extensions)
$container_filename = $this->get_container_filename();
$config_cache = new ConfigCache($container_filename, defined('DEBUG'));
if ($this->use_cache && $config_cache->isFresh())
{
$this->load_extensions();
require($config_cache->getPath());
$this->container = new \phpbb_cache_container();
}
// Inject the config
if ($this->config_php_file)
else
{
$this->container_extensions[] = new extension\config($this->config_php_file);
}
$this->container_extensions = array(new extension\core($this->get_config_path()));
$this->container = $this->create_container($this->container_extensions);
// Easy collections through tags
$this->container->addCompilerPass(new pass\collection_pass());
// Event listeners "phpBB style"
$this->container->addCompilerPass(new RegisterListenersPass('dispatcher', 'event.listener_listener', 'event.listener'));
// Event listeners "Symfony style"
$this->container->addCompilerPass(new RegisterListenersPass('dispatcher'));
if ($this->use_extensions)
{
$this->register_ext_compiler_pass();
}
$filesystem = new filesystem();
$loader = new YamlFileLoader($this->container, new FileLocator($filesystem->realpath($this->get_config_path())));
$loader->load($this->container->getParameter('core.environment') . '/config.yml');
$this->inject_custom_parameters();
if ($this->compile_container)
{
$this->container->compile();
if ($this->use_cache)
if ($this->use_extensions)
{
$this->dump_container($config_cache);
$this->load_extensions();
}
// Inject the config
if ($this->config_php_file)
{
$this->container_extensions[] = new extension\config($this->config_php_file);
}
$this->container = $this->create_container($this->container_extensions);
// Easy collections through tags
$this->container->addCompilerPass(new pass\collection_pass());
// Event listeners "phpBB style"
$this->container->addCompilerPass(new RegisterListenersPass('dispatcher', 'event.listener_listener', 'event.listener'));
// Event listeners "Symfony style"
$this->container->addCompilerPass(new RegisterListenersPass('dispatcher'));
if ($this->use_extensions)
{
$this->register_ext_compiler_pass();
}
$filesystem = new filesystem();
$loader = new YamlFileLoader($this->container, new FileLocator($filesystem->realpath($this->get_config_path())));
$loader->load($this->container->getParameter('core.environment') . '/config.yml');
$this->inject_custom_parameters();
if ($this->compile_container)
{
$this->container->compile();
if ($this->use_cache)
{
$this->dump_container($config_cache);
}
}
}
}
if ($this->compile_container && $this->config_php_file)
if ($this->compile_container && $this->config_php_file)
{
$this->container->set('config.php', $this->config_php_file);
}
return $this->container;
}
catch (\Exception $e)
{
$this->container->set('config.php', $this->config_php_file);
}
// Don't try to recover if we are in the development environment
if ($this->get_environment() === 'development')
{
throw $e;
}
return $this->container;
if ($this->build_exception === null)
{
$this->build_exception = $e;
return $this
->without_extensions()
->without_cache()
->with_custom_parameters(array_merge($this->custom_parameters, [
'container_exception' => $e,
]))
->get_container();
}
else
{
// Rethrow the original exception if it's still failing
throw $this->build_exception;
}
}
}
/**
@@ -451,13 +483,11 @@ class container_builder
*/
protected function inject_custom_parameters()
{
if ($this->custom_parameters !== null)
foreach ($this->custom_parameters as $key => $value)
{
foreach ($this->custom_parameters as $key => $value)
{
$this->container->setParameter($key, $value);
}
$this->container->setParameter($key, $value);
}
}
/**