makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13740] Deduplicate container builder's checks

Browse source 
PHPBB3-13740
This commit is contained in:
Mate Bartus 2015-07-25 14:43:54 +02:00
parent 723337d2f6
commit e8e9193690
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
phpBB/phpbb/install/helper/container_factory.php
View file

@ -73,16 +73,7 @@ class container_factory
// Check if container was built, if not try to build it // Check if container was built, if not try to build it
if ($this->container === null) if ($this->container === null)
{ {
// Check whether container can be built $this->build_container();
// We need config.php for that so let's check if it has been set up yet
if (filesize($this->phpbb_root_path . 'config.' . $this->php_ext))
{
$this->build_container();
}
else
{
throw new cannot_build_container_exception();
}
} }
return ($service_name === null) ? $this->container : $this->container->get($service_name); return ($service_name === null) ? $this->container : $this->container->get($service_name);
@ -102,16 +93,7 @@ class container_factory
// Check if container was built, if not try to build it // Check if container was built, if not try to build it
if ($this->container === null) if ($this->container === null)
{ {
// Check whether container can be built $this->build_container();
// We need config.php for that so let's check if it has been set up yet
if (filesize($this->phpbb_root_path . 'config.' . $this->php_ext))
{
$this->build_container();
}
else
{
throw new cannot_build_container_exception();
}
} }
return $this->container->getParameter($param_name); return $this->container->getParameter($param_name);
@ -119,6 +101,8 @@ class container_factory
/** /**
* Build dependency injection container * Build dependency injection container
*
* @throws \phpbb\install\exception\cannot_build_container_exception When container cannot be built
*/ */
protected function build_container() protected function build_container()
{ {
@ -129,6 +113,17 @@ class container_factory
return; return;
} }
// Check whether container can be built
// We need config.php for that so let's check if it has been set up yet
if (filesize($this->phpbb_root_path . 'config.' . $this->php_ext))
{
$this->build_container();
}
else
{
throw new cannot_build_container_exception();
}
$phpbb_config_php_file = new \phpbb\config_php_file($this->phpbb_root_path, $this->php_ext); $phpbb_config_php_file = new \phpbb\config_php_file($this->phpbb_root_path, $this->php_ext);
$phpbb_container_builder = new \phpbb\di\container_builder($this->phpbb_root_path, $this->php_ext); $phpbb_container_builder = new \phpbb\di\container_builder($this->phpbb_root_path, $this->php_ext);