From c630480ca1a426cb0897be35626baac2694fccf5 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 17 Oct 2012 15:03:06 -0400
Subject: [ticket/10848] Redirect from adm to installer correctly.

PHPBB3-10848
---
 tests/functions/clean_path_test.php | 44 +++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 tests/functions/clean_path_test.php

(limited to 'tests/functions/clean_path_test.php')

diff --git a/tests/functions/clean_path_test.php b/tests/functions/clean_path_test.php
new file mode 100644
index 0000000000..4c8fe54909
--- /dev/null
+++ b/tests/functions/clean_path_test.php
@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 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_clean_path_test extends phpbb_test_case
+{
+	public function clean_path_test_data()
+	{
+		return array(
+			array('foo', 'foo'),
+			array('foo/bar', 'foo/bar'),
+			array('foo/bar/', 'foo/bar/'),
+			array('foo/./bar', 'foo/bar'),
+			array('foo/./././bar', 'foo/bar'),
+			array('foo/bar/.', 'foo/bar'),
+			array('./foo/bar', './foo/bar'),
+			array('../foo/bar', '../foo/bar'),
+			array('one/two/three', 'one/two/three'),
+			array('one/two/../three', 'one/three'),
+			array('one/../two/three', 'two/three'),
+			array('one/two/..', 'one'),
+			array('one/two/../', 'one/'),
+			array('one/two/../three/../four', 'one/four'),
+			array('one/two/three/../../four', 'one/four'),
+		);
+	}
+
+	/**
+	* @dataProvider clean_path_test_data
+	*/
+	public function test_clean_path($input, $expected)
+	{
+		$output = clean_path($input);
+
+		$this->assertEquals($expected, $output);
+	}
+}
-- 
cgit v1.2.1


From bb09cd9c8e76ac3af848d09db8ea1928dab66158 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 17 Oct 2012 15:13:35 -0400
Subject: [ticket/10848] Add phpbb_ prefix.

PHPBB3-10848
---
 tests/functions/clean_path_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/functions/clean_path_test.php')

diff --git a/tests/functions/clean_path_test.php b/tests/functions/clean_path_test.php
index 4c8fe54909..bcbe9838d9 100644
--- a/tests/functions/clean_path_test.php
+++ b/tests/functions/clean_path_test.php
@@ -37,7 +37,7 @@ class phpbb_clean_path_test extends phpbb_test_case
 	*/
 	public function test_clean_path($input, $expected)
 	{
-		$output = clean_path($input);
+		$output = phpbb_clean_path($input);
 
 		$this->assertEquals($expected, $output);
 	}
-- 
cgit v1.2.1