From 012c2817434e6b03b29076c644fb7b0f5fc83ff2 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Mon, 6 Aug 2012 20:43:54 +0100
Subject: [PATCH 01/10] [ticket/11045] Added unit tests for the compress class

PHPBB3-11045
---
 tests/compress/archive/.gitkeep          |   0
 tests/compress/compress_test.php         | 157 +++++++++++++++++++++++
 tests/compress/extract/.gitkeep          |   0
 tests/compress/fixtures/1.txt            |   1 +
 tests/compress/fixtures/archive.tar      | Bin 0 -> 10240 bytes
 tests/compress/fixtures/archive.tar.bz2  | Bin 0 -> 224 bytes
 tests/compress/fixtures/archive.tar.gz   | Bin 0 -> 239 bytes
 tests/compress/fixtures/archive.zip      | Bin 0 -> 412 bytes
 tests/compress/fixtures/dir/2.txt        |   1 +
 tests/compress/fixtures/dir/3.txt        |   1 +
 tests/compress/fixtures/dir/subdir/4.txt |   1 +
 11 files changed, 161 insertions(+)
 create mode 100644 tests/compress/archive/.gitkeep
 create mode 100644 tests/compress/compress_test.php
 create mode 100644 tests/compress/extract/.gitkeep
 create mode 100644 tests/compress/fixtures/1.txt
 create mode 100644 tests/compress/fixtures/archive.tar
 create mode 100644 tests/compress/fixtures/archive.tar.bz2
 create mode 100644 tests/compress/fixtures/archive.tar.gz
 create mode 100644 tests/compress/fixtures/archive.zip
 create mode 100644 tests/compress/fixtures/dir/2.txt
 create mode 100644 tests/compress/fixtures/dir/3.txt
 create mode 100644 tests/compress/fixtures/dir/subdir/4.txt

