diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-11-10 12:27:19 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-11-10 12:27:19 +0100 |
| commit | 948bfcbe770bd8cb6f95a7a7c5cabb3ddfe27597 (patch) | |
| tree | 0ab44e608fd8d269a2e8ae151b51d0dc450f8c13 /tests/functions/clean_path_test.php | |
| parent | 03821ad2a2c8b3386f795a79e422c6b3ba7c60f1 (diff) | |
| parent | 29fdad396d62398f9544ebcfe5ac19cdaad5b120 (diff) | |
| download | forums-948bfcbe770bd8cb6f95a7a7c5cabb3ddfe27597.tar forums-948bfcbe770bd8cb6f95a7a7c5cabb3ddfe27597.tar.gz forums-948bfcbe770bd8cb6f95a7a7c5cabb3ddfe27597.tar.bz2 forums-948bfcbe770bd8cb6f95a7a7c5cabb3ddfe27597.tar.xz forums-948bfcbe770bd8cb6f95a7a7c5cabb3ddfe27597.zip | |
Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
[ticket/10865] Use code tags for install/database_update.php.
[ticket/10865] Should have been a slash.
[ticket/10780] Use L_COLON on LDAP page.
[ticket/10780] Use L_COLON on search backend ACP pages.
[ticket/10780] Use L_COLON for "download all attachments".
[ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
[ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
[ticket/10780] Replace colon usage in adm template output with {L_COLON}
[ticket/10780] Replace colon usage in template output with {L_COLON}
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
[ticket/10172] Show prosilver birthday list even if there are no birthdays.
[ticket/11050] make all properties protected in all search backends
[ticket/11050] get_common_words() returns empty array for sphinx
[ticket/11050] fix tidied search query docblock language
[ticket/11050] fix min/max length docblock language
[ticket/11050] multi sentences separated by period in docblocks
[ticket/11050] fix separated spelling in docblock
[ticket/11050] fix split words doc block language
[ticket/11050] remove class word from docblocks
...
Conflicts:
phpBB/install/database_update.php
phpBB/install/schemas/mssql_schema.sql
phpBB/language/en/acp/permissions_phpbb.php
phpBB/styles/prosilver/template/posting_editor.html
Diffstat (limited to 'tests/functions/clean_path_test.php')
| -rw-r--r-- | tests/functions/clean_path_test.php | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/tests/functions/clean_path_test.php b/tests/functions/clean_path_test.php new file mode 100644 index 0000000000..bcbe9838d9 --- /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 = phpbb_clean_path($input); + + $this->assertEquals($expected, $output); + } +} |