diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-11 15:14:13 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-11 15:15:33 +0100 |
| commit | e02d92ac62fbe1dc08994444c18a7447d72c56e6 (patch) | |
| tree | ee96cc57586f4b3c4e2998d6ad0d747c5db189a7 /phpBB/common.php | |
| parent | 5dd5df46a497631b905f6595707b0d1b0c302749 (diff) | |
| download | forums-e02d92ac62fbe1dc08994444c18a7447d72c56e6.tar forums-e02d92ac62fbe1dc08994444c18a7447d72c56e6.tar.gz forums-e02d92ac62fbe1dc08994444c18a7447d72c56e6.tar.bz2 forums-e02d92ac62fbe1dc08994444c18a7447d72c56e6.tar.xz forums-e02d92ac62fbe1dc08994444c18a7447d72c56e6.zip | |
[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
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 44a0e7cec3..c48418276a 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -15,6 +15,8 @@ if (!defined('IN_PHPBB')) exit; } +use Symfony\Component\EventDispatcher\EventDispatcher; + require($phpbb_root_path . 'includes/startup.' . $phpEx); if (file_exists($phpbb_root_path . 'config.' . $phpEx)) @@ -70,6 +72,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); @@ -98,7 +102,7 @@ $phpbb_class_loader_ext->set_cache($cache->get_driver()); $phpbb_class_loader->set_cache($cache->get_driver()); // Instantiate some basic classes -$phpbb_dispatcher = new phpbb_event_dispatcher(); +$phpbb_dispatcher = new EventDispatcher(); $request = new phpbb_request(); $user = new user(); $auth = new auth(); |