1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00

[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
This commit is contained in:
Igor Wiedler
2012-03-11 15:14:13 +01:00
parent 5dd5df46a4
commit e02d92ac62
10 changed files with 36 additions and 4 deletions

View File

@@ -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();