Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make wfUrlEncode(null) reset the static. Two skipped tests work now.

Browse source
This commit is contained in:
Platonides 2011-07-23 20:14:12 +00:00
parent ea1176e336
commit 53b0052df1
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/GlobalFunctions.php
View file

@ -294,6 +294,11 @@ function wfRandom() {
*/
function wfUrlencode( $s ) {
static $needle;
if ( is_null( $s ) ) {
$needle = null;
return;
}
if ( is_null( $needle ) ) {
$needle = array( '%3B', '%40', '%24', '%21', '%2A', '%28', '%29', '%2C', '%2F' );
if ( !isset( $_SERVER['SERVER_SOFTWARE'] ) || ( strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7' ) === false ) ) {

10
tests/phpunit/includes/GlobalFunctions/wfUrlencodeTest.php
View file

@ -35,6 +35,7 @@ class wfUrlencodeTest extends MediaWikiTestCase {
: null
;
$_SERVER['SERVER_SOFTWARE'] = $server;
wfUrlencode( null );
// do the requested test
$this->assertEquals(
@ -49,6 +50,7 @@ class wfUrlencodeTest extends MediaWikiTestCase {
} else {
$_SERVER['SERVER_SOFTWARE'] = $old;
}
wfUrlencode( null );
}
/**
@ -59,14 +61,6 @@ class wfUrlencodeTest extends MediaWikiTestCase {
if( is_string( $expectations ) ) {
return $expectations;
} elseif( is_array( $expectations ) ) {
/**
* FIXME FIXME FIXME FIXME
* wfUrlencode use a static variable so we can not just
* change the $GLOBALS server name :(
*/
$this->markTestSkipped( 'FIXME: wfUrlencode() use a static, thus changing $GLOBALS[SERVER_SOFTWARE] is useless' );
if( !array_key_exists( $server, $expectations ) ) {
throw new MWException( __METHOD__ . " expectation does not have any value for server name $server. Check the provider array.\n" );
} else {