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

RestbaseVirtualRESTService: Support production URL layout

Browse source 
Bug: T138088
Change-Id: Iba5a900e8ffd444b174ffdf93f8f5f007108a35b
This commit is contained in:
Niklas Laxström 2016-07-20 15:00:10 +02:00
parent 53830e84ed
commit b58bc25a99
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
includes/libs/virtualrest/RestbaseVirtualRESTService.php
View file

@ -44,6 +44,9 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
* - HTTPProxy : HTTP proxy to use (optional)
* - parsoidCompat : whether to parse URL as if they were meant for Parsoid
* boolean (optional)
* - fixedUrl : Do not append domain to the url. For example to use
* English Wikipedia restbase, you would this to true
* and url to https://en.wikipedia.org/api/rest_#version#
*/
public function __construct( array $params ) {
// set up defaults and merge them with the given params
@ -54,7 +57,8 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
'timeout' => 100,
'forwardCookies' => false,
'HTTPProxy' => null,
'parsoidCompat' => false
'parsoidCompat' => false,
'fixedUrl' => false,
], $params );
// Ensure that the url parameter has a trailing slash.
$mparams['url'] = preg_replace(
@ -81,10 +85,18 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
$result = [];
foreach ( $reqs as $key => $req ) {
// replace /local/ with the current domain
$req['url'] = preg_replace( '#^local/#', $this->params['domain'] . '/', $req['url'] );
// and prefix it with the service URL
$req['url'] = $this->params['url'] . $req['url'];
if ( $this->params['fixedUrl'] ) {
$version = explode( '/', $req['url'] )[1];
$req['url'] =
str_replace( '#version#', $version, $this->params['url'] ) .
preg_replace( '#^local/v./#', '', $req['url'] );
} else {
// replace /local/ with the current domain
$req['url'] = preg_replace( '#^local/#', $this->params['domain'] . '/', $req['url'] );
// and prefix it with the service URL
$req['url'] = $this->params['url'] . $req['url'];
}
// set the appropriate proxy, timeout and headers
if ( $this->params['HTTPProxy'] ) {
$req['proxy'] = $this->params['HTTPProxy'];
@ -99,7 +111,6 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
}
return $result;
}
/**