mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 20:32:11 +02:00
Code Issues Releases Wiki Activity

[ticket/12775] Rename config_php to config_php_file

Browse Source 
PHPBB3-12775
This commit is contained in:
Tristan Darricau 2014-06-29 00:33:31 +02:00
parent 40937e21c5
commit 2db160ff87
13 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/bin/phpbbcli.php
View File

@ -27,8 +27,8 @@ require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
$phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
$phpbb_class_loader->register();
$phpbb_config_php_handler = new \phpbb\config_php($phpbb_root_path, $phpEx);
extract($phpbb_config_php_handler->get_all());
$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
extract($phpbb_config_php_file->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions.' . $phpEx);
@ -38,7 +38,7 @@ 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->register();
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container_builder->set_use_extensions(false);
$phpbb_container_builder->set_dump_container(false);

6
phpBB/common.php
View File

@ -27,8 +27,8 @@ require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
$phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
$phpbb_class_loader->register();
$phpbb_config_php_handler = new \phpbb\config_php($phpbb_root_path, $phpEx);
extract($phpbb_config_php_handler->get_all());
$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
extract($phpbb_config_php_file->get_all());
if (!defined('PHPBB_INSTALLED'))
{
@ -95,7 +95,7 @@ $phpbb_class_loader_ext->register();
phpbb_load_extensions_autoloaders($phpbb_root_path);
// Set up container
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->get_container();
$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));

6
phpBB/download/file.php
View File

@ -43,8 +43,8 @@ if (isset($_GET['avatar']))
$phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
$phpbb_class_loader->register();
$phpbb_config_php_handler = new \phpbb\config_php($phpbb_root_path, $phpEx);
extract($phpbb_config_php_handler->get_all());
$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
extract($phpbb_config_php_file->get_all());
if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
{
@ -61,7 +61,7 @@ if (isset($_GET['avatar']))
$phpbb_class_loader_ext->register();
// Set up container
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->get_container();
$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));

6
phpBB/install/database_update.php
View File

@ -62,8 +62,8 @@ require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
$phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
$phpbb_class_loader->register();
$phpbb_config_php_handler = new \phpbb\config_php($phpbb_root_path, $phpEx);
extract($phpbb_config_php_handler->get_all());
$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
extract($phpbb_config_php_file->get_all());
if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
{
@ -86,7 +86,7 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
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)
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container_builder->set_use_extensions(false);
$phpbb_container_builder->set_use_kernel_pass(false);
$phpbb_container_builder->set_dump_container(false);

4
phpBB/install/index.php
View File

@ -119,8 +119,8 @@ $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/"
$phpbb_class_loader_ext->register();
// Set up container
$phpbb_config_php_handler = new \phpbb\config_php($phpbb_root_path, $phpEx);
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container_builder->set_use_extensions(false);
$phpbb_container_builder->set_dump_container(false);
$phpbb_container_builder->set_use_custom_pass(false);

24
phpBB/install/install_convert.php
View File

@ -107,7 +107,7 @@ class install_convert extends module
function main($mode, $sub)
{
global $lang, $template, $phpbb_root_path, $phpEx, $cache, $config, $language, $table_prefix;
global $convert, $request, $phpbb_container, $phpbb_config_php_handler;
global $convert, $request, $phpbb_container, $phpbb_config_php_file;
$this->tpl_name = 'install_convert';
$this->mode = $mode;
@ -127,7 +127,7 @@ class install_convert extends module
// Enable super globals to prevent issues with the new \phpbb\request\request object
$request->enable_super_globals();
// Create a normal container now
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->get_container();
// Create cache
@ -136,8 +136,8 @@ class install_convert extends module
switch ($sub)
{
case 'intro':
$phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_handler->get_all());
$phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_file->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
@ -227,8 +227,8 @@ class install_convert extends module
// This is for making sure the session get not screwed due to the 3.0.x users table being completely new.
$cache->purge();
$phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_handler->get_all());
$phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_file->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
@ -375,10 +375,10 @@ class install_convert extends module
*/
function get_convert_settings($sub)
{
global $lang, $language, $template, $db, $phpbb_root_path, $phpEx, $config, $cache, $phpbb_config_php_handler;
global $lang, $language, $template, $db, $phpbb_root_path, $phpEx, $config, $cache, $phpbb_config_php_file;
$phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_handler->get_all());
$phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_file->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
@ -621,10 +621,10 @@ class install_convert extends module
{
global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache, $auth;
global $convert, $convert_row, $message_parser, $skip_rows, $language;
global $request, $phpbb_config_php_handler;
global $request, $phpbb_config_php_file;
$phpbb_config_php_handler->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_handler->get_all());
$phpbb_config_php_file->set_config_file($phpbb_root_path . 'config.' . $phpEx);
extract($phpbb_config_php_file->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);

