From f48709f5bb8fb1b916d308e3b4bb06bc96d08611 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 19 Oct 2012 19:53:29 -0400 Subject: [feature/compiled-dic] Compile the DI Container into a cached class PHPBB3-11152 --- phpBB/install/index.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'phpBB/install/index.php') diff --git a/phpBB/install/index.php b/phpBB/install/index.php index f71e5ada54..9203a7d3bc 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -75,8 +75,6 @@ else // Include essential scripts require($phpbb_root_path . 'includes/class_loader.' . $phpEx); -require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx); -require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); @@ -86,14 +84,18 @@ include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); require($phpbb_root_path . 'includes/functions_install.' . $phpEx); -$phpbb_container = new ContainerBuilder(); -$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config')); -$loader->load('services.yml'); +// Setup class loader first +$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx"); +$phpbb_class_loader->register(); +$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", ".$phpEx"); +$phpbb_class_loader_ext->register(); -$phpbb_container->setParameter('core.root_path', $phpbb_root_path); -$phpbb_container->setParameter('core.php_ext', $phpEx); +// Set up container +$phpbb_container = phpbb_create_install_container($phpbb_root_path, $phpEx); $phpbb_container->setAlias('cache.driver', 'cache.driver.install'); +$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); +$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader = $phpbb_container->get('class_loader'); $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext'); -- cgit v1.2.1 From 2f692ef3b9bf87375f1e0922f8f42a595bda9d88 Mon Sep 17 00:00:00 2001 From: David King Date: Sat, 20 Oct 2012 10:34:42 -0400 Subject: [feature/compiled-dic] Remove redundant method call PHPBB3-11152 --- phpBB/install/index.php | 1 - 1 file changed, 1 deletion(-) (limited to 'phpBB/install/index.php') diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 9203a7d3bc..9d8e9e87aa 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -93,7 +93,6 @@ $phpbb_class_loader_ext->register(); // Set up container $phpbb_container = phpbb_create_install_container($phpbb_root_path, $phpEx); -$phpbb_container->setAlias('cache.driver', 'cache.driver.install'); $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver')); -- cgit v1.2.1 From 996f63fb34de9f631374fb4b3fb0fb14598affa4 Mon Sep 17 00:00:00 2001 From: David King Date: Sat, 20 Oct 2012 10:36:09 -0400 Subject: [feature/compiled-dic] Remove re-creation of class loader in install PHPBB3-11152 --- phpBB/install/index.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'phpBB/install/index.php') diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 9d8e9e87aa..0afa24066a 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -96,9 +96,6 @@ $phpbb_container = phpbb_create_install_container($phpbb_root_path, $phpEx); $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver')); -$phpbb_class_loader = $phpbb_container->get('class_loader'); -$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext'); - // set up caching $cache = $phpbb_container->get('cache'); -- cgit v1.2.1 From 897e8f2e8361839a92acae7e77225ef212e44647 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Fri, 9 Nov 2012 23:00:44 +0100 Subject: [ticket/11152] Move container functions to a separate function file PHPBB3-11152 --- phpBB/install/index.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/install/index.php') diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 0afa24066a..7975ac2709 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -77,6 +77,7 @@ else require($phpbb_root_path . 'includes/class_loader.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); +require($phpbb_root_path . 'includes/functions_container.' . $phpEx); phpbb_require_updated('includes/functions_content.' . $phpEx, true); -- cgit v1.2.1 From 3ea5b0abbd7f4b0fc95c19a1b76214f044a7d44f Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 10 Nov 2012 12:53:45 +0100 Subject: [ticket/10780] Make L_COLON available in the installer. PHPBB3-10780 --- phpBB/install/index.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/install/index.php') diff --git a/phpBB/install/index.php b/phpBB/install/index.php index c6d0b4cef7..753e5eb226 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -366,6 +366,7 @@ class module $template->assign_vars(array( 'L_CHANGE' => $lang['CHANGE'], + 'L_COLON' => $lang['COLON'], 'L_INSTALL_PANEL' => $lang['INSTALL_PANEL'], 'L_SELECT_LANG' => $lang['SELECT_LANG'], 'L_SKIP' => $lang['SKIP'], -- cgit v1.2.1 From 44d6dc4c4ccf969fd3d84f3b39bfd24ecd3a3f9d Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Thu, 8 Nov 2012 12:21:06 -0500 Subject: [feature/template-events] Convert a single style name to array of them. This allows template code to know the entire style hierarchy for templates being rendered. PHPBB3-9550 --- phpBB/install/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/install/index.php') diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 09560946a6..2be5adaaac 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -215,7 +215,7 @@ $phpbb_style_path_provider = new phpbb_style_path_provider(); $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, new phpbb_template_context()); $phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template); $phpbb_style->set_ext_dir_prefix('adm/'); -$phpbb_style->set_custom_style('admin', '../adm/style', ''); +$phpbb_style->set_custom_style('admin', '../adm/style', array(), ''); $template->assign_var('T_ASSETS_PATH', '../assets'); $template->assign_var('T_TEMPLATE_PATH', '../adm/style'); -- cgit v1.2.1