18 files changed, 152 insertions, 371 deletions
diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md
index afd7caa709..b082197166 100644
--- a/tests/RUNNING_TESTS.md
+++ b/tests/RUNNING_TESTS.md
@@ -120,8 +120,9 @@ directory (above phpBB):
 Slow tests
 --------------
 
-Certain tests, such as the UTF-8 normalizer or the DNS tests tend to be slow.
-Thus these tests are in the `slow` group, which is excluded by default. If you
+Certain tests, such as the DNS tests tend to be slow.
+Thus these tests are in the `slow` group, which is excluded by default. You can
+enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you
 only want the slow tests, run:
 
     $ phpBB/vendor/bin/phpunit --group slow
diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php
index 859832412d..1bde559fbb 100644
--- a/tests/controller/common_helper_route.php
+++ b/tests/controller/common_helper_route.php
@@ -35,10 +35,6 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 		);
 		$this->generate_route_objects();
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
-		$this->user = new \phpbb\user('\phpbb\datetime');
-
-		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0'));
-		$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $this->config, $this->user, new \phpbb\template\context());
 	}
 
 	protected function get_phpbb_root_path()
@@ -82,6 +78,41 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 			$phpEx
 		);
 
+		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0'));
+		$this->user = new \phpbb\user('\phpbb\datetime');
+
+		$container = new phpbb_mock_container_builder();
+		$cache_path = $phpbb_root_path . 'cache/twig';
+		$context = new \phpbb\template\context();
+		$loader = new \phpbb\template\twig\loader('');
+		$twig = new \phpbb\template\twig\environment(
+			$this->config,
+			$this->phpbb_path_helper,
+			$container,
+			$cache_path,
+			null,
+			$loader,
+			array(
+				'cache'			=> false,
+				'debug'			=> false,
+				'auto_reload'	=> true,
+				'autoescape'	=> false,
+			)
+		);
+		$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $this->config, $this->user, $context, $twig, $cache_path, array(new \phpbb\template\twig\extension($context, $this->user)));
+		$container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
+
+		$this->extension_manager = new phpbb_mock_extension_manager(
+			dirname(__FILE__) . '/',
+			array(
+				'vendor2/foo' => array(
+					'ext_name' => 'vendor2/foo',
+					'ext_active' => '1',
+					'ext_path' => 'ext/vendor2/foo/',
+				),
+			)
+		);
+
 		$finder = new \phpbb\finder(
 			new \phpbb\filesystem(),
 			dirname(__FILE__) . '/',
diff --git a/tests/event/md_exporter_test.php b/tests/event/md_exporter_test.php
index 0f9d855caa..28649e4f21 100644
--- a/tests/event/md_exporter_test.php
+++ b/tests/event/md_exporter_test.php
@@ -41,7 +41,6 @@ class phpbb_event_md_exporter_test extends phpbb_test_case
 		$styles = array(
 			'adm/style/' => 'adm',
 			'styles/prosilver/template/' => 'styles',
-			'styles/subsilver2/template/' => 'styles',
 		);
 		foreach ($styles as $path => $filter)
 		{
diff --git a/tests/extension/ext/vendor2/bar/acp/a_info.php b/tests/extension/ext/vendor2/bar/acp/a_info.php
index 8132df587f..8268006f9f 100644
--- a/tests/extension/ext/vendor2/bar/acp/a_info.php
+++ b/tests/extension/ext/vendor2/bar/acp/a_info.php
@@ -9,7 +9,6 @@ class a_info
 		return array(
 			'filename'	=> 'vendor2\\bar\\acp\\a_module',
 			'title'		=> 'Bar',
-			'version'	=> '3.1.0-dev',
 			'modes'		=> array(
 				'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')),
 			),
diff --git a/tests/extension/ext/vendor2/foo/acp/a_info.php b/tests/extension/ext/vendor2/foo/acp/a_info.php
index e1eaa340b7..48ab4cf8e7 100644
--- a/tests/extension/ext/vendor2/foo/acp/a_info.php
+++ b/tests/extension/ext/vendor2/foo/acp/a_info.php
@@ -9,7 +9,6 @@ class a_info
 		return array(
 			'filename'	=> 'vendor2\\foo\\acp\\a_module',
 			'title'		=> 'Foobar',
-			'version'	=> '3.1.0-dev',
 			'modes'		=> array(
 				'config'		=> array('title' => 'Config',	'auth' => 'ext_vendor2/foo', 'cat' => array('ACP_MODS')),
 			),
diff --git a/tests/extension/ext/vendor2/foo/acp/fail_info.php b/tests/extension/ext/vendor2/foo/acp/fail_info.php
index d9b4353957..78479fee70 100644
--- a/tests/extension/ext/vendor2/foo/acp/fail_info.php
+++ b/tests/extension/ext/vendor2/foo/acp/fail_info.php
@@ -13,7 +13,6 @@ class foo_info
 		return array(
 			'filename'	=> 'vendor2\foo\acp\fail_module',
 			'title'		=> 'Foobar',
-			'version'	=> '3.1.0-dev',
 			'modes'		=> array(
 				'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')),
 			),
diff --git a/tests/extension/ext/vendor2/foo/mcp/a_info.php b/tests/extension/ext/vendor2/foo/mcp/a_info.php
index b5599fde65..2532e44b12 100644
--- a/tests/extension/ext/vendor2/foo/mcp/a_info.php
+++ b/tests/extension/ext/vendor2/foo/mcp/a_info.php
@@ -9,7 +9,6 @@ class a_info
 		return array(
 			'filename'	=> 'vendor2\\foo\\mcp\\a_module',
 			'title'		=> 'Foobar',
-			'version'	=> '3.1.0-dev',
 			'modes'		=> array(
 				'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('MCP_MAIN')),
 			),
diff --git a/tests/extension/includes/acp/info/acp_foobar.php b/tests/extension/includes/acp/info/acp_foobar.php
index 870225ba4f..8ca1afa1c6 100644
--- a/tests/extension/includes/acp/info/acp_foobar.php
+++ b/tests/extension/includes/acp/info/acp_foobar.php
@@ -18,7 +18,6 @@ class acp_foobar_info
 		return array(
 			'filename'	=> 'acp_foobar',
 			'title'		=> 'ACP Foobar',
-			'version'	=> '3.1.0-dev',
 			'modes'		=> array(
 				'test'		=> array('title' => 'Test', 'auth' => '', 'cat' => array('ACP_GENERAL')),
 			),
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 8e27b39459..ead0076d90 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -47,20 +47,35 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$this->user = new \phpbb\user('\phpbb\datetime');
 		$this->table_prefix = 'phpbb_';
 
-		$this->template = new \phpbb\template\twig\twig(
-			new \phpbb\path_helper(
-				new \phpbb\symfony_request(
-					new phpbb_mock_request()
-				),
-				new \phpbb\filesystem(),
-				$this->getMock('\phpbb\request\request'),
-				$this->phpbb_root_path,
-				$this->phpEx
+		$container = new phpbb_mock_container_builder();
+		$cache_path = $this->phpbb_root_path . 'cache/twig';
+		$context = new \phpbb\template\context();
+		$loader = new \phpbb\template\twig\loader('');
+		$phpbb_path_helper =new \phpbb\path_helper(
+			new \phpbb\symfony_request(
+				new phpbb_mock_request()
 			),
+			new \phpbb\filesystem(),
+			$this->getMock('\phpbb\request\request'),
+			$this->phpbb_root_path,
+			$this->phpEx
+		);
+		$twig = new \phpbb\template\twig\environment(
 			$this->config,
-			$this->user,
-			new \phpbb\template\context()
+			$phpbb_path_helper,
+			$container,
+			$cache_path,
+			null,
+			$loader,
+			array(
+				'cache'			=> false,
+				'debug'			=> false,
+				'auto_reload'	=> true,
+				'autoescape'	=> false,
+			)
 		);
+		$this->template = new phpbb\template\twig\twig($phpbb_path_helper, $this->config, $this->user, $context, $twig, $cache_path, array(new \phpbb\template\twig\extension($context, $this->user)));
+		$container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
 
 		$this->migrator = new \phpbb\db\migrator(
 			$this->config,
@@ -73,7 +88,6 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 			array(),
 			new \phpbb\db\migration\helper()
 		);
-		$container = new phpbb_mock_container_builder();
 		$container->set('migrator', $this->migrator);
 
 		$this->extension_manager = new \phpbb\extension\manager(
diff --git a/tests/extension/modules_test.php b/tests/extension/modules_test.php
index 21f1c6aca5..cbcfdfb787 100644
--- a/tests/extension/modules_test.php
+++ b/tests/extension/modules_test.php
@@ -62,7 +62,6 @@ class phpbb_extension_modules_test extends phpbb_test_case
 				'vendor2\\foo\\acp\\a_module' => array(
 					'filename'	=> 'vendor2\\foo\\acp\\a_module',
 					'title'		=> 'Foobar',
-					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
 						'config'		=> array('title' => 'Config',	'auth' => 'ext_vendor2/foo', 'cat' => array('ACP_MODS')),
 					),
@@ -70,7 +69,6 @@ class phpbb_extension_modules_test extends phpbb_test_case
 				'acp_foobar' => array(
 					'filename'	=> 'acp_foobar',
 					'title'		=> 'ACP Foobar',
-					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
 						'test'		=> array('title' => 'Test', 'auth' => '', 'cat' => array('ACP_GENERAL')),
 					),
@@ -84,7 +82,6 @@ class phpbb_extension_modules_test extends phpbb_test_case
 				'vendor2\\foo\\mcp\\a_module' => array(
 					'filename'	=> 'vendor2\\foo\\mcp\\a_module',
 					'title'		=> 'Foobar',
-					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
 						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('MCP_MAIN')),
 					),
@@ -98,7 +95,6 @@ class phpbb_extension_modules_test extends phpbb_test_case
 				'vendor2\\foo\\mcp\\a_module' => array(
 					'filename'	=> 'vendor2\\foo\\mcp\\a_module',
 					'title'		=> 'Foobar',
-					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
 						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('MCP_MAIN')),
 					),
@@ -112,7 +108,6 @@ class phpbb_extension_modules_test extends phpbb_test_case
 				'vendor2\\foo\\mcp\\a_module' => array(
 					'filename'	=> 'vendor2\\foo\\mcp\\a_module',
 					'title'		=> 'Foobar',
-					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
 						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('MCP_MAIN')),
 					),
@@ -136,7 +131,6 @@ class phpbb_extension_modules_test extends phpbb_test_case
 				'vendor2\\foo\\acp\\a_module' => array (
 					'filename' => 'vendor2\\foo\\acp\\a_module',
 					'title' => 'Foobar',
-					'version' => '3.1.0-dev',
 					'modes' => array (
 						'config'		=> array ('title' => 'Config', 'auth' => 'ext_vendor2/foo', 'cat' => array ('ACP_MODS')),
 					),
@@ -160,7 +154,6 @@ class phpbb_extension_modules_test extends phpbb_test_case
 				'vendor2\\foo\\acp\\a_module' => array(
 					'filename'	=> 'vendor2\\foo\\acp\\a_module',
 					'title'		=> 'Foobar',
-					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
 						'config'		=> array('title' => 'Config',	'auth' => 'ext_vendor2/foo', 'cat' => array('ACP_MODS')),
 					),
@@ -168,7 +161,6 @@ class phpbb_extension_modules_test extends phpbb_test_case
 				'acp_foobar' => array(
 					'filename'	=> 'acp_foobar',
 					'title'		=> 'ACP Foobar',
-					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
 						'test'		=> array('title' => 'Test', 'auth' => '', 'cat' => array('ACP_GENERAL')),
 					),
@@ -176,7 +168,6 @@ class phpbb_extension_modules_test extends phpbb_test_case
 				'vendor2\\bar\\acp\\a_module' => array(
 					'filename'	=> 'vendor2\\bar\\acp\\a_module',
 					'title'		=> 'Bar',
-					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
 						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')),
 					),
@@ -189,7 +180,6 @@ class phpbb_extension_modules_test extends phpbb_test_case
 				'vendor2\\bar\\acp\\a_module' => array(
 					'filename'	=> 'vendor2\\bar\\acp\\a_module',
 					'title'		=> 'Bar',
-					'version'	=> '3.1.0-dev',
 					'modes'		=> array(
 						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')),
 					),
diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php
index ec378e0e75..371ab7c967 100644
--- a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php
+++ b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php
@@ -28,7 +28,6 @@ class main_info
 		return array(
 			'filename'	=> 'foo\bar\acp\main_module',
 			'title'		=> 'ACP_FOOBAR_TITLE',
-			'version'	=> '1.0.0',
 			'modes'		=> array(
 				'mode'		=> array('title' => 'ACP_FOOBAR_MODE', 'auth' => '', 'cat' => array('ACP_FOOBAR_TITLE')),
 			),
diff --git a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php
index d34244f800..4c74442639 100644
--- a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php
+++ b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php
@@ -20,7 +20,6 @@ class main_info
 		return array(
 			'filename'	=> '\foo\bar\ucp\main_module',
 			'title'		=> 'ACP_FOOBAR_TITLE',
-			'version'	=> '1.0.0',
 			'modes'		=> array(
 				'mode'		=> array('title' => 'ACP_FOOBAR_MODE', 'auth' => '', 'cat' => array('ACP_FOOBAR_TITLE')),
 			),
diff --git a/tests/template/template_allfolder_test.php b/tests/template/template_allfolder_test.php
index b4ad84e9c3..e87688a57c 100644
--- a/tests/template/template_allfolder_test.php
+++ b/tests/template/template_allfolder_test.php
@@ -51,9 +51,29 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
 			)
 		);
 
+		$container = new phpbb_mock_container_builder();
+		$cache_path = $phpbb_root_path . 'cache/twig';
+		$context = new \phpbb\template\context();
+		$loader = new \phpbb\template\twig\loader('');
+		$twig = new \phpbb\template\twig\environment(
+			$config,
+			$path_helper,
+			$container,
+			$cache_path,
+			$this->extension_manager,
+			$loader,
+			array(
+				'cache'			=> false,
+				'debug'			=> false,
+				'auto_reload'	=> true,
+				'autoescape'	=> false,
+			)
+		);
+		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $this->user, $context, $twig, $cache_path, array(new \phpbb\template\twig\extension($context, $this->user)), $this->extension_manager);
+		$container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
+
 		$this->template_path = $this->test_path . '/templates';
 		$this->ext_template_path = 'tests/extension/ext/vendor4/bar/styles/all/template';
-		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $this->user, new \phpbb\template\context(), $this->extension_manager);
 		$this->template->set_custom_style('all', array($this->template_path, $this->ext_template_path));
 	}
 }
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php
index c415c969fe..e8ffea8d11 100644
--- a/tests/template/template_events_test.php
+++ b/tests/template/template_events_test.php
@@ -147,7 +147,28 @@ Zeta test event in all',
 			$phpbb_root_path,
 			$phpEx
 		);
