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

[ticket/12775] Renamed to \phpbb\di\container_builder

Browse source 
PHPBB3-12775
This commit is contained in:
Tristan Darricau 2014-06-29 00:29:08 +02:00
parent 11ff91c87d
commit 40937e21c5
11 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/bin/phpbbcli.php
View file

@ -38,11 +38,11 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
$phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
$phpbb_class_loader_ext->register(); $phpbb_class_loader_ext->register();
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx); $phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_factory->set_use_extensions(false); $phpbb_container_builder->set_use_extensions(false);
$phpbb_container_factory->set_dump_container(false); $phpbb_container_builder->set_dump_container(false);
$phpbb_container = $phpbb_container_factory->get_container(); $phpbb_container = $phpbb_container_builder->get_container();
$phpbb_container->get('request')->enable_super_globals(); $phpbb_container->get('request')->enable_super_globals();
require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx); require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);

4
phpBB/common.php
View file

@ -95,8 +95,8 @@ $phpbb_class_loader_ext->register();
phpbb_load_extensions_autoloaders($phpbb_root_path); phpbb_load_extensions_autoloaders($phpbb_root_path);
// Set up container // Set up container
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx); $phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_factory->get_container(); $phpbb_container = $phpbb_container_builder->get_container();
$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));

4
phpBB/download/file.php
View file

@ -61,8 +61,8 @@ if (isset($_GET['avatar']))
$phpbb_class_loader_ext->register(); $phpbb_class_loader_ext->register();
// Set up container // Set up container
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx); $phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_factory->get_container(); $phpbb_container = $phpbb_container_builder->get_container();
$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));

10
phpBB/install/database_update.php
View file

@ -86,11 +86,11 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
// Set up container (must be done here because extensions table may not exist) // Set up container (must be done here because extensions table may not exist)
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx); $phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_factory->set_use_extensions(false); $phpbb_container_builder->set_use_extensions(false);
$phpbb_container_factory->set_use_kernel_pass(false); $phpbb_container_builder->set_use_kernel_pass(false);
$phpbb_container_factory->set_dump_container(false); $phpbb_container_builder->set_dump_container(false);
$phpbb_container = $phpbb_container_factory->get_container(); $phpbb_container = $phpbb_container_builder->get_container();
// set up caching // set up caching
$cache = $phpbb_container->get('cache'); $cache = $phpbb_container->get('cache');

18
phpBB/install/index.php
View file

@ -120,18 +120,18 @@ $phpbb_class_loader_ext->register();
// Set up container // Set up container
$phpbb_config_php_handler = new \phpbb\config_php($phpbb_root_path, $phpEx); $phpbb_config_php_handler = new \phpbb\config_php($phpbb_root_path, $phpEx);
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx); $phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_factory->set_use_extensions(false); $phpbb_container_builder->set_use_extensions(false);
$phpbb_container_factory->set_dump_container(false); $phpbb_container_builder->set_dump_container(false);
$phpbb_container_factory->set_use_custom_pass(false); $phpbb_container_builder->set_use_custom_pass(false);
$phpbb_container_factory->set_inject_config(false); $phpbb_container_builder->set_inject_config(false);
$phpbb_container_factory->set_compile_container(false); $phpbb_container_builder->set_compile_container(false);
$other_config_path = $phpbb_root_path . 'install/update/new/config/'; $other_config_path = $phpbb_root_path . 'install/update/new/config/';
$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config/'; $config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config/';
$phpbb_container_factory->set_config_path($config_path); $phpbb_container_builder->set_config_path($config_path);
$phpbb_container_factory->set_custom_parameters(array( $phpbb_container_builder->set_custom_parameters(array(
'core.root_path' => $phpbb_root_path, 'core.root_path' => $phpbb_root_path,
'core.adm_relative_path' => $phpbb_adm_relative_path, 'core.adm_relative_path' => $phpbb_adm_relative_path,
'core.php_ext' => $phpEx, 'core.php_ext' => $phpEx,
@ -139,7 +139,7 @@ $phpbb_container_factory->set_custom_parameters(array(
'cache.driver.class' => 'phpbb\cache\driver\file', 'cache.driver.class' => 'phpbb\cache\driver\file',
)); ));
$phpbb_container = $phpbb_container_factory->get_container(); $phpbb_container = $phpbb_container_builder->get_container();
$phpbb_container->register('dbal.conn')->setSynthetic(true); $phpbb_container->register('dbal.conn')->setSynthetic(true);
$phpbb_container->compile(); $phpbb_container->compile();

4
phpBB/install/install_convert.php
View file

@ -127,8 +127,8 @@ class install_convert extends module
// Enable super globals to prevent issues with the new \phpbb\request\request object // Enable super globals to prevent issues with the new \phpbb\request\request object
$request->enable_super_globals(); $request->enable_super_globals();
// Create a normal container now // Create a normal container now
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx); $phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_factory->get_container(); $phpbb_container = $phpbb_container_builder->get_container();
// Create cache // Create cache
$cache = $phpbb_container->get('cache'); $cache = $phpbb_container->get('cache');

4
phpBB/install/install_install.php
View file

@ -104,8 +104,8 @@ class install_install extends module
$request->enable_super_globals(); $request->enable_super_globals();
// Create a normal container now // Create a normal container now
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx); $phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_factory->get_container(); $phpbb_container = $phpbb_container_builder->get_container();
// Sets the global variables // Sets the global variables
$cache = $phpbb_container->get('cache'); $cache = $phpbb_container->get('cache');

10
phpBB/install/install_update.php
View file

