aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-06-29 00:33:31 +0200
committerTristan Darricau <github@nicofuma.fr>2014-07-07 01:02:34 +0200
commit2db160ff87fa42ca6c47e580de9bc9d7e5cced49 (patch)
tree14aa95772848e1a813e338a33de8be45df401518
parent40937e21c58399a847d04f23423622b0e1894446 (diff)
downloadforums-2db160ff87fa42ca6c47e580de9bc9d7e5cced49.tar
forums-2db160ff87fa42ca6c47e580de9bc9d7e5cced49.tar.gz
forums-2db160ff87fa42ca6c47e580de9bc9d7e5cced49.tar.bz2
forums-2db160ff87fa42ca6c47e580de9bc9d7e5cced49.tar.xz
forums-2db160ff87fa42ca6c47e580de9bc9d7e5cced49.zip
[ticket/12775] Rename config_php to config_php_file
PHPBB3-12775
Diffstat
-rwxr-xr-xphpBB/bin/phpbbcli.php6
-rw-r--r--phpBB/common.php6
-rw-r--r--phpBB/download/file.php6
-rw-r--r--phpBB/install/database_update.php6
-rw-r--r--phpBB/install/index.php4
-rw-r--r--phpBB/install/install_convert.php24
-rw-r--r--phpBB/install/install_install.php4
-rw-r--r--phpBB/install/install_update.php6
-rw-r--r--phpBB/phpbb/config_php_file.php (renamed from phpBB/phpbb/config_php.php)2
-rw-r--r--phpBB/phpbb/di/container_builder.php4
-rw-r--r--phpBB/phpbb/di/extension/config.php2
-rw-r--r--tests/config_php_file_test.php (renamed from tests/config_php_test.php)6
-rw-r--r--tests/di/create_container_test.php2
13 files changed, 39 insertions, 39 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php
index 9e9f1e27e6..858158ad74 100755
--- a/phpBB/bin/phpbbcli.php
+++ b/phpBB/bin/phpbbcli.php
@@ -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);
diff --git a/phpBB/common.php b/phpBB/common.php
index b5aaedd6e0..a1dfe2a76c 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -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'));
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 5507464209..07cc73e5cc 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -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'));
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 392bb2ad8c..2b12b965be 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -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);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 1c81d552a2..040de1c8f3 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -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);
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 8f77d0be9a..f9985da1ea 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -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);
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 1abe19e5b5..952c647956 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -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
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 5474ae71bc..bffb2f3365 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -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'))
diff --git a/phpBB/phpbb/config_php.php b/phpBB/phpbb/config_php_file.php
index 8191023437..5a2fbca0dd 100644
--- a/phpBB/phpbb/config_php.php
+++ b/phpBB/phpbb/config_php_file.php
@@ -13,7 +13,7 @@
namespace phpbb;
-class config_php
+class config_php_file
{
/** @var string phpBB Root Path */
protected $phpbb_root_path;
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index 426c411e07..355d975a5f 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -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;
diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php
index b25635d7ae..4176df9227 100644
--- a/phpBB/phpbb/di/extension/config.php
+++ b/phpBB/phpbb/di/extension/config.php
@@ -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;
}
diff --git a/tests/config_php_test.php b/tests/config_php_file_test.php
index 6e2b4c2ac1..c2e4eb21c7 100644
--- a/tests/config_php_test.php
+++ b/tests/config_php_file_test.php
@@ -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());
diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php
index 57500c2ad2..221db9e13c 100644
--- a/tests/di/create_container_test.php
+++ b/tests/di/create_container_test.php
@@ -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';
generated by cgit v1.2.1 (git 2.21.0) at 2024-09-21 10:31:24 +0000