aboutsummaryrefslogtreecommitdiffstats
path: root/tests/filesystem/clean_path_test.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-10-03 10:04:59 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-10-03 10:04:59 +0200
commit7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c (patch)
treeaceb567afda7467738ab6b693dc9595a40ac7f2f /tests/filesystem/clean_path_test.php
parent93531e7fb0df7d9cd2de04ca06aa9eb6a847a1c4 (diff)
parent49ce2c13b26e358b4ccef440094a8fa4b6b9afd7 (diff)
downloadforums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar
forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.gz
forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.bz2
forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.xz
forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts: phpBB/includes/functions.php
Diffstat (limited to 'tests/filesystem/clean_path_test.php')
-rw-r--r--tests/filesystem/clean_path_test.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/filesystem/clean_path_test.php b/tests/filesystem/clean_path_test.php
index 5b9857ef2c..fedadc103b 100644
--- a/tests/filesystem/clean_path_test.php
+++ b/tests/filesystem/clean_path_test.php
@@ -14,13 +14,7 @@ class phpbb_filesystem_clean_path_test extends phpbb_test_case
public function setUp()
{
parent::setUp();
- $this->filesystem = new \phpbb\filesystem(
- new \phpbb\symfony_request(
- new phpbb_mock_request()
- ),
- dirname(__FILE__) . './../../phpBB/',
- 'php'
- );
+ $this->filesystem = new \phpbb\filesystem();
}
public function clean_path_data()