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

Fix invocation of MWHttpRequest::factory with one argument.

Browse source 
Change-Id: Ib96c2888a6fd91ca80c162a80d283f650d6fa4b9
This commit is contained in:
Stanislav Malyshev 2018-01-31 23:05:20 -08:00
parent dc1e092e69
commit 3de744597e
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/http/MWHttpRequest.php
View file

@ -181,7 +181,7 @@ abstract class MWHttpRequest implements LoggerAwareInterface {
* @return MWHttpRequest
* @see MWHttpRequest::__construct
*/
public static function factory( $url, $options = null, $caller = __METHOD__ ) {
public static function factory( $url, array $options = [], $caller = __METHOD__ ) {
return \MediaWiki\MediaWikiServices::getInstance()
->getHttpRequestFactory()
->create( $url, $options, $caller );

6
tests/integration/includes/http/MWHttpRequestTestCase.php
View file

@ -195,6 +195,11 @@ abstract class MWHttpRequestTestCase extends PHPUnit_Framework_TestCase {
$this->assertSame( 401, $request->getStatus() );
}
public function testFactoryDefaults() {
$request = MWHttpRequest::factory( 'http://acme.test' );
$this->assertInstanceOf( MWHttpRequest::class, $request );
}
// --------------------
/**
@ -242,4 +247,5 @@ abstract class MWHttpRequestTestCase extends PHPUnit_Framework_TestCase {
$this->assertArrayNotHasKey( strtolower( $name ),
array_change_key_case( $cookieJar->cookie, CASE_LOWER ) );
}
}