diff options
author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-11-03 20:35:24 +0100 |
---|---|---|
committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-11-03 20:35:24 +0100 |
commit | c783c37c73beb2756d900f18dd24430c1b9f41ff (patch) | |
tree | 81bfded9172093113bd9d952a26532cfd361d388 /phpBB/install/startup.php | |
parent | 8b7f711a184220928f42d5ec079af18d259981d0 (diff) | |
parent | f991e484da91e24f82fbcb05d0b2ae11ca51852b (diff) | |
download | forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.gz forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.bz2 forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.xz forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.zip |
Merge pull request #3995 from CHItA/ticket/14044
[ticket/14044] Deduplicate the installers
* CHItA/ticket/14044:
[ticket/14044] Add config as global in notify user
[ticket/14044] Fix language selection data loss
[ticket/14044] Patch language::set_fallback_array()
[ticket/14044] Fix tests
[ticket/14044] Fix wrong descriptions in install
[ticket/14044] Solve missing email template error
[ticket/14044] global $table_prefix in constants.php
[ticket/14044] Try to fix missing table prefix
[ticket/14044] Use the correct language file version
[ticket/14044] Automatically trigger rollback on insert in transaction
[ticket/14044] Use empty instead of !count
[ticket/14044] Fix Sqlite error in tests
[ticket/14044] Deduplicate the installers
Diffstat (limited to 'phpBB/install/startup.php')
-rw-r--r-- | phpBB/install/startup.php | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/phpBB/install/startup.php b/phpBB/install/startup.php new file mode 100644 index 0000000000..766f6be38a --- /dev/null +++ b/phpBB/install/startup.php @@ -0,0 +1,84 @@ +<?php +/** + * + * This file is part of the phpBB Forum Software package. + * + * @copyright (c) phpBB Limited <https://www.phpbb.com> + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** @ignore */ +if (!defined('IN_PHPBB') || !defined('IN_INSTALL')) +{ + exit; +} + +function phpbb_require_updated($path, $phpbb_root_path, $optional = false) +{ + $new_path = $phpbb_root_path . 'install/update/new/' . $path; + $old_path = $phpbb_root_path . $path; + + if (file_exists($new_path)) + { + require($new_path); + } + else if (!$optional || file_exists($old_path)) + { + require($old_path); + } +} + +function phpbb_include_updated($path, $phpbb_root_path, $optional = false) +{ + $new_path = $phpbb_root_path . 'install/update/new/' . $path; + $old_path = $phpbb_root_path . $path; + + if (file_exists($new_path)) + { + include($new_path); + } + else if (!$optional || file_exists($old_path)) + { + include($old_path); + } +} + +phpbb_require_updated('includes/startup.' . $phpEx, $phpbb_root_path); +phpbb_require_updated('phpbb/class_loader.' . $phpEx, $phpbb_root_path); + +$phpbb_class_loader_new = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}install/update/new/phpbb/", $phpEx); +$phpbb_class_loader_new->register(); +$phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx); +$phpbb_class_loader->register(); +$phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx); +$phpbb_class_loader_ext->register(); + +// In case $phpbb_adm_relative_path is not set (in case of an update), use the default. +$phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relative_path : 'adm/'; +$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path; + +// Include files +phpbb_require_updated('includes/functions.' . $phpEx, $phpbb_root_path); +phpbb_require_updated('includes/functions_content.' . $phpEx, $phpbb_root_path); +phpbb_include_updated('includes/functions_compatibility.' . $phpEx, $phpbb_root_path); +phpbb_require_updated('includes/functions_user.' . $phpEx, $phpbb_root_path); +phpbb_require_updated('includes/utf/utf_tools.' . $phpEx, $phpbb_root_path); + +// Set PHP error handler to ours +set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); + +$phpbb_installer_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx); +$phpbb_installer_container_builder + ->with_environment('installer') + ->without_extensions(); + +$other_config_path = $phpbb_root_path . 'install/update/new/config'; +$config_path = (file_exists($other_config_path . '/installer/config.yml')) ? $other_config_path : $phpbb_root_path . 'config'; + +$phpbb_installer_container = $phpbb_installer_container_builder + ->with_config_path($config_path) + ->get_container(); |