1 files changed, 22 insertions, 16 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index b581af7ce3..1168a943af 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -45,18 +45,31 @@ if (isset($_GET['avatar']))
 
 	require($phpbb_root_path . 'includes/constants.' . $phpEx);
 	require($phpbb_root_path . 'includes/functions.' . $phpEx);
+	require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
 	require($phpbb_root_path . 'includes/functions_download' . '.' . $phpEx);
 	require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
-	$phpbb_container = new ContainerBuilder();
-	$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config'));
-	$loader->load('services.yml');
-
-	$processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx);
-	$processor->process($phpbb_container);
-
-	$phpbb_class_loader = $phpbb_container->get('class_loader');
-	$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
+	// Setup class loader first
+	$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", ".$phpEx");
+	$phpbb_class_loader->register();
+	$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", ".$phpEx");
+	$phpbb_class_loader_ext->register();
+
+	// Set up container
+	$phpbb_container = phpbb_create_dumped_container_unless_debug(
+		array(
+			new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
+			new phpbb_di_extension_core($phpbb_root_path),
+		),
+		array(
+			new phpbb_di_pass_collection_pass(),
+		),
+		$phpbb_root_path,
+		$phpEx
+	);
+
+	$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
+	$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
 
 	// set up caching
 	$cache = $phpbb_container->get('cache');
@@ -82,13 +95,6 @@ if (isset($_GET['avatar']))
 	$phpbb_extension_manager = $phpbb_container->get('ext.manager');
 	$phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
 
-	$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
-	foreach ($ids as $id)
-	{
-		$processor = $phpbb_container->get($id);
-		$processor->process($phpbb_container);
-	}
-
 	// worst-case default
 	$browser = strtolower($request->header('User-Agent', 'msie 6.0'));