aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
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 /phpBB/install
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 (limited to 'phpBB/install')
-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
5 files changed, 22 insertions, 22 deletions
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'))
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-28 02:12:36 +0000