1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-14 04:30:29 +01: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

1
.gitignore vendored
View File

@ -8,6 +8,7 @@
/phpBB/images/avatars/gallery/*
/phpBB/images/avatars/upload/*
/phpBB/store/*
/phpBB/vendor
/tests/phpbb_unit_tests.sqlite2
/tests/test_config.php
/tests/tmp/*

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

5
phpBB/composer.json Normal file
View File

@ -0,0 +1,5 @@
{
"require": {
"symfony/event-dispatcher": "2.0.*"
}
}

10
phpBB/composer.lock generated Normal file
View File

@ -0,0 +1,10 @@
{
"hash": "9bada3748ec2933fe0864dcfafbcd671",
"packages": [
{
"package": "symfony/event-dispatcher",
"version": "v2.0.10"
}
],
"aliases": []
}

View File

@ -38,6 +38,8 @@ if (isset($_GET['avatar']))
exit;
}
require($phpbb_root_path . 'vendor/.composer/autoload.php');
require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
require($phpbb_root_path . 'includes/constants.' . $phpEx);

View File

@ -15,7 +15,9 @@ if (!defined('IN_PHPBB'))
exit;
}
class phpbb_event_data extends phpbb_event implements ArrayAccess
use Symfony\Component\EventDispatcher\Event;
class phpbb_event_data extends Event implements ArrayAccess
{
private $data;

View File

@ -15,12 +15,14 @@ if (!defined('IN_PHPBB'))
exit;
}
use Symfony\Component\EventDispatcher\EventDispatcher;
class phpbb_event_extension_subscriber_loader
{
private $dispatcher;
private $extension_manager;
public function __construct(phpbb_event_dispatcher $dispatcher, phpbb_extension_manager $extension_manager)
public function __construct(EventDispatcher $dispatcher, phpbb_extension_manager $extension_manager)
{
$this->dispatcher = $dispatcher;
$this->extension_manager = $extension_manager;
@ -37,7 +39,7 @@ class phpbb_event_extension_subscriber_loader
foreach ($subscriber_classes as $class) {
$subscriber = new $class();
$this->dispatcher->add_subscriber($subscriber);
$this->dispatcher->addSubscriber($subscriber);
}
}
}

View File

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

View File

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

View File

@ -29,6 +29,8 @@ else
define('STRIP', (get_magic_quotes_gpc()) ? true : false);
}
require_once $phpbb_root_path . 'vendor/.composer/autoload.php';
require_once $phpbb_root_path . 'includes/constants.php';
require_once $phpbb_root_path . 'includes/class_loader.' . $phpEx;