makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13904] Set properties to protected where possible in filespec

Browse source 
PHPBB3-13904
This commit is contained in:
Marc Alexander 2015-09-13 09:30:56 +02:00
parent 40e614f564
commit 759dc9bb84
4 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/phpbb/files/filespec.php
View file

@ -34,10 +34,10 @@ class filespec
protected $mimetype = '';
/** @var string File extension */
public $extension = '';
protected $extension = '';
/** @var int File size */
public $filesize = 0;
protected $filesize = 0;
/** @var int Width of file */
protected $width = 0;
@ -55,10 +55,10 @@ class filespec
protected $destination_path = '';
/** @var bool Whether file was moved */
public $file_moved = false;
protected $file_moved = false;
/** @var bool Whether file is local */
public $local = false;
protected $local = false;
/** @var bool Class initialization flag */
protected $class_initialized = false;

4
tests/files/types_local_test.php
View file

@ -144,7 +144,9 @@ class phpbb_files_types_local_test extends phpbb_test_case
new \phpbb\mimetype\guesser(array(
'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
)));
$filespec->local = true;
$filespec_local = new ReflectionProperty($filespec, 'local');
$filespec_local->setAccessible(true);
$filespec_local->setValue($filespec, true);
$this->container->set('files.filespec', $filespec);
$this->factory = new \phpbb\files\factory($this->container);

31
tests/upload/filespec_test.php
View file

@ -82,6 +82,13 @@ class phpbb_filespec_test extends phpbb_test_case
$this->phpbb_root_path = $phpbb_root_path;
}
private function set_reflection_property(&$class, $property_name, $value)
{
$property = new ReflectionProperty($class, $property_name);
$property->setAccessible(true);
$property->setValue($class, $value);
}
private function get_filespec($override = array())
{
// Initialise a blank filespec object for use with trivial methods
@ -141,8 +148,8 @@ class phpbb_filespec_test extends phpbb_test_case
$upload = new phpbb_mock_fileupload();
$filespec = $this->get_filespec();
$filespec->set_upload_namespace($upload);
$filespec->file_moved = true;
$filespec->filesize = $filespec->get_filesize($this->path . $filename);
$this->set_reflection_property($filespec, 'file_moved', true);
$this->set_reflection_property($filespec, 'filesize', $filespec->get_filesize($this->path . $filename));
$this->assertEquals($expected, $filespec->additional_checks());
}
@ -153,7 +160,7 @@ class phpbb_filespec_test extends phpbb_test_case
$filespec = $this->get_filespec();
$filespec->set_upload_namespace($upload);
$upload->valid_dimensions = false;
$filespec->file_moved = true;
$this->set_reflection_property($filespec, 'file_moved', true);
$upload->max_filesize = 0;
$this->assertEquals(false, $filespec->additional_checks());
@ -381,12 +388,12 @@ class phpbb_filespec_test extends phpbb_test_case
'name' => $realname,
'type' => $mime_type,
));
$filespec->extension = $extension;
$this->set_reflection_property($filespec, 'extension', $extension);
$filespec->set_upload_namespace($upload);
$filespec->local = true;
$this->set_reflection_property($filespec, 'local', true);
$this->assertEquals($expected, $filespec->move_file($this->path . 'copies'));
$this->assertEquals($filespec->file_moved, file_exists($this->path . 'copies/' . $realname));
$this->assertEquals($filespec->get('file_moved'), file_exists($this->path . 'copies/' . $realname));
if ($error)
{
$this->assertEquals($error, $filespec->error[0]);
@ -437,12 +444,12 @@ class phpbb_filespec_test extends phpbb_test_case
$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $php_ini, new \FastImageSize\FastImagesize, '', $this->mimetype_guesser);
$filespec->set_upload_ary($upload_ary);
$filespec->local = false;
$filespec->extension = 'gif';
$this->set_reflection_property($filespec, 'local', false);
$this->set_reflection_property($filespec, 'extension', 'gif');
$filespec->set_upload_namespace($upload);
$this->assertEquals($move_success, $filespec->move_file($this->path . 'copies'));
$this->assertEquals($filespec->file_moved, file_exists($this->path . 'copies/gif_moved'));
$this->assertEquals($filespec->get('file_moved'), file_exists($this->path . 'copies/gif_moved'));
$this->assertSame($expected_error, $filespec->error);
}
@ -505,12 +512,12 @@ class phpbb_filespec_test extends phpbb_test_case
$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, $imagesize, '', $this->mimetype_guesser);
$filespec->set_upload_ary($upload_ary);
$filespec->local = false;
$filespec->extension = 'gif';
$this->set_reflection_property($filespec, 'local', false);
$this->set_reflection_property($filespec, 'extension', 'gif');
$filespec->set_upload_namespace($upload);
$this->assertEquals(true, $filespec->move_file($this->path . 'copies'));
$this->assertEquals($filespec->file_moved, file_exists($this->path . 'copies/gif_moved'));
$this->assertEquals($filespec->get('file_moved'), file_exists($this->path . 'copies/gif_moved'));
$this->assertSame($expected_error, $filespec->error);
}

2
tests/upload/fileupload_test.php
View file

@ -202,7 +202,7 @@ class phpbb_fileupload_test extends phpbb_test_case
$file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg');
$this->assertEquals(0, sizeof($file->error));
$this->assertFalse($file->move_file('../tests/upload/fixture'));
$this->assertFalse($file->file_moved);
$this->assertFalse($file->get('file_moved'));
$this->assertEquals(1, sizeof($file->error));
}