diff --git a/tests/compress/archive/.gitkeep b/tests/compress/archive/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
new file mode 100644
index 0000000000..a88e5e5b32
--- /dev/null
+++ b/tests/compress/compress_test.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2012 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/functions_admin.php';
+require_once __DIR__ . '/../../phpBB/includes/functions_compress.php';
+
+class phpbb_compress_test extends phpbb_test_case
+{
+	const EXTRACT_DIR = '/extract/';
+	const ARCHIVE_DIR = '/archive/';
+
+	private $path;
+	protected $filelist = array(
+		'1.txt',
+		'dir/2.txt',
+		'dir/3.txt',
+		'dir/subdir/4.txt',
+	);
+
+	protected function setUp()
+	{
+		// Required for compress::add_file
+		global $phpbb_root_path;
+		$phpbb_root_path = '';
+
+		$this->path = __DIR__ . '/fixtures/';
+		$compress = new compress();
+
+		if (sizeof($compress->methods()) < 4)
+		{
+			$this->markTestSkipped('PHP needs to be compiled with --with-zlib and --with-bz2 in order to run these tests');
+		}
+	}
+
+	protected function tearDown()
+	{
+		foreach (array(__DIR__ . self::EXTRACT_DIR, __DIR__ . self::ARCHIVE_DIR) as $dir) {
+			$this->clear_dir($dir);
+		}
+	}
+
+	protected function clear_dir($dir)
+	{
+		$iterator = new DirectoryIterator($dir);
+		foreach ($iterator as $fileinfo)
+		{
+			$name = $fileinfo->getFilename();
+			$path = $fileinfo->getPathname();
+
+			if ($name[0] !== '.')
+			{
+				if ($fileinfo->isDir())
+				{
+					$this->clear_dir($path);
+					rmdir($path);
+				}
+				else
+				{
+					unlink($path);
+				}
+			}
+		}
+	}
+
+	protected function archive_files($compress)
+	{
+		$compress->add_file($this->path . '1.txt', $this->path);
+		$compress->add_file(
+			'tests/compress/fixtures/dir/',
+			'tests/compress/fixtures/',
+			'',
+			// The comma here is not an error, this is a comma-separated list
+			'subdir/4.txt,3.txt'
+		);
+		$compress->add_custom_file($this->path . 'dir/3.txt', 'dir/3.txt');
+		$compress->add_data(file_get_contents($this->path . 'dir/subdir/4.txt'), 'dir/subdir/4.txt');
+	}
+
+	protected function valid_extraction()
+	{
+		foreach ($this->filelist as $filename)
+		{
+			$path = __DIR__ . self::EXTRACT_DIR . $filename;
+			$this->assertTrue(file_exists($path));
+
+			// Check the file's contents is correct
+			$this->assertEquals(basename($filename, '.txt') . "\n", file_get_contents($path));
+		}
+	}
+
+	public function tar_archive_list()
+	{
+		return array(
+			array('archive.tar', '.tar'),
+			array('archive.tar.gz', '.tar.gz'),
+			array('archive.tar.bz2', '.tar.bz2'),
+		);
+	}
+
+	/**
+	 * @dataProvider tar_archive_list
+	 */
+	public function test_extract_tar($filename, $type)
+	{
+		$compress = new compress_tar('r', $this->path . $filename);
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction();
+	}
+
+	public function test_extract_zip()
+	{
+		$compress = new compress_zip('r', $this->path . 'archive.zip');
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction();
+	}
+
+	/**
+	 * @depends test_extract_tar
+	 * @dataProvider tar_archive_list
+	 */
+	public function test_compress_tar($filename, $type)
+	{
+		$tar = __DIR__ . self::ARCHIVE_DIR . $filename;
+		$compress = new compress_tar('w', $tar);
+		$this->archive_files($compress);
+		$compress->close();
+		$this->assertTrue(file_exists($tar));
+
+		$compress->mode = 'r';
+		$compress->open();
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction();
+	}
+
+	/**
+	 * @depends test_extract_zip
+	 */
+	public function test_compress_zip()
+	{
+		$zip =  __DIR__ . self::ARCHIVE_DIR . 'archive.zip';
+		$compress = new compress_zip('w', $zip);
+		$this->archive_files($compress);
+		$compress->close();
+		$this->assertTrue(file_exists($zip));
+
+		$compress = new compress_zip('r', $zip);
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction();
+	}
+}
diff --git a/tests/compress/extract/.gitkeep b/tests/compress/extract/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/compress/fixtures/1.txt b/tests/compress/fixtures/1.txt
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/compress/fixtures/1.txt
@@ -0,0 +1 @@
+1
diff --git a/tests/compress/fixtures/archive.tar b/tests/compress/fixtures/archive.tar
new file mode 100644
index 0000000000000000000000000000000000000000..54ed56084ed5035d52a6758895e953771a6f0ac5
GIT binary patch
literal 10240
zcmeI0&kDmJ48}e0Df$GPQKQeZ(MuV-^bhRumlO)JL)RS?p<jBilGeyCeyO$}#+xZ@
zRxBkp(okZXx9U<e<n)=q*6VXAMQ=JTJg;^5Wt#6}*O}+=+70*1zx#5#&R+6AEe~yq
zO;QtlIR8QNPvkft|HTrL4NTYhJ!kzAx0?SLL$3R+4ya4aZTb&V10?@)CDYjwlldO=
z<oc(}HxTsCL_iC_D_jFq;Rp54)~@=GOwfOgb?Bh~8kn1nq5AhN>0kH%WFtrDzs92R
z(0>ig&Bn;if1y+v`0M+>p8p)lZvyQ9E3BFT{a2uj5Fh{oAOHd&00JNY0w4eaAOHd&
Q00JNY0w4eaAW)yc2QS-gZ2$lO

literal 0
HcmV?d00001

diff --git a/tests/compress/fixtures/archive.tar.bz2 b/tests/compress/fixtures/archive.tar.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..04c0eccd743c82a71968aba3d44d4300f317ced8
GIT binary patch
literal 224
zcmV<603ZKCT4**gL0KkKS-?;N8UO(*`+~ucKp;Q?|A0b_bSfS|KmY&;FaYyv!b)V-
z8VwjDK+&|+5lKzyOhKXQ000Rj(lSgYfrMzp&)x^#h+|IJV&Rlb0vzZIY^{B*Kxi1S
zLt`k2xNrw>z=1)o6MU^l(9ml$SydrY6u|~r80Vd$3PDQ2I99|#L}nc_O;M3CN^rol
z2=4%3?*)?#ULo9)Ft~x-a;F6ZPPXY71j_-P1c5Z1Q5k_^Eswsu4RcTysaP!qKvWcx
a;x5HPqSz!<b_OB`@pmLsg$WD=03o1<*;TRt

