mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
[ticket/13697] Moving filesystem related functions to filesystem service
* Moving filesystem service to \phpbb\filesystem namespace * Wraping Symfony's Filesystem component * Moving filesystem related functions from includes/functions.php into \phpbb\filesystem\filesystem Functions moved (and deprecated): - phpbb_chmod - phpbb_is_writable - phpbb_is_absolute - phpbb_own_realpath - phpbb_realpath * Adding interface for filesystem service PHPBB3-13697
This commit is contained in:
@@ -23,6 +23,7 @@ class phpbb_filespec_test extends phpbb_test_case
|
||||
const UPLOAD_MAX_FILESIZE = 1000;
|
||||
|
||||
private $config;
|
||||
private $filesystem;
|
||||
public $path;
|
||||
|
||||
protected function setUp()
|
||||
@@ -30,7 +31,7 @@ class phpbb_filespec_test extends phpbb_test_case
|
||||
// Global $config required by unique_id
|
||||
// Global $user required by filespec::additional_checks and
|
||||
// filespec::move_file
|
||||
global $config, $user;
|
||||
global $config, $user, $phpbb_filesystem;
|
||||
|
||||
if (!is_array($config))
|
||||
{
|
||||
@@ -75,6 +76,8 @@ class phpbb_filespec_test extends phpbb_test_case
|
||||
$guessers[2]->set_priority(-2);
|
||||
$guessers[3]->set_priority(-2);
|
||||
$this->mimetype_guesser = new \phpbb\mimetype\guesser($guessers);
|
||||
|
||||
$this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem();
|
||||
}
|
||||
|
||||
private function get_filespec($override = array())
|
||||
@@ -88,7 +91,7 @@ class phpbb_filespec_test extends phpbb_test_case
|
||||
'error' => '',
|
||||
);
|
||||
|
||||
return new filespec(array_merge($upload_ary, $override), null, $this->mimetype_guesser);
|
||||
return new filespec(array_merge($upload_ary, $override), null, $this->filesystem, $this->mimetype_guesser);
|
||||
}
|
||||
|
||||
protected function tearDown()
|
||||
@@ -198,7 +201,7 @@ class phpbb_filespec_test extends phpbb_test_case
|
||||
$filespec = $this->get_filespec();
|
||||
$filespec->clean_filename('unique', self::PREFIX);
|
||||
$name = $filespec->realname;
|
||||
|
||||
|
||||
$this->assertEquals(strlen($name), 32 + strlen(self::PREFIX));
|
||||
$this->assertRegExp('#^[A-Za-z0-9]+$#', substr($name, strlen(self::PREFIX)));
|
||||
$this->assertFalse(isset($filenames[$name]));
|
||||
|
Reference in New Issue
Block a user