From e02d92ac62fbe1dc08994444c18a7447d72c56e6 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sun, 11 Mar 2012 15:14:13 +0100 Subject: [feature/event-dispatcher] Use real EventDispatcher through composer * replace the copy-pasta EventDispatcher with the real one from Symfony2 * use composer for managing this dependency, use composer autoloading PHPBB3-9550 --- phpBB/install/database_update.php | 2 ++ phpBB/install/index.php | 2 ++ 2 files changed, 4 insertions(+) (limited to 'phpBB/install') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 843e8c2f23..a1c8fe1ef9 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -82,6 +82,8 @@ if (!empty($load_extensions) && function_exists('dl')) } } +require($phpbb_root_path . 'vendor/.composer/autoload.php'); + // Include files require($phpbb_root_path . 'includes/class_loader.' . $phpEx); require($phpbb_root_path . 'includes/session.' . $phpEx); diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 9d003ba6ab..7e150c2519 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -69,6 +69,8 @@ else } @ini_set('memory_limit', $mem_limit); +require($phpbb_root_path . 'vendor/.composer/autoload.php'); + // Include essential scripts require($phpbb_root_path . 'includes/class_loader.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); -- cgit v1.2.1 From 0af7d610c08307fbe8df20e0d44e54dcb9429d64 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sat, 17 Mar 2012 22:45:27 -0400 Subject: [feature/event-dispatcher] Delete hard dependency on composer. Applications should not depend on package managers. PHPBB3-9550 --- phpBB/install/database_update.php | 2 -- phpBB/install/index.php | 2 -- 2 files changed, 4 deletions(-) (limited to 'phpBB/install') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index a1c8fe1ef9..843e8c2f23 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -82,8 +82,6 @@ if (!empty($load_extensions) && function_exists('dl')) } } -require($phpbb_root_path . 'vendor/.composer/autoload.php'); - // Include files require($phpbb_root_path . 'includes/class_loader.' . $phpEx); require($phpbb_root_path . 'includes/session.' . $phpEx); diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 7e150c2519..9d003ba6ab 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -69,8 +69,6 @@ else } @ini_set('memory_limit', $mem_limit); -require($phpbb_root_path . 'vendor/.composer/autoload.php'); - // Include essential scripts require($phpbb_root_path . 'includes/class_loader.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); -- cgit v1.2.1 From 7f1abaa318cb7008c9eab259003d67790e346094 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Wed, 28 Mar 2012 21:45:56 +0200 Subject: [feature/event-dispatcher] Add empty dispatcher to installer and db updater PHPBB3-9550 --- phpBB/install/database_update.php | 1 + phpBB/install/index.php | 1 + 2 files changed, 2 insertions(+) (limited to 'phpBB/install') diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 843e8c2f23..c2b36f5992 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -120,6 +120,7 @@ $cache = $cache_factory->get_service(); $phpbb_class_loader_ext->set_cache($cache->get_driver()); $phpbb_class_loader->set_cache($cache->get_driver()); +$phpbb_dispatcher = new phpbb_event_dispatcher(); $request = new phpbb_request(); $user = new user(); $db = new $sql_db(); diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 9d003ba6ab..8191288f9d 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -92,6 +92,7 @@ $cache = $cache_factory->get_service(); $phpbb_class_loader_ext->set_cache($cache->get_driver()); $phpbb_class_loader->set_cache($cache->get_driver()); +$phpbb_dispatcher = new phpbb_event_dispatcher(); $request = new phpbb_request(); // make sure request_var uses this request instance -- cgit v1.2.1