4
phpBB/install/install_install.php
View File

@ -51,7 +51,7 @@ class install_install extends module
function main($mode, $sub)
{
global $lang, $template, $language, $phpbb_root_path, $phpEx;
global $phpbb_container, $cache, $phpbb_log, $request, $phpbb_config_php_handler;
global $phpbb_container, $cache, $phpbb_log, $request, $phpbb_config_php_file;
switch ($sub)
{
@ -104,7 +104,7 @@ class install_install extends module
$request->enable_super_globals();
// Create a normal container now
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->get_container();
// Sets the global variables

6
phpBB/install/install_update.php
View File

@ -66,9 +66,9 @@ class install_update extends module
function main($mode, $sub)
{
global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container, $phpbb_config_php_handler;
global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container, $phpbb_config_php_file;
extract($phpbb_config_php_handler->get_all());
extract($phpbb_config_php_file->get_all());
// We must enable super globals, otherwise creating a new instance of the request class,
// using the new container with a dbal connection will fail with the following PHP Notice:
@ -76,7 +76,7 @@ class install_update extends module
$request->enable_super_globals();
// Create a normal container now
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container_builder->set_dump_container(false);
$phpbb_container_builder->set_use_extensions(false);
if (file_exists($phpbb_root_path . 'install/update/new/config'))

2
phpBB/phpbb/config_php.php → phpBB/phpbb/config_php_file.php
View File

@ -13,7 +13,7 @@
namespace phpbb;
class config_php
class config_php_file
{
/** @var string phpBB Root Path */
protected $phpbb_root_path;

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

@ -108,11 +108,11 @@ class container_factory
/**
* Constructor
*
* @param \phpbb\config_php $config_php_handler
* @param \phpbb\config_php_file $config_php_handler
* @param string $phpbb_root_path Path to the phpbb includes directory.
* @param string $php_ext php file extension
*/
function __construct(\phpbb\config_php $config_php_handler, $phpbb_root_path, $php_ext)
function __construct(\phpbb\config_php_file $config_php_handler, $phpbb_root_path, $php_ext)
{
$this->config_php_handler = $config_php_handler;
$this->phpbb_root_path = $phpbb_root_path;

2
phpBB/phpbb/di/extension/config.php
View File

@ -24,7 +24,7 @@ class config extends Extension
/** @var array */
protected $config_php;
public function __construct(\phpbb\config_php $config_php)
public function __construct(\phpbb\config_php_file $config_php)
{
$this->config_php = $config_php;
}

6
tests/config_php_test.php → tests/config_php_file_test.php
View File

@ -11,18 +11,18 @@
*
*/
class phpbb_config_php_test extends phpbb_test_case
class phpbb_config_php_file_test extends phpbb_test_case
{
public function test_default()
{
$config_php = new \phpbb\config_php(dirname( __FILE__ ) . '/fixtures/', 'php');
$config_php = new \phpbb\config_php_file(dirname( __FILE__ ) . '/fixtures/', 'php');
$this->assertSame('bar', $config_php->get('foo'));
$this->assertSame(array('foo' => 'bar', 'foo_foo' => 'bar bar'), $config_php->get_all());
}
public function test_set_config_file()
{
$config_php = new \phpbb\config_php(dirname( __FILE__ ) . '/fixtures/', 'php');
$config_php = new \phpbb\config_php_file(dirname( __FILE__ ) . '/fixtures/', 'php');
$config_php->set_config_file(dirname( __FILE__ ) . '/fixtures/config_other.php');
$this->assertSame('foo', $config_php->get('bar'));
$this->assertSame(array('bar' => 'foo', 'bar_bar' => 'foo foo'), $config_php->get_all());

2
tests/di/create_container_test.php
View File

@ -29,7 +29,7 @@ namespace
public function setUp()
{
$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_file($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';