-		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $user, new \phpbb\template\context, $this->extension_manager);
+
+		$container = new phpbb_mock_container_builder();
+		$cache_path = $phpbb_root_path . 'cache/twig';
+		$context = new \phpbb\template\context();
+		$loader = new \phpbb\template\twig\loader('');
+		$twig = new \phpbb\template\twig\environment(
+			$config,
+			$path_helper,
+			$container,
+			$cache_path,
+			$this->extension_manager,
+			$loader,
+			array(
+				'cache'			=> false,
+				'debug'			=> false,
+				'auto_reload'	=> true,
+				'autoescape'	=> false,
+			)
+		);
+		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $user, $context, $twig, $cache_path, array(new \phpbb\template\twig\extension($context, $this->user)), $this->extension_manager);
+		$container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
+
 		$this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path));
 	}
 }
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 1250397401..f9ea8cfaba 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -78,7 +78,27 @@ class phpbb_template_template_test_case extends phpbb_test_case
 		);
 
 		$this->template_path = $this->test_path . '/templates';
-		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $this->user, new \phpbb\template\context());
+
+		$container = new phpbb_mock_container_builder();
+		$cache_path = $phpbb_root_path . 'cache/twig';
+		$context = new \phpbb\template\context();
+		$loader = new \phpbb\template\twig\loader('');
+		$twig = new \phpbb\template\twig\environment(
+			$config,
+			$path_helper,
+			$container,
+			$cache_path,
+			null,
+			$loader,
+			array(
+				'cache'			=> false,
+				'debug'			=> false,
+				'auto_reload'	=> true,
+				'autoescape'	=> false,
+			)
+		);
+		$this->template = new phpbb\template\twig\twig($path_helper, $config, $user, $context, $twig, $cache_path, array(new \phpbb\template\twig\extension($context, $this->user)));
+		$container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
 		$this->template->set_custom_style('tests', $this->template_path);
 	}
 
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
index 68ecc4b706..c634e2051a 100644
--- a/tests/template/template_test_case_with_tree.php
+++ b/tests/template/template_test_case_with_tree.php
@@ -34,7 +34,27 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
 
 		$this->template_path = $this->test_path . '/templates';
 		$this->parent_template_path = $this->test_path . '/parent_templates';
