aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional/fileupload_remote_test.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-02-04 17:10:59 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-02-04 17:14:48 +0100
commitfd9c05309d186332728b533467aaecad5c543c52 (patch)
treedc5738e6d3ab1ee32ffa6c3145429fc88eb2c979 /tests/functional/fileupload_remote_test.php
parent9a5b2d5e66c2b9bea16f22589b0a2507f766fd9d (diff)
downloadforums-fd9c05309d186332728b533467aaecad5c543c52.tar
forums-fd9c05309d186332728b533467aaecad5c543c52.tar.gz
forums-fd9c05309d186332728b533467aaecad5c543c52.tar.bz2
forums-fd9c05309d186332728b533467aaecad5c543c52.tar.xz
forums-fd9c05309d186332728b533467aaecad5c543c52.zip
[ticket/14448] Let user decide if remote upload certs should be checked
Also fixed some minor issues like coding style. PHPBB3-14448
Diffstat (limited to 'tests/functional/fileupload_remote_test.php')
-rw-r--r--tests/functional/fileupload_remote_test.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php
index 7e0f192b40..b70d49cddd 100644
--- a/tests/functional/fileupload_remote_test.php
+++ b/tests/functional/fileupload_remote_test.php
@@ -45,11 +45,12 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
if (!is_array($config))
{
- $config = array();
+ $config = new \phpbb\config\config(array());
}
$config['rand_seed'] = '';
$config['rand_seed_last_update'] = time() + 600;
+ $config['remote_upload_verify'] = 0;
$this->filesystem = new \phpbb\filesystem\filesystem();
$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
@@ -60,7 +61,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
$container->set('files.filespec', new \phpbb\files\filespec($this->filesystem, $this->language, $this->php_ini, new \FastImageSize\FastImageSize(), $this->phpbb_root_path));
$this->factory = new \phpbb\files\factory($container);
$container->set('files.factory', $this->factory);
- $container->set('files.types.remote', new \phpbb\files\types\remote($this->factory, $this->language, $this->php_ini, $this->request, $phpbb_root_path));
+ $container->set('files.types.remote', new \phpbb\files\types\remote($config, $this->factory, $this->language, $this->php_ini, $this->request, $phpbb_root_path));
$this->phpbb_root_path = $phpbb_root_path;
}