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

[ticket/14285] Fix tests

Browse source 
PHPBB3-14285
This commit is contained in:
rubencm 2021-03-21 20:02:45 +01:00
parent 925502a92f
commit f66c1d9e1e
5 changed files with 21 additions and 261 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/includes/functions_compatibility.php
View file

@ -901,7 +901,8 @@ function parse_cfg_file($filename, $lines = false)
foreach ($lines as $line) {
$line = trim($line);
if (!$line || $line[0] == '#' || ($delim_pos = strpos($line, '=')) === false) {
if (!$line || $line[0] == '#' || ($delim_pos = strpos($line, '=')) === false)
{
continue;
}
@ -909,15 +910,24 @@ function parse_cfg_file($filename, $lines = false)
$key = htmlspecialchars(strtolower(trim(substr($line, 0, $delim_pos))), ENT_COMPAT);
$value = trim(substr($line, $delim_pos + 1));
if (in_array($value, array('off', 'false', '0'))) {
if (in_array($value, array('off', 'false', '0')))
{
$value = false;
} else if (in_array($value, array('on', 'true', '1'))) {
}
else if (in_array($value, array('on', 'true', '1')))
{
$value = true;
} else if (!trim($value)) {
}
else if (!trim($value))
{
$value = '';
} else if (($value[0] == "'" && $value[strlen($value) - 1] == "'") || ($value[0] == '"' && $value[strlen($value) - 1] == '"')) {
}
else if (($value[0] == "'" && $value[strlen($value) - 1] == "'") || ($value[0] == '"' && $value[strlen($value) - 1] == '"'))
{
$value = htmlspecialchars(substr($value, 1, strlen($value) - 2), ENT_COMPAT);
} else {
}
else
{
$value = htmlspecialchars($value, ENT_COMPAT);
}

6
phpBB/phpbb/storage/controller/attachment.php
View file

@ -45,7 +45,7 @@ class attachment extends controller
/** @var dispatcher_interface */
protected $dispatcher;
/** @var \phpbb\language\language */
/** @var language */
protected $language;
/** @var request */
@ -122,8 +122,8 @@ class attachment extends controller
$attachment['physical_filename'] = utf8_basename($attachment['physical_filename']);
if (!$attachment['in_message'] && !$this->config['allow_attachments'] ||
$attachment['in_message'] && !$this->config['allow_pm_attach'])
if ((!$attachment['in_message'] && !$this->config['allow_attachments']) ||
($attachment['in_message'] && !$this->config['allow_pm_attach']))
{
throw new http_exception(404, 'ATTACHMENT_FUNCTIONALITY_DISABLED');
}

4
phpBB/phpbb/storage/controller/controller.php
View file

@ -62,9 +62,9 @@ class controller
*
* @param string $file File path
*
* @throws \phpbb\exception\http_exception when can't access $file
* @throws http_exception when can't access $file
*
* @return \Symfony\Component\HttpFoundation\StreamedResponse a Symfony response object
* @return StreamedResponse a Symfony response object
*/
public function handle($file)
{

116
tests/download/http_byte_range_test.php
View file

@ -1,116 +0,0 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
require_once __DIR__ . '/../../phpBB/includes/functions_download.php';
class phpbb_download_http_byte_range_test extends phpbb_test_case
{
public function test_find_range_request()
{
// Missing 'bytes=' prefix
$GLOBALS['request'] = new phpbb_mock_request();
$GLOBALS['request']->set_header('Range', 'bztes=');
$this->assertEquals(false, phpbb_find_range_request());
unset($GLOBALS['request']);
$GLOBALS['request'] = new phpbb_mock_request();
$_ENV['HTTP_RANGE'] = 'bztes=';
$this->assertEquals(false, phpbb_find_range_request());
unset($_ENV['HTTP_RANGE']);
$GLOBALS['request'] = new phpbb_mock_request();
$GLOBALS['request']->set_header('Range', 'bytes=0-0,123-125');
$this->assertEquals(array('0-0', '123-125'), phpbb_find_range_request());
unset($GLOBALS['request']);
}
/**
* @dataProvider parse_range_request_data()
*/
public function test_parse_range_request($request_array, $filesize, $expected)
{
$this->assertEquals($expected, phpbb_parse_range_request($request_array, $filesize));
}
public function parse_range_request_data()
{
return array(
// Valid request
array(
array('3-4'),
10,
array(
'byte_pos_start' => 3,
'byte_pos_end' => 4,
'bytes_requested' => 2,
'bytes_total' => 10,
),
),
// Get the beginning
array(
array('-5'),
10,
array(
'byte_pos_start' => 0,
'byte_pos_end' => 5,
'bytes_requested' => 6,
'bytes_total' => 10,
),
),
// Get the end
array(
array('5-'),
10,
array(
'byte_pos_start' => 5,
'byte_pos_end' => 9,
'bytes_requested' => 5,
'bytes_total' => 10,
),
),
// Overlong request
array(
array('3-20'),
10,
array(
'byte_pos_start' => 3,
'byte_pos_end' => 9,
'bytes_requested' => 7,
'bytes_total' => 10,
),
),
// Multiple, contiguous range
array(
array('10-20', '21-30'),
125,
array(
'byte_pos_start' => 10,
'byte_pos_end' => 30,
'bytes_requested' => 21,
'bytes_total' => 125,
)
),
// We don't do multiple, non-contiguous range
array(
array('0-0', '120-125'),
125,
false,
),
);
}
}

134
tests/download/http_user_agent_test.php
View file

@ -1,134 +0,0 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
require_once __DIR__ . '/../../phpBB/includes/functions_download.php';
class phpbb_download_http_user_agent_test extends phpbb_test_case
{
public function user_agents_check_greater_ie_version()
{
return array(
// user agent
// IE version
// expected
array(
'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)',
7,
true,
),
array(
'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)',
7,
true,
),
array(
'Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; GTB7.4; InfoPath.2; SV1; .NET CLR 3.3.69573; WOW64; en-US)',
7,
true,
),
array(
'Mozilla/5.0 (Windows; U; MSIE 7.0; Windows NT 6.0; en-US)',
7,
false,
),
array(
'Mozilla/4.0 (compatible; MSIE 6.1; Windows XP; .NET CLR 1.1.4322; .NET CLR 2.0.50727)',
7,
false,
),
array(
'Mozilla/4.0 (compatible; MSIE 6.01; Windows NT 6.0)',
7,
false,
),
array(
'Mozilla/5.0 (Windows; U; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 2.0.50727)',
7,
false,
),
array(
'Mozilla/5.0 (Windows NT 6.2; Win64; x64;) Gecko/20100101 Firefox/20.0',
7,
false,
),
array(
'Mozilla/5.0 (Windows NT 6.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1464.0 Safari/537.36',
7,
false,
),
array(
'Googlebot-Image/1.0',
7,
false,
),
array(
'Googlebot/2.1 ( http://www.google.com/bot.html)',
7,
false,
),
array(
'Lynx/2.8.3dev.9 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/0.9.6',
7,
false,
),
array(
'Links (0.9x; Linux 2.4.7-10 i686)',
7,
false,
),
array(
'Opera/9.60 (Windows NT 5.1; U; de) Presto/2.1.1',
7,
false,
),
array(
'Mozilla/4.0 (compatible; MSIE 5.0; Windows NT;)',
7,
false,
),
array(
'Mozilla/4.0 (compatible; MSIE 5.0; Windows NT 4.0) Opera 6.01 [en]',
7,
false,
),
array(
'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 9.24',
7,
false,
),
array(
'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)',
8,
true,
),
array(
'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)',
9,
true,
),
array(
'Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; GTB7.4; InfoPath.2; SV1; .NET CLR 3.3.69573; WOW64; en-US)',
10,
false,
),
);
}
/**
* @dataProvider user_agents_check_greater_ie_version
*/
public function test_is_greater_ie_version($user_agent, $version, $expected)
{
$this->assertEquals($expected, phpbb_is_greater_ie_version($user_agent, $version));
}
}