phpBB

Code Changes

File: phpbb/install/helper/container_factory.php

  Unmodified   Added   Modified   Removed
Line 35Line 35
	protected $php_ext;

/**

	protected $php_ext;

/**

	 * @var \phpbb\request\request

	 * @var request

	 */
protected $request;


	 */
protected $request;


Line 78Line 78
	 * @return \Symfony\Component\DependencyInjection\ContainerInterface|Object	phpBB's dependency injection container
* or the service specified in $service_name
*

	 * @return \Symfony\Component\DependencyInjection\ContainerInterface|Object	phpBB's dependency injection container
* or the service specified in $service_name
*

	 * @throws \phpbb\install\exception\cannot_build_container_exception							When container cannot be built

	 * @throws cannot_build_container_exception														When container cannot be built

	 * @throws \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException			If the service is not defined
* @throws \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException When a circular reference is detected
* @throws \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException When the service is not defined

	 * @throws \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException			If the service is not defined
* @throws \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException When a circular reference is detected
* @throws \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException When the service is not defined

Line 101Line 101
	 *
* @return mixed
*

	 *
* @return mixed
*

	 * @throws \phpbb\install\exception\cannot_build_container_exception	When container cannot be built

	 * @throws cannot_build_container_exception	When container cannot be built

	 */
public function get_parameter($param_name)
{

	 */
public function get_parameter($param_name)
{

Line 117Line 117
	/**
* Build dependency injection container
*

	/**
* Build dependency injection container
*

	 * @throws \phpbb\install\exception\cannot_build_container_exception	When container cannot be built

	 * @throws cannot_build_container_exception	When container cannot be built

	 */
protected function build_container()
{

	 */
protected function build_container()
{

Line 134Line 134
		{
throw new cannot_build_container_exception();
}

		{
throw new cannot_build_container_exception();
}


$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);

// For BC with functions that we need during install
global $phpbb_container, $table_prefix;

 

$disable_super_globals = $this->request->super_globals_disabled();



$disable_super_globals = $this->request->super_globals_disabled();


Line 148Line 142
		{
$this->request->enable_super_globals();
}

		{
$this->request->enable_super_globals();
}

 

$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);

// For BC with functions that we need during install
global $phpbb_container, $table_prefix;


$other_config_path = $this->phpbb_root_path . 'install/update/new/config';
$config_path = (is_dir($other_config_path)) ? $other_config_path : $this->phpbb_root_path . 'config';


$other_config_path = $this->phpbb_root_path . 'install/update/new/config';
$config_path = (is_dir($other_config_path)) ? $other_config_path : $this->phpbb_root_path . 'config';

Line 183Line 183

// Get compatibility globals and constants
$this->update_helper->include_file('includes/compatibility_globals.' . $this->php_ext);


// Get compatibility globals and constants
$this->update_helper->include_file('includes/compatibility_globals.' . $this->php_ext);


register_compatibility_globals();

 

$this->update_helper->include_file('includes/constants.' . $this->php_ext);


$this->update_helper->include_file('includes/constants.' . $this->php_ext);

 

register_compatibility_globals();

	}
}


	}
}