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

[ticket/10941] Minor adjustments as per PR comments

Browse source 
Switched from dirname(__FILE__) to just __DIR__.
Removed static definition from data provider methods.

PHPBB3-10941
This commit is contained in:
Fyorl 2012-06-21 12:22:08 +01:00
parent 33a13002af
commit d6bd8928b5
6 changed files with 36 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
tests/uploads/filespec_test.php
View file

@ -2,15 +2,15 @@
/** /**
* *
* @package testing * @package testing
* @copyright (c) 20012 phpBB Group * @copyright (c) 2012 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
* *
*/ */
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; require_once __DIR__ . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_upload.php'; require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
require_once dirname(__FILE__) . '/../mock/fileupload.php'; require_once __DIR__ . '/../mock/fileupload.php';
class phpbb_filespec_test extends phpbb_test_case class phpbb_filespec_test extends phpbb_test_case
{ {
@ -18,16 +18,9 @@ class phpbb_filespec_test extends phpbb_test_case
const PREFIX = 'phpbb_'; const PREFIX = 'phpbb_';
const MAX_STR_LEN = 50; const MAX_STR_LEN = 50;
// Hexadecimal encoded images
public static $files = array(
'GIF' => '47494638376101000100800000ffffffffffff2c00000000010001000002024401003b',
'PNG' => '89504e470d0a1a0a0000000d4948445200000001000000010802000000907753de0000000c4944415408d763f8ffff3f0005fe02fedccc59e70000000049454e44ae426082',
'TIF' => '49492a000c000000ffffff001000fe00040001000000000000000001030001000000010000000101030001000000010000000201030003000000d20000000301030001000000010000000601030001000000020000000d01020018000000d80000001101040001000000080000001201030001000000010000001501030001000000030000001601030001000000400000001701040001000000030000001a01050001000000f00000001b01050001000000f80000001c0103000100000001000000280103000100000002000000000000000800080008002f686f6d652f6b696d2f746d702f746966662e746966660000000048000000010000004800000001',
'JPG' => 'ffd8ffe000104a46494600010101004800480000ffdb004300ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdb004301ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc20011080001000103012200021101031101ffc4001500010100000000000000000000000000000002ffc40014010100000000000000000000000000000000ffda000c03010002100310000001a07fffc40014100100000000000000000000000000000000ffda00080101000105027fffc40014110100000000000000000000000000000000ffda0008010301013f017fffc40014110100000000000000000000000000000000ffda0008010201013f017fffc40014100100000000000000000000000000000000ffda0008010100063f027fffc40014100100000000000000000000000000000000ffda0008010100013f217fffda000c0301000200030000001003ffc40014110100000000000000000000000000000000ffda0008010301013f107fffc40014110100000000000000000000000000000000ffda0008010201013f107fffc40014100100000000000000000000000000000000ffda0008010100013f107fffd9',
);
private $config; private $config;
private $filespec; private $filespec;
public $path;
protected function setUp() protected function setUp()
{ {
@ -41,46 +34,35 @@ class phpbb_filespec_test extends phpbb_test_case
$config['rand_seed'] = ''; $config['rand_seed'] = '';
$config['rand_seed_last_update'] = time() + 600; $config['rand_seed_last_update'] = time() + 600;
$config['mime_triggers'] = 'body|head|html|img|plaintext|a href|pre|script|table|title'; $config['mime_triggers'] = 'body|head|html|img|plaintext|a href|pre|script|table|title';
$this->config = $config; $this->config = $config;
$this->path = __DIR__ . '/fixture/';
// Write some data to files
$path = dirname(__FILE__) . '/../../phpBB/files/';
foreach (phpbb_filespec_test::$files as $type => $data)
{
file_put_contents($path . $type, hex2bin($data));
}
file_put_contents($path . 'TXT', '<HTML>mime trigger</HTML>');
$this->init_filespec(); $this->init_filespec();
} }
public static function additional_checks_variables() public function additional_checks_variables()
{ {
$path = dirname(__FILE__) . '/../../phpBB/files/';
return array( return array(
array($path . 'GIF', true), array('GIF', true),
array($path . 'JPG', false), array('JPG', false),
array($path . 'PNG', true), array('PNG', true),
array($path . 'TIF', false), array('TIF', false),
array($path . 'TXT', true), array('TXT', true),
); );
} }
public static function check_content_variables() public function check_content_variables()
{ {
$path = dirname(__FILE__) . '/../../phpBB/files/'; return array(
$vars = array(); array('GIF', true),
foreach (phpbb_filespec_test::$files as $type => $data) array('JPG', true),
{ array('PNG', true),
$vars[] = array($path . $type, true); array('TIF', true),
array('TXT', false),
);
} }
$vars[] = array($path . 'TXT', false); public function get_extension_variables()
return $vars;
}
public static function get_extension_variables()
{ {
return array( return array(
array('file.png', 'png'), array('file.png', 'png'),
@ -104,27 +86,15 @@ class phpbb_filespec_test extends phpbb_test_case
$this->filespec = new filespec(array_merge($upload_ary, $override), null); $this->filespec = new filespec(array_merge($upload_ary, $override), null);
} }
public static function is_image_variables() public function is_image_variables()
{ {
$path = dirname(__FILE__) . '/../../phpBB/files/'; return array(
$vars = array(); array('GIF', 'image/gif', true),
foreach (phpbb_filespec_test::$files as $type => $data) array('JPG', 'image/jpg', true),
{ array('PNG', 'image/png', true),
$vars[] = array($path . $type, 'image/' . $type, true); array('TIF', 'image/tif', true),
} array('TXT', 'text/plain', false),
);
$vars[] = array($path . 'TXT', 'text/plain', false);
return $vars;
}
protected function tearDown()
{
$path = dirname(__FILE__) . '/../../phpBB/files/';
unlink($path . 'TXT');
foreach (phpbb_filespec_test::$files as $type => $data)
{
unlink($path . $type);
}
} }
/** /**
@ -136,10 +106,10 @@ class phpbb_filespec_test extends phpbb_test_case
$user = new phpbb_mock_user(); $user = new phpbb_mock_user();
$upload = new phpbb_mock_fileupload(); $upload = new phpbb_mock_fileupload();
$this->init_filespec(array('tmp_name', $filename)); $this->init_filespec(array('tmp_name', $this->path . $filename));
$this->filespec->upload = $upload; $this->filespec->upload = $upload;
$this->filespec->file_moved = true; $this->filespec->file_moved = true;
$this->filespec->filesize = $this->filespec->get_filesize($filename); $this->filespec->filesize = $this->filespec->get_filesize($this->path . $filename);
$this->assertEquals($expected, $this->filespec->additional_checks()); $this->assertEquals($expected, $this->filespec->additional_checks());
} }
@ -150,7 +120,7 @@ class phpbb_filespec_test extends phpbb_test_case
public function test_check_content($filename, $expected) public function test_check_content($filename, $expected)
{ {
$disallowed_content = explode('|', $this->config['mime_triggers']); $disallowed_content = explode('|', $this->config['mime_triggers']);
$this->init_filespec(array('tmp_name' => $filename)); $this->init_filespec(array('tmp_name' => $this->path . $filename));
$this->assertEquals($expected, $this->filespec->check_content($disallowed_content)); $this->assertEquals($expected, $this->filespec->check_content($disallowed_content));
} }
@ -209,7 +179,7 @@ class phpbb_filespec_test extends phpbb_test_case
*/ */
public function test_is_image($filename, $mimetype, $expected) public function test_is_image($filename, $mimetype, $expected)
{ {
$this->init_filespec(array('tmp_name' => $filename, 'type' => $mimetype)); $this->init_filespec(array('tmp_name' => $this->path . $filename, 'type' => $mimetype));
$this->assertEquals($expected, $this->filespec->is_image()); $this->assertEquals($expected, $this->filespec->is_image());
} }
} }

BIN
tests/uploads/fixture/GIF Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 35 B

BIN
tests/uploads/fixture/JPG Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 519 B

BIN
tests/uploads/fixture/PNG Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

BIN
tests/uploads/fixture/TIF Normal file
View file

Binary file not shown.

1
tests/uploads/fixture/TXT Normal file
View file

@ -0,0 +1 @@
<HTML>mime trigger</HTML>