makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/dic] Make use of calls to cut down on boilerplate

Browse source 
PHPBB3-10739
This commit is contained in:
Igor Wiedler 2012-03-31 21:20:58 +02:00
parent a7f61b91b7
commit dc9ccc432c
4 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/common.php
View file

@ -97,15 +97,11 @@ $container->setParameter('core.root_path', $phpbb_root_path);
$container->setParameter('core.php_ext', $phpEx);
// Setup class loader first
$phpbb_class_loader_ext = $container->get('class_loader.ext');
$phpbb_class_loader_ext->register();
$phpbb_class_loader = $container->get('class_loader');
$phpbb_class_loader->register();
$phpbb_class_loader_ext = $container->get('class_loader.ext');
// set up caching
$cache = $container->get('cache');
$phpbb_class_loader_ext->set_cache($container->get('cache.driver'));
$phpbb_class_loader->set_cache($container->get('cache.driver'));
// Instantiate some basic classes
$phpbb_dispatcher = $container->get('dispatcher');
@ -125,7 +121,6 @@ set_config_count(null, null, null, $config);
// load extensions
$phpbb_extension_manager = $container->get('ext.manager');
$phpbb_subscriber_loader = $container->get('event.subscriber_loader');
$phpbb_subscriber_loader->load();
$template = $container->get('template');
$style = $container->get('style');

8
phpBB/config/services.yml
View file

@ -5,6 +5,9 @@ services:
- phpbb_
- %core.root_path%includes/
- .%core.php_ext%
calls:
- [register, []]
- [set_cache, [@cache.driver]]
class_loader.ext:
class: phpbb_class_loader
@ -12,6 +15,9 @@ services:
- phpbb_ext_
- %core.root_path%ext/
- .%core.php_ext%
calls:
- [register, []]
- [set_cache, [@cache.driver]]
cache:
class: phpbb_cache_service
@ -95,6 +101,8 @@ services:
arguments:
- @dispatcher
- @ext.manager
calls:
- [load, []]
cron.task_provider:
class: phpbb_cron_task_provider

7
phpBB/download/file.php
View file

@ -52,15 +52,11 @@ if (isset($_GET['avatar']))
$container->setParameter('core.root_path', $phpbb_root_path);
$container->setParameter('core.php_ext', $phpEx);
$phpbb_class_loader_ext = $container->get('class_loader.ext');
$phpbb_class_loader_ext->register();
$phpbb_class_loader = $container->get('class_loader');
$phpbb_class_loader->register();
$phpbb_class_loader_ext = $container->get('class_loader.ext');
// set up caching
$cache = $container->get('cache');
$phpbb_class_loader_ext->set_cache($container->get('cache.driver'));
$phpbb_class_loader->set_cache($container->get('cache.driver'));
$phpbb_dispatcher = $container->get('dispatcher');
$request = $container->get('request');
@ -82,7 +78,6 @@ if (isset($_GET['avatar']))
// load extensions
$phpbb_extension_manager = $container->get('ext.manager');
$phpbb_subscriber_loader = $container->get('event.subscriber_loader');
$phpbb_subscriber_loader->load();
// worst-case default
$browser = strtolower($request->header('User-Agent', 'msie 6.0'));

6
phpBB/install/index.php
View file

@ -88,15 +88,11 @@ $container->setParameter('core.root_path', $phpbb_root_path);
$container->setParameter('core.php_ext', $phpEx);
$container->setAlias('cache.driver.install', 'cache.driver');
$phpbb_class_loader_ext = $container->get('class_loader.ext');
$phpbb_class_loader_ext->register();
$phpbb_class_loader = $container->get('class_loader');
$phpbb_class_loader->register();
$phpbb_class_loader_ext = $container->get('class_loader.ext');
// set up caching
$cache = $container->get('cache');
$phpbb_class_loader_ext->set_cache($container->get('cache.driver'));
$phpbb_class_loader->set_cache($container->get('cache.driver'));
$phpbb_dispatcher = $container->get('dispatcher');
$request = $container->get('request');