10 files changed, 105 insertions, 10 deletions
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 0d7fc2f839..ae4099e6f8 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -60,6 +60,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 			$this->db,
 			$this->config,
 			$this->migrator,
+			new phpbb_filesystem(),
 			'phpbb_ext',
 			dirname(__FILE__) . '/../../phpBB/',
 			'.php',
diff --git a/tests/extension/ext/bar/styles/prosilver/template/foobar_body.html b/tests/extension/ext/bar/styles/prosilver/template/foobar_body.html
new file mode 100644
index 0000000000..00c2a84a18
--- /dev/null
+++ b/tests/extension/ext/bar/styles/prosilver/template/foobar_body.html
@@ -0,0 +1 @@
+bertie rules!
diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php
index c96b11a73c..4c99ba6343 100644
--- a/tests/extension/finder_test.php
+++ b/tests/extension/finder_test.php
@@ -6,6 +6,7 @@
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_extension_finder_test extends phpbb_test_case
 {
@@ -66,7 +67,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	public function test_prefix_get_directories()
 	{
 		$dirs = $this->finder
-            ->prefix('t')
+            ->prefix('ty')
 			->get_directories();
 
 		sort($dirs);
@@ -142,13 +143,28 @@ class phpbb_extension_finder_test extends phpbb_test_case
 		);
 	}
 
+	public function test_uncleansub_directory_get_classes()
+	{
+		$classes = $this->finder
+			->directory('/sub/../sub/type')
+			->get_classes();
+
+		sort($classes);
+		$this->assertEquals(
+			array(
+				'phpbb_ext_foo_sub_type_alternative',
+			),
+			$classes
+		);
+	}
+
 	/**
 	* These do not work because of changes with PHPBB3-11386
 	* They do not seem neccessary to me, so I am commenting them out for now
 	public function test_get_classes_create_cache()
 	{
 		$cache = new phpbb_mock_cache;
-		$finder = new phpbb_extension_finder($this->extension_manager, dirname(__FILE__) . '/', $cache, '.php', '_custom_cache_name');
+		$finder = new phpbb_extension_finder($this->extension_manager, new phpbb_filesystem(), dirname(__FILE__) . '/', $cache, '.php', '_custom_cache_name');
 		$files = $finder->suffix('_class.php')->get_files();
 
 		$expected_files = array(
@@ -188,6 +204,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 
 		$finder = new phpbb_extension_finder(
 			$this->extension_manager,
+			new phpbb_filesystem(),
 			dirname(__FILE__) . '/',
 			new phpbb_mock_cache(array(
 				'_ext_finder' => array(
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index 1f311116f4..d6bcb97586 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -112,6 +112,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 			$db,
 			$config,
 			$migrator,
+			new phpbb_filesystem(),
 			'phpbb_ext',
 			dirname(__FILE__) . '/',
 			'.' . $php_ext,
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 081a32e277..df7817b479 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -64,6 +64,7 @@ class metadata_manager_test extends phpbb_database_test_case
 			$this->db,
 			$this->config,
 			$this->migrator,
+			new phpbb_filesystem(),
 			'phpbb_ext',
 			$this->phpbb_root_path,
 			$this->phpEx,
diff --git a/tests/extension/style_path_provider_test.php b/tests/extension/style_path_provider_test.php
new file mode 100644
index 0000000000..e1021c20ac
--- /dev/null
+++ b/tests/extension/style_path_provider_test.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_extension_style_path_provider_test extends phpbb_test_case
+{
+	protected $relative_root_path;
+	protected $root_path;
+
+	public function setUp()
+	{
+		$this->relative_root_path = './';
+		$this->root_path = dirname(__FILE__) . '/';
+	}
+
+	public function test_find()
+	{
+		$phpbb_style_path_provider = new phpbb_style_path_provider();
+		$phpbb_style_path_provider->set_styles(array($this->relative_root_path . 'styles/prosilver'));
+		$phpbb_style_extension_path_provider = new phpbb_style_extension_path_provider(new phpbb_mock_extension_manager(
+			$this->root_path,
+			array(
+				'foo' => array(
+					'ext_name' => 'foo',
+					'ext_active' => '1',
+					'ext_path' => 'ext/foo/',
+				),
+				'bar' => array(
+					'ext_name' => 'bar',
+					'ext_active' => '1',
+					'ext_path' => 'ext/bar/',
+				),
+			)), $phpbb_style_path_provider, $this->relative_root_path);
+
+		$this->assertEquals(array(
+			'style' => array(
+				$this->relative_root_path . 'styles/prosilver',
+			),
+			'bar' => array(
+				$this->root_path . 'ext/bar/styles/prosilver',
+			),
+		), $phpbb_style_extension_path_provider->find());
+	}
+}
diff --git a/tests/extension/subdir/style_path_provider_test.php b/tests/extension/subdir/style_path_provider_test.php
new file mode 100644
index 0000000000..1b5ce62e5f
--- /dev/null
+++ b/tests/extension/subdir/style_path_provider_test.php
@@ -0,0 +1,18 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+require_once dirname(__FILE__) . '/../style_path_provider_test.php';
+
+class phpbb_extension_subdir_style_path_provider_test extends phpbb_extension_style_path_provider_test
+{
+	public function setUp()
+	{
+		$this->relative_root_path = '../';
+		$this->root_path = dirname(__FILE__) . '/../';
+	}
+}
diff --git a/tests/functions/clean_path_test.php b/tests/filesystem/clean_path_test.php
index bcbe9838d9..50951fc88c 100644
--- a/tests/functions/clean_path_test.php
+++ b/tests/filesystem/clean_path_test.php
@@ -7,11 +7,17 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
-class phpbb_clean_path_test extends phpbb_test_case
+class phpbb_filesystem_clean_path_test extends phpbb_test_case
 {
-	public function clean_path_test_data()
+	protected $filesystem;
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->filesystem = new phpbb_filesystem();
+	}
+
+	public function clean_path_data()
 	{
 		return array(
 			array('foo', 'foo'),
@@ -33,12 +39,10 @@ class phpbb_clean_path_test extends phpbb_test_case
 	}
 
 	/**
-	* @dataProvider clean_path_test_data
+	* @dataProvider clean_path_data
 	*/
 	public function test_clean_path($input, $expected)
 	{
-		$output = phpbb_clean_path($input);
-
-		$this->assertEquals($expected, $output);
+		$this->assertEquals($expected, $this->filesystem->clean_path($input));
 	}
 }
diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php
index fdda4cbadc..954f2bf1c4 100644
--- a/tests/mock/extension_manager.php
+++ b/tests/mock/extension_manager.php
@@ -14,5 +14,6 @@ class phpbb_mock_extension_manager extends phpbb_extension_manager
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = '.php';
 		$this->extensions = $extensions;
+		$this->filesystem = new phpbb_filesystem();
 	}
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 15c063ec02..b9647e4742 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -153,6 +153,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			$db,
 			$config,
 			$migrator,
+			new phpbb_filesystem(),
 			self::$config['table_prefix'] . 'ext',
 			dirname(__FILE__) . '/',
 			'.' . $php_ext,