diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-19 14:43:48 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-19 14:43:48 +0200 |
| commit | 5b3829aab45d4eb53207c1153fc7c71c72f0f83c (patch) | |
| tree | ceb2251546de94d432fa6160e2e6c80a8a2b50fb /phpBB/install_new/startup.php | |
| parent | 9ea44abf38f81c696163f45b074c87175c240b69 (diff) | |
| parent | d45f146814a1709a16fb8e4951374242d50b6aed (diff) | |
| download | forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar.gz forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar.bz2 forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar.xz forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.zip | |
Merge pull request #3794 from CHItA/ticket/14039
[ticket/14039] Refactoring the updater
* CHItA/ticket/14039:
[ticket/14039] Use update helper to include files in container factory
[ticket/14039] Fix inclusion logic in update helper
[ticket/14039] Fix folder creation and deleted binary file issue
[ticket/14039] Fix file check for deleted files
[ticket/14039] Fix acp link
[ticket/14039] Fix ACP link generation
[ticket/14039] Fix constants for the updater
[ticket/14039] Include phpBB constants on startup
[ticket/14039] Fix migrator's language calls
[ticket/14039] Fix misunderstandable comment in the archive file updater
[ticket/14039] Use shared language service in the container factory
[ticket/14039] Fix filesystem file updater's mkdir usage
[ticket/14039] Only show log container when it has content
[ticket/14039] Use compatibility globals from the update package
[ticket/14039] Use http_exception instead of die()
[ticket/14039] Fix T_TEMPLATE_PATH constant
[ticket/14039] Fix language constants and comments
[ticket/14039] Revamp updater
Diffstat (limited to 'phpBB/install_new/startup.php')
| -rw-r--r-- | phpBB/install_new/startup.php | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/phpBB/install_new/startup.php b/phpBB/install_new/startup.php new file mode 100644 index 0000000000..766f6be38a --- /dev/null +++ b/phpBB/install_new/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(); |