literal 0
HcmV?d00001

diff --git a/tests/compress/fixtures/archive.tar.gz b/tests/compress/fixtures/archive.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..195e7a060ab3a53535d5febd3a0b06b69763542a
GIT binary patch
literal 239
zcmV<L01*EliwFq#&mT|#17UJwXlZt3E_7jX0PWXJ3WG2Z1>mfEikzU$-z4X0aU-Q0
zf1t<jj3BsDTuf~1`$V!xz`*kbZQAZ;lsQ%k$><BY<v24w$eKhh%DPf=G?uhCCdPia
zch;I``&wPMHUFa;&c7cYjpl2xEC0mnybqL+e+~XRya(lHNWeL#mHfk;f8v|-=c^d&
zl=n3`d;XWBcK}C{gFh&r0XzCn&Q1N#<k9~c0{VYy(*O8P{g>~5>3>H5Yl!IosV)Bh
plGZV>tN+vgU+_GQ{#TIDe*gdg00000004l$^Z|MER<i&o008L5dRPDe

literal 0
HcmV?d00001

diff --git a/tests/compress/fixtures/archive.zip b/tests/compress/fixtures/archive.zip
new file mode 100644
index 0000000000000000000000000000000000000000..bdb618fc262aa8e41f2055a874c8e594484dd5fd
GIT binary patch
literal 412
zcmWIWW@h1HW&nbmQZ~onKY{5?KsE@o0<oc9NkxevR{&g50Z`F|^))^)MVvrIDVat3
zMj(YoND6C!3NOw}4@FmK3{q%}q_7F7P>e%O3Z_s1YGQF|63Ac^ka`oKdPXLDX50=1
zY61d<hAoXC8tiOjE!dn5QV7wa3Z&tlK-PxM6JT9noBW{Kz+OVuhRsU|ZRJpH$Q}&v
SW@Q7ZU;)DWKzccd!vFxOutg03

literal 0
HcmV?d00001

diff --git a/tests/compress/fixtures/dir/2.txt b/tests/compress/fixtures/dir/2.txt
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/compress/fixtures/dir/2.txt
@@ -0,0 +1 @@
+2
diff --git a/tests/compress/fixtures/dir/3.txt b/tests/compress/fixtures/dir/3.txt
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/compress/fixtures/dir/3.txt
@@ -0,0 +1 @@
+3
diff --git a/tests/compress/fixtures/dir/subdir/4.txt b/tests/compress/fixtures/dir/subdir/4.txt
new file mode 100644
index 0000000000..b8626c4cff
--- /dev/null
+++ b/tests/compress/fixtures/dir/subdir/4.txt
@@ -0,0 +1 @@
+4

From 570502e4a3a70d63a235ef634560477da8782865 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Tue, 7 Aug 2012 12:25:21 +0100
Subject: [PATCH 02/10] [ticket/11045] Added tests for file conflicts

PHPBB3-11045
---
 tests/compress/compress_test.php | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
index a88e5e5b32..826abbc0c8 100644
--- a/tests/compress/compress_test.php
+++ b/tests/compress/compress_test.php
@@ -17,6 +17,7 @@ class phpbb_compress_test extends phpbb_test_case
 	const ARCHIVE_DIR = '/archive/';
 
 	private $path;
+
 	protected $filelist = array(
 		'1.txt',
 		'dir/2.txt',
@@ -24,6 +25,12 @@ class phpbb_compress_test extends phpbb_test_case
 		'dir/subdir/4.txt',
 	);
 
+	protected $conflicts = array(
+		'1_1.txt',
+		'1_2.txt',
+		'dir/2_1.txt',
+	);
+
 	protected function setUp()
 	{
 		// Required for compress::add_file
@@ -81,17 +88,26 @@ class phpbb_compress_test extends phpbb_test_case
 		);
 		$compress->add_custom_file($this->path . 'dir/3.txt', 'dir/3.txt');
 		$compress->add_data(file_get_contents($this->path . 'dir/subdir/4.txt'), 'dir/subdir/4.txt');
+
+		// Add multiples of the same file to check conflicts are handled
+		$compress->add_file($this->path . '1.txt', $this->path);
+		$compress->add_file($this->path . '1.txt', $this->path);
+		$compress->add_file($this->path . 'dir/2.txt', $this->path);
 	}
 
-	protected function valid_extraction()
+	protected function valid_extraction($extra = array())
 	{
-		foreach ($this->filelist as $filename)
+		$filelist = array_merge($this->filelist, $extra);
+
+		foreach ($filelist as $filename)
 		{
 			$path = __DIR__ . self::EXTRACT_DIR . $filename;
 			$this->assertTrue(file_exists($path));
 
 			// Check the file's contents is correct
-			$this->assertEquals(basename($filename, '.txt') . "\n", file_get_contents($path));
+			$contents = explode('_', basename($filename, '.txt'));
+			$contents = $contents[0];
+			$this->assertEquals($contents . "\n", file_get_contents($path));
 		}
 	}
 
@@ -136,7 +152,7 @@ class phpbb_compress_test extends phpbb_test_case
 		$compress->mode = 'r';
 		$compress->open();
 		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
-		$this->valid_extraction();
+		$this->valid_extraction($this->conflicts);
 	}
 
 	/**
@@ -152,6 +168,6 @@ class phpbb_compress_test extends phpbb_test_case
 
 		$compress = new compress_zip('r', $zip);
 		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
-		$this->valid_extraction();
+		$this->valid_extraction($this->conflicts);
 	}
 }

From 83a532607761fa7c6de70bd114fe8d6bf5ba2983 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Fri, 10 Aug 2012 12:10:37 +0100
Subject: [PATCH 03/10] [ticket/11045] Explicitely check for zlib and bz2

PHPBB3-11045
---
 tests/compress/compress_test.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
index 826abbc0c8..c0e4e914e1 100644
--- a/tests/compress/compress_test.php
+++ b/tests/compress/compress_test.php
@@ -38,9 +38,8 @@ class phpbb_compress_test extends phpbb_test_case
 		$phpbb_root_path = '';
 
 		$this->path = __DIR__ . '/fixtures/';
-		$compress = new compress();
 
-		if (sizeof($compress->methods()) < 4)
+		if (!@extension_loaded('zlib') || !@extension_loaded('bz2'))
 		{
 			$this->markTestSkipped('PHP needs to be compiled with --with-zlib and --with-bz2 in order to run these tests');
 		}

From 94c9d7029809bce1ab8a70981f81dfb02a5b2a38 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Tue, 14 Aug 2012 11:14:38 +0100
Subject: [PATCH 04/10] [ticket/11045] Opening brace on its own line

PHPBB3-11045
---
 tests/compress/compress_test.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
index c0e4e914e1..c9450f2e29 100644
--- a/tests/compress/compress_test.php
+++ b/tests/compress/compress_test.php
@@ -47,7 +47,8 @@ class phpbb_compress_test extends phpbb_test_case
 
 	protected function tearDown()
 	{
-		foreach (array(__DIR__ . self::EXTRACT_DIR, __DIR__ . self::ARCHIVE_DIR) as $dir) {
+		foreach (array(__DIR__ . self::EXTRACT_DIR, __DIR__ . self::ARCHIVE_DIR) as $dir)
+		{
 			$this->clear_dir($dir);
 		}
 	}

From 1520130b2707039630fb3a83e4ab7654db3ad537 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Sat, 1 Sep 2012 09:45:11 +0800
Subject: [PATCH 05/10] [ticket/11045] Replaced __DIR__ with dirname(__FILE__)

PHPBB3-11045
---
 tests/compress/compress_test.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
index c9450f2e29..ac8dd358d3 100644
--- a/tests/compress/compress_test.php
+++ b/tests/compress/compress_test.php
@@ -7,9 +7,9 @@
  *
  */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_admin.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_compress.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compress.php';
 
 class phpbb_compress_test extends phpbb_test_case
 {
@@ -37,7 +37,7 @@ class phpbb_compress_test extends phpbb_test_case
 		global $phpbb_root_path;
 		$phpbb_root_path = '';
 
-		$this->path = __DIR__ . '/fixtures/';
+		$this->path = dirname(__FILE__) . '/fixtures/';
 
 		if (!@extension_loaded('zlib') || !@extension_loaded('bz2'))
 		{
@@ -47,7 +47,7 @@ class phpbb_compress_test extends phpbb_test_case
 
 	protected function tearDown()
 	{
-		foreach (array(__DIR__ . self::EXTRACT_DIR, __DIR__ . self::ARCHIVE_DIR) as $dir)
+		foreach (array(dirname(__FILE__) . self::EXTRACT_DIR, dirname(__FILE__) . self::ARCHIVE_DIR) as $dir)
 		{
 			$this->clear_dir($dir);
 		}
@@ -101,7 +101,7 @@ class phpbb_compress_test extends phpbb_test_case
 
 		foreach ($filelist as $filename)
 		{
-			$path = __DIR__ . self::EXTRACT_DIR . $filename;
+			$path = dirname(__FILE__) . self::EXTRACT_DIR . $filename;
 			$this->assertTrue(file_exists($path));
 
 			// Check the file's contents is correct
@@ -143,7 +143,7 @@ class phpbb_compress_test extends phpbb_test_case
 	 */
 	public function test_compress_tar($filename, $type)
 	{
-		$tar = __DIR__ . self::ARCHIVE_DIR . $filename;
+		$tar = dirname(__FILE__) . self::ARCHIVE_DIR . $filename;
 		$compress = new compress_tar('w', $tar);
 		$this->archive_files($compress);
 		$compress->close();
@@ -160,7 +160,7 @@ class phpbb_compress_test extends phpbb_test_case
 	 */
 	public function test_compress_zip()
 	{
-		$zip =  __DIR__ . self::ARCHIVE_DIR . 'archive.zip';
+		$zip =  dirname(__FILE__) . self::ARCHIVE_DIR . 'archive.zip';
 		$compress = new compress_zip('w', $zip);
 		$this->archive_files($compress);
 		$compress->close();

From d543f0ffb1334d0a22c30077a9ed27c098dc4af5 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 8 Sep 2012 14:41:41 +0200
Subject: [PATCH 06/10] [ticket/11101] Delay execution of container processors

Also fix the name of the ext processor service.

PHPBB3-11101
---
 phpBB/common.php          | 14 +++++++-------
 phpBB/config/services.yml |  2 +-
 phpBB/download/file.php   | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/phpBB/common.php b/phpBB/common.php
index 281eb88c4d..c6bb5c6cfe 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -100,13 +100,6 @@ $processor->process($phpbb_container);
 $phpbb_class_loader = $phpbb_container->get('class_loader');
 $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
-$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
-foreach ($ids as $id)
-{
-	$processor = $phpbb_container->get($id);
-	$processor->process($phpbb_container);
-}
-
 // set up caching
 $cache = $phpbb_container->get('cache');
 
@@ -132,6 +125,13 @@ $phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
 $template = $phpbb_container->get('template');
 $phpbb_style = $phpbb_container->get('style');
 
+$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
+foreach ($ids as $id)
+{
+	$processor = $phpbb_container->get($id);
+	$processor->process($phpbb_container);
+}
+
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display')));
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 133a43b77e..c3d2494952 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -89,7 +89,7 @@ services:
             - .%core.php_ext%
             - @cache.driver
 
-    processor.config:
+    processor.ext:
         class: phpbb_di_processor_ext
         arguments:
             - @ext.manager
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 8766c6d030..7ed53d54b6 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -61,13 +61,6 @@ if (isset($_GET['avatar']))
 	$phpbb_class_loader = $phpbb_container->get('class_loader');
 	$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
-	$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
-	foreach ($ids as $id)
-	{
-		$processor = $phpbb_container->get($id);
-		$processor->process($phpbb_container);
-	}
-
 	// set up caching
 	$cache = $phpbb_container->get('cache');
 
@@ -92,6 +85,13 @@ 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'));
 

From ce7cffcf9ebb21bccf1fae4da41a924708429e94 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Tue, 11 Sep 2012 09:42:29 +0100
Subject: [PATCH 07/10] [ticket/11045] Removed file conflict tests for compress
 class

PHPBB3-11045
---
 tests/compress/compress_test.php | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
index ac8dd358d3..65094671e3 100644
--- a/tests/compress/compress_test.php
+++ b/tests/compress/compress_test.php
@@ -25,12 +25,6 @@ class phpbb_compress_test extends phpbb_test_case
 		'dir/subdir/4.txt',
 	);
 
-	protected $conflicts = array(
-		'1_1.txt',
-		'1_2.txt',
-		'dir/2_1.txt',
-	);
-
 	protected function setUp()
 	{
 		// Required for compress::add_file
@@ -88,11 +82,6 @@ class phpbb_compress_test extends phpbb_test_case
 		);
 		$compress->add_custom_file($this->path . 'dir/3.txt', 'dir/3.txt');
 		$compress->add_data(file_get_contents($this->path . 'dir/subdir/4.txt'), 'dir/subdir/4.txt');
-
-		// Add multiples of the same file to check conflicts are handled
-		$compress->add_file($this->path . '1.txt', $this->path);
-		$compress->add_file($this->path . '1.txt', $this->path);
-		$compress->add_file($this->path . 'dir/2.txt', $this->path);
 	}
 
 	protected function valid_extraction($extra = array())
@@ -152,7 +141,7 @@ class phpbb_compress_test extends phpbb_test_case
 		$compress->mode = 'r';
 		$compress->open();
 		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
-		$this->valid_extraction($this->conflicts);
+		$this->valid_extraction();
 	}
 
 	/**
@@ -168,6 +157,6 @@ class phpbb_compress_test extends phpbb_test_case
 
 		$compress = new compress_zip('r', $zip);
 		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
-		$this->valid_extraction($this->conflicts);
+		$this->valid_extraction();
 	}
 }

From 503989979a2e6a7fb9d64ed249b09a0bef2b2f95 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 13 Sep 2012 16:44:26 -0400
Subject: [PATCH 08/10] [ticket/11086] Fix database_update.php to use
 Dependency Injection Container

PHPBB3-11086
---
 phpBB/install/database_update.php | 45 ++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 0b470ced26..323ba0c876 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -7,6 +7,10 @@
 *
 */
 
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
 define('UPDATES_TO_VERSION', '3.1.0-dev');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
@@ -107,21 +111,38 @@ if (!defined('EXT_TABLE'))
 	define('EXT_TABLE', $table_prefix . 'ext');
 }
 
-$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
-$phpbb_class_loader_ext->register();
-$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
-$phpbb_class_loader->register();
+$phpbb_container = new ContainerBuilder();
+$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/../config'));
+$loader->load('services.yml');
+
+// We must include the DI processor class files because the class loader
+// is not yet set up
+require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx);
+require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx);
+
+$processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx);
+$processor->process($phpbb_container);
+
+// Setup class loader first
+$phpbb_class_loader = $phpbb_container->get('class_loader');
+$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
+
+$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
+foreach ($ids as $id)
+{
+	$processor = $phpbb_container->get($id);
+	$processor->process($phpbb_container);
+}
 
 // set up caching
-$cache_factory = new phpbb_cache_factory($acm_type);
-$cache = $cache_factory->get_service();
-$phpbb_class_loader_ext->set_cache($cache->get_driver());
-$phpbb_class_loader->set_cache($cache->get_driver());
+$cache = $phpbb_container->get('cache');
 
-$phpbb_dispatcher = new phpbb_event_dispatcher();
-$request = new phpbb_request();
-$user = new phpbb_user();
-$db = new $sql_db();
+// Instantiate some basic classes
+$phpbb_dispatcher = $phpbb_container->get('dispatcher');
+$request	= $phpbb_container->get('request');
+$user		= $phpbb_container->get('user');
+$auth		= $phpbb_container->get('auth');
+$db			= $phpbb_container->get('dbal.conn');
 
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function

From 298fa894e7ea0807a295cd0ed55cabef8a27a3f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 13 Sep 2012 16:56:09 -0400
Subject: [PATCH 09/10] [ticket/11086] Move DI processing below $request
 definition

As per PR #991 (ticket/11101).

PHPBB3-11086
---
 phpBB/install/database_update.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 323ba0c876..5fa6166913 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -119,7 +119,6 @@ $loader->load('services.yml');
 // is not yet set up
 require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx);
 require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx);
-
 $processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx);
 $processor->process($phpbb_container);
 
@@ -127,13 +126,6 @@ $processor->process($phpbb_container);
 $phpbb_class_loader = $phpbb_container->get('class_loader');
 $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
-$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
-foreach ($ids as $id)
-{
-	$processor = $phpbb_container->get($id);
-	$processor->process($phpbb_container);
-}
-
 // set up caching
 $cache = $phpbb_container->get('cache');
 
@@ -144,6 +136,13 @@ $user		= $phpbb_container->get('user');
 $auth		= $phpbb_container->get('auth');
 $db			= $phpbb_container->get('dbal.conn');
 
+$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
+foreach ($ids as $id)
+{
+	$processor = $phpbb_container->get($id);
+	$processor->process($phpbb_container);
+}
+
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
 

From b24ee89cfc22fad322dcfc577d1c7d50bbd57809 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Tue, 11 Sep 2012 09:44:13 +0100
Subject: [PATCH 10/10] [ticket/11109] Re-add file conflict checks to compress
 class

PHPBB3-11109
---
 tests/compress/compress_test.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
index 65094671e3..ac8dd358d3 100644
--- a/tests/compress/compress_test.php
+++ b/tests/compress/compress_test.php
@@ -25,6 +25,12 @@ class phpbb_compress_test extends phpbb_test_case
 		'dir/subdir/4.txt',
 	);
 
+	protected $conflicts = array(
+		'1_1.txt',
+		'1_2.txt',
+		'dir/2_1.txt',
+	);
+
 	protected function setUp()
 	{
 		// Required for compress::add_file
@@ -82,6 +88,11 @@ class phpbb_compress_test extends phpbb_test_case
 		);
 		$compress->add_custom_file($this->path . 'dir/3.txt', 'dir/3.txt');
 		$compress->add_data(file_get_contents($this->path . 'dir/subdir/4.txt'), 'dir/subdir/4.txt');
+
+		// Add multiples of the same file to check conflicts are handled
+		$compress->add_file($this->path . '1.txt', $this->path);
+		$compress->add_file($this->path . '1.txt', $this->path);
+		$compress->add_file($this->path . 'dir/2.txt', $this->path);
 	}
 
 	protected function valid_extraction($extra = array())
@@ -141,7 +152,7 @@ class phpbb_compress_test extends phpbb_test_case
 		$compress->mode = 'r';
 		$compress->open();
 		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
-		$this->valid_extraction();
+		$this->valid_extraction($this->conflicts);
 	}
 
 	/**
@@ -157,6 +168,6 @@ class phpbb_compress_test extends phpbb_test_case
 
 		$compress = new compress_zip('r', $zip);
 		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
-		$this->valid_extraction();
+		$this->valid_extraction($this->conflicts);
 	}
 }