-		$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $user, new phpbb\template\context());
+
+		$container = new phpbb_mock_container_builder();
+		$cache_path = $phpbb_root_path . 'cache/twig';
+		$context = new \phpbb\template\context();
+		$loader = new \phpbb\template\twig\loader('');
+		$twig = new \phpbb\template\twig\environment(
+			$config,
+			$this->phpbb_path_helper,
+			$container,
+			$cache_path,
+			null,
+			$loader,
+			array(
+				'cache'			=> false,
+				'debug'			=> false,
+				'auto_reload'	=> true,
+				'autoescape'	=> false,
+			)
+		);
+		$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $user, $context, $twig, $cache_path, array(new \phpbb\template\twig\extension($context, $this->user)));
+		$container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig));
 		$this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path));
 	}
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 51bae7a723..cdb3d01524 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -475,7 +475,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			));
 			$db->sql_query($sql);
 
-			if ($style_path != 'prosilver' && $style_path != 'subsilver2')
+			if ($style_path != 'prosilver')
 			{
 				@mkdir($phpbb_root_path . 'styles/' . $style_path, 0777);
 				@mkdir($phpbb_root_path . 'styles/' . $style_path . '/template', 0777);
@@ -514,7 +514,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			$db->sql_query('DELETE FROM ' . STYLES_TEMPLATE_TABLE . ' WHERE template_id = ' . $style_id);
 			$db->sql_query('DELETE FROM ' . STYLES_THEME_TABLE . ' WHERE theme_id = ' . $style_id);
 
-			if ($style_path != 'prosilver' && $style_path != 'subsilver2')
+			if ($style_path != 'prosilver')
 			{
 				@rmdir($phpbb_root_path . 'styles/' . $style_path . '/template');
 				@rmdir($phpbb_root_path . 'styles/' . $style_path);
@@ -933,8 +933,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 	*/
 	public function assert_checkbox_is_unchecked($crawler, $name, $message = '')
 	{
-		$this->assertSame(
-			'',
+		$this->assertNull(
 			$this->assert_find_one_checkbox($crawler, $name)->attr('checked'),
 			$message ?: "Failed asserting that checkbox $name is unchecked."
 		);
diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
deleted file mode 100644
index 50eafda859..0000000000
--- a/tests/utf/normalizer_test.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_normalizer.php';
-
-/**
-* @group slow
-*/
-class phpbb_utf_normalizer_test extends phpbb_test_case
-{
-	static private $data_dir;
-
-	static public function setUpBeforeClass()
-	{
-		self::$data_dir = dirname(__file__) . '/../tmp';
-		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', self::$data_dir);
-		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', self::$data_dir);
-	}
-
-	public function test_normalizer()
-	{
-		$test_suite = array(
-			/**
-			* NFC
-			*   c2 ==  NFC(c1) ==  NFC(c2) ==  NFC(c3)
-			*   c4 ==  NFC(c4) ==  NFC(c5)
-			*/
-			'NFC'	=>	array(
-				'c2'	=>	array('c1', 'c2', 'c3'),
-				'c4'	=>	array('c4', 'c5')
-			),
-
-			/**
-			* NFD
-			*   c3 ==  NFD(c1) ==  NFD(c2) ==  NFD(c3)
-			*   c5 ==  NFD(c4) ==  NFD(c5)
-			*/
-			'NFD'	=>	array(
-				'c3'	=>	array('c1', 'c2', 'c3'),
-				'c5'	=>	array('c4', 'c5')
-			),
-
-			/**
-			* NFKC
-			*   c4 == NFKC(c1) == NFKC(c2) == NFKC(c3) == NFKC(c4) == NFKC(c5)
-			*/
-			'NFKC'	=>	array(
-				'c4'	=>	array('c1', 'c2', 'c3', 'c4', 'c5')
-			),
-
-			/**
-			* NFKD
-			*   c5 == NFKD(c1) == NFKD(c2) == NFKD(c3) == NFKD(c4) == NFKD(c5)
-			*/
-			'NFKD'	=>	array(
-				'c5'	=>	array('c1', 'c2', 'c3', 'c4', 'c5')
-			)
-		);
-
-		$tested_chars = array();
-
-		$fp = fopen(self::$data_dir . '/NormalizationTest.txt', 'rb');
-		while (!feof($fp))
-		{
-			$line = fgets($fp);
-
-			if ($line[0] == '@')
-			{
-				continue;
-			}
-
-			if (!strpos(' 0123456789ABCDEF', $line[0]))
-			{
-				continue;
-			}
-
-			list($c1, $c2, $c3, $c4, $c5) = explode(';', $line);
-
-			if (!strpos($c1, ' '))
-			{
-				/**
-				* We are currently testing a single character, we add it to the list of
-				* characters we have processed so that we can exclude it when testing
-				* for invariants
-				*/
-				$tested_chars[$c1] = 1;
-			}
-
-			foreach ($test_suite as $form => $serie)
-			{
-				foreach ($serie as $expected => $tests)
-				{
-					$hex_expected = ${$expected};
-					$utf_expected = $this->hexseq_to_utf($hex_expected);
-
-					foreach ($tests as $test)
-					{
-						$utf_result = $utf_expected;
-						call_user_func_array(array('utf_normalizer', $form), array(&$utf_result));
-
-						$hex_result = $this->utf_to_hexseq($utf_result);
-						$this->assertEquals($utf_expected, $utf_result, "$expected == $form($test) ($hex_expected != $hex_result)");
-					}
-				}
-			}
-		}
-		fclose($fp);
-
-		return $tested_chars;
-	}
-
-	/**
-	* @depends test_normalizer
-	*/
-	public function test_invariants(array $tested_chars)
-	{
-		$fp = fopen(self::$data_dir . '/UnicodeData.txt', 'rb');
-
-		while (!feof($fp))
-		{
-			$line = fgets($fp, 1024);
-
-			if (!$pos = strpos($line, ';'))
-			{
-				continue;
-			}
-
-			$hex_tested = $hex_expected = substr($line, 0, $pos);
-
-			if (isset($tested_chars[$hex_tested]))
-			{
-				continue;
-			}
-
-			$utf_expected = $this->hex_to_utf($hex_expected);
-
-			if ($utf_expected >= UTF8_SURROGATE_FIRST
-			 && $utf_expected <= UTF8_SURROGATE_LAST)
-			{
-				/**
-				* Surrogates are illegal on their own, we expect the normalizer
-				* to return a replacement char
-				*/
-				$utf_expected = UTF8_REPLACEMENT;
-				$hex_expected = $this->utf_to_hexseq($utf_expected);
-			}
-
-			foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
-			{
-				$utf_result = $utf_expected;
-				call_user_func_array(array('utf_normalizer', $form), array(&$utf_result));
-				$hex_result = $this->utf_to_hexseq($utf_result);
-
-				$this->assertEquals($utf_expected, $utf_result, "$hex_expected == $form($hex_tested) ($hex_expected != $hex_result)");
-			}
-		}
-		fclose($fp);
-	}
-
-	/**
-	* Convert a UTF string to a sequence of codepoints in hexadecimal
-	*
-	* @param	string	$utf	UTF string
-	* @return	integer			Unicode codepoints in hex
-	*/
-	protected function utf_to_hexseq($str)
-	{
-		$pos = 0;
-		$len = strlen($str);
-		$ret = array();
-
-		while ($pos < $len)
-		{
-			$c = $str[$pos];
-			switch ($c & "\xF0")
-			{
-				case "\xC0":
-				case "\xD0":
-					$utf_char = substr($str, $pos, 2);
-					$pos += 2;
-					break;
-
-				case "\xE0":
-					$utf_char = substr($str, $pos, 3);
-					$pos += 3;
-					break;
-
-				case "\xF0":
-					$utf_char = substr($str, $pos, 4);
-					$pos += 4;
-					break;
-
-				default:
-					$utf_char = $c;
-					++$pos;
-			}
-
-			$hex = dechex($this->utf_to_cp($utf_char));
-
-			if (!isset($hex[3]))
-			{
-				$hex = substr('000' . $hex, -4);
-			}
-
-			$ret[] = $hex;
-		}
-
-		return strtr(implode(' ', $ret), 'abcdef', 'ABCDEF');
-	}
-
-	/**
-	* Convert a UTF-8 char to its codepoint
-	*
-	* @param	string	$utf_char	UTF-8 char
-	* @return	integer				Unicode codepoint
-	*/
-	protected function utf_to_cp($utf_char)
-	{
-		switch (strlen($utf_char))
-		{
-			case 1:
-				return ord($utf_char);
-
-			case 2:
-				return ((ord($utf_char[0]) & 0x1F) << 6) | (ord($utf_char[1]) & 0x3F);
-
-			case 3:
-				return ((ord($utf_char[0]) & 0x0F) << 12) | ((ord($utf_char[1]) & 0x3F) << 6) | (ord($utf_char[2]) & 0x3F);
-
-			case 4:
-				return ((ord($utf_char[0]) & 0x07) << 18) | ((ord($utf_char[1]) & 0x3F) << 12) | ((ord($utf_char[2]) & 0x3F) << 6) | (ord($utf_char[3]) & 0x3F);
-
-			default:
-				throw new RuntimeException('UTF-8 chars can only be 1-4 bytes long');
-		}
-	}
-
-	/**
-	* Return a UTF string formed from a sequence of codepoints in hexadecimal
-	*
-	* @param	string	$seq		Sequence of codepoints, separated with a space
-	* @return	string				UTF-8 string
-	*/
-	protected function hexseq_to_utf($seq)
-	{
-		return implode('', array_map(array($this, 'hex_to_utf'), explode(' ', $seq)));
-	}
-
-	/**
-	* Convert a codepoint in hexadecimal to a UTF-8 char
-	*
-	* @param	string	$hex		Codepoint, in hexadecimal
-	* @return	string				UTF-8 char
-	*/
-	protected function hex_to_utf($hex)
-	{
-		return $this->cp_to_utf(hexdec($hex));
-	}
-
-	/**
-	* Convert a codepoint to a UTF-8 char
-	*
-	* @param	integer	$cp			Unicode codepoint
-	* @return	string				UTF-8 string
-	*/
-	protected function cp_to_utf($cp)
-	{
-		if ($cp > 0xFFFF)
-		{
-			return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
-		}
-		else if ($cp > 0x7FF)
-		{
-			return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
-		}
-		else if ($cp > 0x7F)
-		{
-			return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
-		}
-		else
-		{
-			return chr($cp);
-		}
-	}
-
-	// chunked download helper
-	static protected function download($url, $to)
-	{
-		$target = $to . '/' . basename($url);
-
-		if (file_exists($target))
-		{
-			return;
-		}
-
-		if (!$fpr = fopen($url, 'rb'))
-		{
-			echo "Failed to download $url\n";
-			return;
-		}
-
-		if (!$fpw = fopen($target, 'wb'))
-		{
-			echo "Failed to open $target for writing\n";
-			return;
-		}
-
-		$chunk = 32768;
-
-		while (!feof($fpr))
-		{
-			fwrite($fpw, fread($fpr, $chunk));
-		}
-		fclose($fpr);
-		fclose($fpw);
-	}
-}