protected function setUp() {
parent::setUp();
- $this->setMwGlobals( array(
+ $this->setMwGlobals( [
'wgEnableUploads' => true,
'wgAllowCopyUploads' => true,
- ) );
- wfSetupSession();
+ ] );
if ( wfLocalFile( 'UploadFromUrlTest.png' )->exists() ) {
$this->deleteFile( 'UploadFromUrlTest.png' );
protected function doApiRequest( array $params, array $unused = null,
$appendModule = false, User $user = null
) {
- $sessionId = session_id();
- session_write_close();
+ global $wgRequest;
- $req = new FauxRequest( $params, true, $_SESSION );
+ $req = new FauxRequest( $params, true, $wgRequest->getSession() );
$module = new ApiMain( $req, true );
$module->execute();
- wfSetupSession( $sessionId );
-
- return array(
- $module->getResult()->getResultData( null, array( 'Strip' => 'all' ) ),
+ return [
+ $module->getResult()->getResultData( null, [ 'Strip' => 'all' ] ),
$req
- );
+ ];
}
/**
$exception = false;
try {
- $this->doApiRequest( array(
+ $this->doApiRequest( [
'action' => 'upload',
- ) );
- } catch ( UsageException $e ) {
+ ] );
+ } catch ( ApiUsageException $e ) {
$exception = true;
$this->assertEquals( "The token parameter must be set", $e->getMessage() );
}
$exception = false;
try {
- $this->doApiRequest( array(
+ $this->doApiRequest( [
'action' => 'upload',
'token' => $token,
- ), $data );
- } catch ( UsageException $e ) {
+ ], $data );
+ } catch ( ApiUsageException $e ) {
$exception = true;
$this->assertEquals( "One of the parameters sessionkey, file, url is required",
$e->getMessage() );
$exception = false;
try {
- $this->doApiRequest( array(
+ $this->doApiRequest( [
'action' => 'upload',
'url' => 'http://www.example.com/test.png',
'token' => $token,
- ), $data );
- } catch ( UsageException $e ) {
+ ], $data );
+ } catch ( ApiUsageException $e ) {
$exception = true;
$this->assertEquals( "The filename parameter must be set", $e->getMessage() );
}
$this->user->removeGroup( 'sysop' );
$exception = false;
try {
- $this->doApiRequest( array(
+ $this->doApiRequest( [
'action' => 'upload',
'url' => 'http://www.example.com/test.png',
'filename' => 'UploadFromUrlTest.png',
'token' => $token,
- ), $data );
- } catch ( UsageException $e ) {
+ ], $data );
+ } catch ( ApiUsageException $e ) {
$exception = true;
$this->assertEquals( "Permission denied", $e->getMessage() );
}
$this->assertFalse( $job, 'Starting with an empty jobqueue' );
$this->user->addGroup( 'users' );
- $data = $this->doApiRequest( array(
+ $data = $this->doApiRequest( [
'action' => 'upload',
'filename' => 'UploadFromUrlTest.png',
'url' => 'http://upload.wikimedia.org/wikipedia/mediawiki/b/bc/Wiki.png',
'ignorewarnings' => true,
'token' => $token,
- ), $data );
+ ], $data );
$job = JobQueueGroup::singleton()->pop();
$this->assertFalse( $job );
$this->assertTrue( $t->exists(), "File '$name' exists" );
if ( $t->exists() ) {
- $file = wfFindFile( $name, array( 'ignoreRedirect' => true ) );
+ $file = wfFindFile( $name, [ 'ignoreRedirect' => true ] );
$empty = "";
FileDeleteForm::doDelete( $t, $file, $empty, "none", true );
$page = WikiPage::factory( $t );