@ -76,14 +76,14 @@ class install_update extends module
$request->enable_super_globals(); $request->enable_super_globals();
// Create a normal container now // Create a normal container now
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx); $phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_factory->set_dump_container(false); $phpbb_container_builder->set_dump_container(false);
$phpbb_container_factory->set_use_extensions(false); $phpbb_container_builder->set_use_extensions(false);
if (file_exists($phpbb_root_path . 'install/update/new/config')) if (file_exists($phpbb_root_path . 'install/update/new/config'))
{ {
$phpbb_container_factory->set_config_path($phpbb_root_path . 'install/update/new/config'); $phpbb_container_builder->set_config_path($phpbb_root_path . 'install/update/new/config');
} }
$phpbb_container = $phpbb_container_factory->get_container(); $phpbb_container = $phpbb_container_builder->get_container();
// Writes into global $cache // Writes into global $cache
$cache = $phpbb_container->get('cache'); $cache = $phpbb_container->get('cache');

0
phpBB/phpbb/di/container_factory.php → phpBB/phpbb/di/container_builder.php
View file

34
tests/di/create_container_test.php
View file

@ -22,7 +22,7 @@ namespace
/** /**
* @var \phpbb\di\container_factory * @var \phpbb\di\container_factory
*/ */
protected $factory; protected $builder;
protected $phpbb_root_path; protected $phpbb_root_path;
protected $filename; protected $filename;
@ -30,7 +30,7 @@ namespace
{ {
$this->phpbb_root_path = dirname(__FILE__) . '/'; $this->phpbb_root_path = dirname(__FILE__) . '/';
$this->config_php = new \phpbb\config_php($this->phpbb_root_path . 'fixtures/', 'php'); $this->config_php = new \phpbb\config_php($this->phpbb_root_path . 'fixtures/', 'php');
$this->factory = new phpbb_mock_container_factory($this->config_php, $this->phpbb_root_path . 'fixtures/', 'php'); $this->builder = new phpbb_mock_phpbb_di_container_builder($this->config_php, $this->phpbb_root_path . 'fixtures/', 'php');
$this->filename = $this->phpbb_root_path . '../tmp/container.php'; $this->filename = $this->phpbb_root_path . '../tmp/container.php';
if (is_file($this->filename)) if (is_file($this->filename))
@ -43,7 +43,7 @@ namespace
public function test_default_container() public function test_default_container()
{ {
$container = $this->factory->get_container(); $container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
// Checks the core services // Checks the core services
@ -67,7 +67,7 @@ namespace
$this->assertTrue(is_file($this->filename)); $this->assertTrue(is_file($this->filename));
// Checks the construction of a dumped container // Checks the construction of a dumped container
$container = $this->factory->get_container(); $container = $this->builder->get_container();
$this->assertInstanceOf('phpbb_cache_container', $container); $this->assertInstanceOf('phpbb_cache_container', $container);
$this->assertFalse($container->isFrozen()); $this->assertFalse($container->isFrozen());
$container->getParameterBag(); // needed, otherwise the container is not marked as frozen $container->getParameterBag(); // needed, otherwise the container is not marked as frozen
@ -76,15 +76,15 @@ namespace
public function test_dump_container() public function test_dump_container()
{ {
$this->factory->set_dump_container(false); $this->builder->set_dump_container(false);
$container = $this->factory->get_container(); $container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
// Checks dump_container // Checks dump_container
$this->assertFalse(is_file($this->filename)); $this->assertFalse(is_file($this->filename));
// Checks the construction of a dumped container // Checks the construction of a dumped container
$container = $this->factory->get_container(); $container = $this->builder->get_container();
$this->assertNotInstanceOf('phpbb_cache_container', $container); $this->assertNotInstanceOf('phpbb_cache_container', $container);
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
$this->assertTrue($container->isFrozen()); $this->assertTrue($container->isFrozen());
@ -92,8 +92,8 @@ namespace
public function test_use_extensions() public function test_use_extensions()
{ {
$this->factory->set_use_extensions(false); $this->builder->set_use_extensions(false);
$container = $this->factory->get_container(); $container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
// Checks the core services // Checks the core services
@ -107,8 +107,8 @@ namespace
public function test_compile_container() public function test_compile_container()
{ {
$this->factory->set_compile_container(false); $this->builder->set_compile_container(false);
$container = $this->factory->get_container(); $container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
// Checks compile_container // Checks compile_container
@ -117,8 +117,8 @@ namespace
public function test_inject_config() public function test_inject_config()
{ {
$this->factory->set_inject_config(false); $this->builder->set_inject_config(false);
$container = $this->factory->get_container(); $container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
// Checks inject_config // Checks inject_config
@ -127,8 +127,8 @@ namespace
public function test_set_config_path() public function test_set_config_path()
{ {
$this->factory->set_config_path($this->phpbb_root_path . 'fixtures/other_config/'); $this->builder->set_config_path($this->phpbb_root_path . 'fixtures/other_config/');
$container = $this->factory->get_container(); $container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
$this->assertTrue($container->hasParameter('other_config')); $this->assertTrue($container->hasParameter('other_config'));
@ -137,8 +137,8 @@ namespace
public function test_set_custom_parameters() public function test_set_custom_parameters()
{ {
$this->factory->set_custom_parameters(array('my_parameter' => true)); $this->builder->set_custom_parameters(array('my_parameter' => true));
$container = $this->factory->get_container(); $container = $this->builder->get_container();
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
$this->assertTrue($container->hasParameter('my_parameter')); $this->assertTrue($container->hasParameter('my_parameter'));

2
tests/mock/container_factory.php → tests/mock/phpbb_di_container_builder.php
View file

@ -11,7 +11,7 @@
* *
*/ */
class phpbb_mock_container_factory extends \phpbb\di\container_factory class phpbb_mock_phpbb_di_container_builder extends \phpbb\di\container_factory
{ {
protected function get_container_filename() protected function get_container_filename()
{ {