From dc9ccc432cd0b24cf762f8285d8a90f52b8efe5b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 21:20:58 +0200
Subject: [PATCH] [feature/dic] Make use of calls to cut down on boilerplate

PHPBB3-10739
---
 phpBB/common.php          | 7 +------
 phpBB/config/services.yml | 8 ++++++++
 phpBB/download/file.php   | 7 +------
 phpBB/install/index.php   | 6 +-----
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/phpBB/common.php b/phpBB/common.php
index 117dc2051e..51478662d7 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -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');
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index ef459f4903..6f2ed8c7c3 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -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
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index bc7042fbc8..eabb6edbbb 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -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'));
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 36c10c3ca6..0d7a0a288c 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -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');