mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/10321] Do not append the ? if the param-list is empty anyway.

Browse Source 
PHPBB3-10321
This commit is contained in:
Joas Schilling
2011-08-21 13:14:15 +02:00
parent 1680b3a2a7
commit dc149a43e4
2 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
tests/session/append_sid_test.php Normal file
View File

@@ -0,0 +1,51 @@
<?php
/**
*
* @package testing
* @copyright (c) 2011 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
class phpbb_session_append_sid_test extends phpbb_test_case
{
public function append_sid_data()
{
return array(
array('viewtopic.php?t=1&amp;f=2', false, true, false, 'viewtopic.php?t=1&amp;f=2'),
array('viewtopic.php', 't=1&amp;f=2', true, false, 'viewtopic.php?t=1&amp;f=2'),
array('viewtopic.php', 't=1&f=2', false, false, 'viewtopic.php?t=1&f=2'),
array('viewtopic.php', array('t' => 1, 'f' => 2), true, false, 'viewtopic.php?t=1&amp;f=2'),
// Custom sid parameter
array('viewtopic.php', 't=1&amp;f=2', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid'),
// Testing anchors
array('viewtopic.php?t=1&amp;f=2#anchor', false, true, false, 'viewtopic.php?t=1&amp;f=2#anchor'),
array('viewtopic.php', 't=1&amp;f=2#anchor', true, false, 'viewtopic.php?t=1&amp;f=2#anchor'),
array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'viewtopic.php?t=1&amp;f=2#anchor'),
// Anchors and custom sid
array('viewtopic.php?t=1&amp;f=2#anchor', false, true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor'),
array('viewtopic.php', 't=1&amp;f=2#anchor', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor'),
array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor'),
// Empty parameters should not append the ?
array('viewtopic.php', false, true, false, 'viewtopic.php'),
array('viewtopic.php', '', true, false, 'viewtopic.php'),
array('viewtopic.php', array(), true, false, 'viewtopic.php'),
);
}
/**
* @dataProvider append_sid_data
*/
public function test_append_sid($url, $params, $is_amp, $session_id, $expected)
{
$this->assertEquals($expected, append_sid($url, $params, $is_amp, $session_id));
}
}