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

API: Work around PHP bug 45959

Browse source 
Sigh, PHP. You allow for an array to have string "1" as a key (e.g. when
casting from object to array), but then you do everything wrong when
trying to deal with it.

Bug: T123663
Change-Id: I49f09901a69aab39ca1519bbe9e41267bf9a1216
This commit is contained in:
Brad Jorsch 2016-01-14 16:11:44 -05:00
parent 10917c0872
commit 8deb49f534
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/api/ApiResult.php
View file

@ -364,9 +364,13 @@ class ApiResult implements ApiSerializable {
}
}
if ( is_array( $value ) ) {
// Work around PHP bug 45959 by copying to a temporary
// (in this case, foreach gets $k === "1" but $tmp[$k] assigns as if $k === 1)
$tmp = array();
foreach ( $value as $k => $v ) {
$value[$k] = self::validateValue( $v );
$tmp[$k] = self::validateValue( $v );
}
$value = $tmp;
} elseif ( is_float( $value ) && !is_finite( $value ) ) {
throw new InvalidArgumentException( "Cannot add non-finite floats to ApiResult" );
} elseif ( is_string( $value ) ) {

24
tests/phpunit/includes/api/ApiResultTest.php
View file

@ -218,6 +218,17 @@ class ApiResultTest extends MediaWikiTestCase {
0 => "foo\xef\xbf\xbdbar",
1 => "\xc3\xa1",
), $arr );
$obj = new stdClass;
$obj->{'1'} = 'one';
$arr = array();
ApiResult::setValue( $arr, 'foo', $obj );
$this->assertSame( array(
'foo' => array(
1 => 'one',
ApiResult::META_TYPE => 'assoc',
)
), $arr );
}
/**
@ -509,6 +520,19 @@ class ApiResultTest extends MediaWikiTestCase {
1 => "\xc3\xa1",
ApiResult::META_TYPE => 'assoc',
), $result->getResultData() );
$result = new ApiResult( 8388608 );
$obj = new stdClass;
$obj->{'1'} = 'one';
$arr = array();
$result->addValue( $arr, 'foo', $obj );
$this->assertSame( array(
'foo' => array(
1 => 'one',
ApiResult::META_TYPE => 'assoc',
),
ApiResult::META_TYPE => 'assoc',
), $result->getResultData() );
}
/**