99392f3b16
Make Command extend Shellbox's UnboxedCommand. Only a few MediaWiki- specific features remain in the subclass. Also add BoxedCommand abstraction and Shellbox client. The Result alias didn't actually work, I just had to change the return type hint. Bug: T260330 Change-Id: Iff7428e4c5fe3959a5cda8e113f223caa0976fc1
37 lines
963 B
PHP
37 lines
963 B
PHP
<?php
|
|
|
|
namespace MediaWiki\Shell;
|
|
|
|
use MediaWiki\Http\HttpRequestFactory;
|
|
use Psr\Http\Message\RequestInterface;
|
|
use Shellbox\GuzzleHttpClient;
|
|
|
|
/**
|
|
* The MediaWiki-specific implementation of a Shellbox HTTP client
|
|
*/
|
|
class ShellboxHttpClient extends GuzzleHttpClient {
|
|
/** @var HttpRequestFactory */
|
|
private $requestFactory;
|
|
/** @var int|float Timeout in seconds */
|
|
private $timeout;
|
|
|
|
/**
|
|
* @param HttpRequestFactory $requestFactory
|
|
* @param int|float $timeout
|
|
*/
|
|
public function __construct( HttpRequestFactory $requestFactory, $timeout ) {
|
|
$this->requestFactory = $requestFactory;
|
|
$this->timeout = $timeout;
|
|
}
|
|
|
|
protected function modifyRequest( RequestInterface $request ): RequestInterface {
|
|
return $request
|
|
->withHeader( 'X-Request-Id', \WebRequest::getRequestId() );
|
|
}
|
|
|
|
protected function createClient( RequestInterface $request ) {
|
|
return $this->requestFactory->createGuzzleClient( [
|
|
'timeout' => $this->timeout
|
|
] );
|
|
}
|
|
}
|