Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230124
Change subject: Remove use of deprecated TestUser->user
......................................................................
Remove use of deprecated TestUser->user
Change-Id: Iec47ea2609b4d407e827cec5bf2a834b75727005
---
M tests/phpunit/includes/api/ApiBlockTest.php
M tests/phpunit/includes/api/ApiEditPageTest.php
M tests/phpunit/includes/api/ApiLoginTest.php
M tests/phpunit/includes/api/ApiRevisionDeleteTest.php
M tests/phpunit/includes/api/ApiUnblockTest.php
M tests/phpunit/includes/api/ApiUploadTest.php
6 files changed, 39 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/24/230124/1
diff --git a/tests/phpunit/includes/api/ApiBlockTest.php
b/tests/phpunit/includes/api/ApiBlockTest.php
index 880572b..575efd6 100644
--- a/tests/phpunit/includes/api/ApiBlockTest.php
+++ b/tests/phpunit/includes/api/ApiBlockTest.php
@@ -53,7 +53,7 @@
'action' => 'block',
'user' => 'UTApiBlockee',
'reason' => 'Some reason',
- 'token' => $tokens['blocktoken'] ), null, false,
self::$users['sysop']->user );
+ 'token' => $tokens['blocktoken'] ), null, false,
self::$users['sysop']->getUser() );
$block = Block::newFromTarget( 'UTApiBlockee' );
@@ -77,7 +77,7 @@
),
null,
false,
- self::$users['sysop']->user
+ self::$users['sysop']->getUser()
);
}
}
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php
b/tests/phpunit/includes/api/ApiEditPageTest.php
index e006bf7..61a8ad1 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -262,18 +262,18 @@
// base edit for content
$page->doEditContent( new WikitextContent( "Foo" ),
- "testing 1", EDIT_NEW, false,
self::$users['sysop']->user );
+ "testing 1", EDIT_NEW, false,
self::$users['sysop']->getUser() );
$this->forceRevisionDate( $page, '20120101000000' );
$baseTime = $page->getRevision()->getTimestamp();
// base edit for redirect
$rpage->doEditContent( new WikitextContent( "#REDIRECT
[[$name]]" ),
- "testing 1", EDIT_NEW, false,
self::$users['sysop']->user );
+ "testing 1", EDIT_NEW, false,
self::$users['sysop']->getUser() );
$this->forceRevisionDate( $rpage, '20120101000000' );
// conflicting edit to redirect
$rpage->doEditContent( new WikitextContent( "#REDIRECT
[[$name]]\n\n[[Category:Test]]" ),
- "testing 2", EDIT_UPDATE, $page->getLatest(),
self::$users['uploader']->user );
+ "testing 2", EDIT_UPDATE, $page->getLatest(),
self::$users['uploader']->getUser() );
$this->forceRevisionDate( $rpage, '20120101020202' );
// try to save edit, following the redirect
@@ -284,7 +284,7 @@
'basetimestamp' => $baseTime,
'section' => 'new',
'redirect' => true,
- ), null, self::$users['sysop']->user );
+ ), null, self::$users['sysop']->getUser() );
$this->assertEquals( 'Success', $re['edit']['result'],
"no problems expected when following redirect" );
@@ -308,18 +308,18 @@
// base edit for content
$page->doEditContent( new WikitextContent( "Foo" ),
- "testing 1", EDIT_NEW, false,
self::$users['sysop']->user );
+ "testing 1", EDIT_NEW, false,
self::$users['sysop']->getUser() );
$this->forceRevisionDate( $page, '20120101000000' );
$baseTime = $page->getRevision()->getTimestamp();
// base edit for redirect
$rpage->doEditContent( new WikitextContent( "#REDIRECT
[[$name]]" ),
- "testing 1", EDIT_NEW, false,
self::$users['sysop']->user );
+ "testing 1", EDIT_NEW, false,
self::$users['sysop']->getUser() );
$this->forceRevisionDate( $rpage, '20120101000000' );
// conflicting edit to redirect
$rpage->doEditContent( new WikitextContent( "#REDIRECT
[[$name]]\n\n[[Category:Test]]" ),
- "testing 2", EDIT_UPDATE, $page->getLatest(),
self::$users['uploader']->user );
+ "testing 2", EDIT_UPDATE, $page->getLatest(),
self::$users['uploader']->getUser() );
$this->forceRevisionDate( $rpage, '20120101020202' );
// try to save edit, following the redirect but without
creating a section
@@ -330,7 +330,7 @@
'text' => 'nix bar!',
'basetimestamp' => $baseTime,
'redirect' => true,
- ), null, self::$users['sysop']->user );
+ ), null, self::$users['sysop']->getUser() );
$this->fail( 'redirect-appendonly error expected' );
} catch ( UsageException $ex ) {
@@ -350,13 +350,13 @@
// base edit
$page->doEditContent( new WikitextContent( "Foo" ),
- "testing 1", EDIT_NEW, false,
self::$users['sysop']->user );
+ "testing 1", EDIT_NEW, false,
self::$users['sysop']->getUser() );
$this->forceRevisionDate( $page, '20120101000000' );
$baseTime = $page->getRevision()->getTimestamp();
// conflicting edit
$page->doEditContent( new WikitextContent( "Foo bar" ),
- "testing 2", EDIT_UPDATE, $page->getLatest(),
self::$users['uploader']->user );
+ "testing 2", EDIT_UPDATE, $page->getLatest(),
self::$users['uploader']->getUser() );
$this->forceRevisionDate( $page, '20120101020202' );
// try to save edit, expect conflict
@@ -366,7 +366,7 @@
'title' => $name,
'text' => 'nix bar!',
'basetimestamp' => $baseTime,
- ), null, self::$users['sysop']->user );
+ ), null, self::$users['sysop']->getUser() );
$this->fail( 'edit conflict expected' );
} catch ( UsageException $ex ) {
@@ -389,13 +389,13 @@
// base edit
$page->doEditContent( new WikitextContent( "Foo" ),
- "testing 1", EDIT_NEW, false,
self::$users['sysop']->user );
+ "testing 1", EDIT_NEW, false,
self::$users['sysop']->getUser() );
$this->forceRevisionDate( $page, '20120101000000' );
$baseTime = $page->getRevision()->getTimestamp();
// conflicting edit
$page->doEditContent( new WikitextContent( "Foo bar" ),
- "testing 2", EDIT_UPDATE, $page->getLatest(),
self::$users['uploader']->user );
+ "testing 2", EDIT_UPDATE, $page->getLatest(),
self::$users['uploader']->getUser() );
$this->forceRevisionDate( $page, '20120101020202' );
// try to save edit, expect no conflict
@@ -405,7 +405,7 @@
'text' => 'nix bar!',
'basetimestamp' => $baseTime,
'section' => 'new',
- ), null, self::$users['sysop']->user );
+ ), null, self::$users['sysop']->getUser() );
$this->assertEquals( 'Success', $re['edit']['result'],
"no edit conflict expected here" );
@@ -432,17 +432,17 @@
// base edit for content
$page->doEditContent( new WikitextContent( "Foo" ),
- "testing 1", EDIT_NEW, false,
self::$users['sysop']->user );
+ "testing 1", EDIT_NEW, false,
self::$users['sysop']->getUser() );
$this->forceRevisionDate( $page, '20120101000000' );
// base edit for redirect
$rpage->doEditContent( new WikitextContent( "#REDIRECT
[[$name]]" ),
- "testing 1", EDIT_NEW, false,
self::$users['sysop']->user );
+ "testing 1", EDIT_NEW, false,
self::$users['sysop']->getUser() );
$this->forceRevisionDate( $rpage, '20120101000000' );
// new edit to content
$page->doEditContent( new WikitextContent( "Foo bar" ),
- "testing 2", EDIT_UPDATE, $page->getLatest(),
self::$users['uploader']->user );
+ "testing 2", EDIT_UPDATE, $page->getLatest(),
self::$users['uploader']->getUser() );
$this->forceRevisionDate( $rpage, '20120101020202' );
// try to save edit; should work, following the redirect.
@@ -452,7 +452,7 @@
'text' => 'nix bar!',
'section' => 'new',
'redirect' => true,
- ), null, self::$users['sysop']->user );
+ ), null, self::$users['sysop']->getUser() );
$this->assertEquals( 'Success', $re['edit']['result'],
"no edit conflict expected here" );
diff --git a/tests/phpunit/includes/api/ApiLoginTest.php
b/tests/phpunit/includes/api/ApiLoginTest.php
index 88a99e9..7dfd14f 100644
--- a/tests/phpunit/includes/api/ApiLoginTest.php
+++ b/tests/phpunit/includes/api/ApiLoginTest.php
@@ -23,7 +23,7 @@
global $wgServer;
$user = self::$users['sysop'];
- $user->user->logOut();
+ $user->getUser()->logOut();
if ( !isset( $wgServer ) ) {
$this->markTestIncomplete( 'This test needs $wgServer
to be set in LocalSettings.php' );
@@ -68,7 +68,7 @@
}
$user = self::$users['sysop'];
- $user->user->logOut();
+ $user->getUser()->logOut();
$ret = $this->doApiRequest( array(
"action" => "login",
diff --git a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
index b03836e..362d647 100644
--- a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
+++ b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
@@ -25,7 +25,7 @@
}
public function testHidingRevisions() {
- $user = self::$users['sysop']->user;
+ $user = self::$users['sysop']->getUser();
$revid = array_shift( $this->revs );
$out = $this->doApiRequest( array(
'action' => 'revisiondelete',
@@ -80,7 +80,7 @@
}
public function testUnhidingOutput() {
- $user = self::$users['sysop']->user;
+ $user = self::$users['sysop']->getUser();
$revid = array_shift( $this->revs );
// Hide revisions
$this->doApiRequest( array(
diff --git a/tests/phpunit/includes/api/ApiUnblockTest.php
b/tests/phpunit/includes/api/ApiUnblockTest.php
index e9dff9f..a374f09 100644
--- a/tests/phpunit/includes/api/ApiUnblockTest.php
+++ b/tests/phpunit/includes/api/ApiUnblockTest.php
@@ -25,7 +25,7 @@
),
null,
false,
- self::$users['sysop']->user
+ self::$users['sysop']->getUser()
);
}
}
diff --git a/tests/phpunit/includes/api/ApiUploadTest.php
b/tests/phpunit/includes/api/ApiUploadTest.php
index b7f7d10..c852d72 100644
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -80,7 +80,7 @@
try {
$this->doApiRequestWithToken( array(
'action' => 'upload',
- ), $session, self::$users['uploader']->user );
+ ), $session, self::$users['uploader']->getUser() );
} catch ( UsageException $e ) {
$exception = true;
$this->assertEquals( "One of the parameters filekey,
file, url, statuskey is required",
@@ -126,7 +126,7 @@
$exception = false;
try {
list( $result, , ) = $this->doApiRequestWithToken(
$params, $session,
- self::$users['uploader']->user );
+ self::$users['uploader']->getUser() );
} catch ( UsageException $e ) {
$exception = true;
}
@@ -165,7 +165,7 @@
$exception = false;
try {
- $this->doApiRequestWithToken( $params, $session,
self::$users['uploader']->user );
+ $this->doApiRequestWithToken( $params, $session,
self::$users['uploader']->getUser() );
} catch ( UsageException $e ) {
$this->assertContains( 'The file you submitted was
empty', $e->getMessage() );
$exception = true;
@@ -215,7 +215,7 @@
$exception = false;
try {
list( $result, , $session ) =
$this->doApiRequestWithToken( $params, $session,
- self::$users['uploader']->user );
+ self::$users['uploader']->getUser() );
} catch ( UsageException $e ) {
$exception = true;
}
@@ -232,7 +232,7 @@
$exception = false;
try {
list( $result, , ) = $this->doApiRequestWithToken(
$params, $session,
- self::$users['uploader']->user ); // FIXME:
leaks a temporary file
+ self::$users['uploader']->getUser() ); //
FIXME: leaks a temporary file
} catch ( UsageException $e ) {
$exception = true;
}
@@ -286,7 +286,7 @@
$exception = false;
try {
list( $result, , $session ) =
$this->doApiRequestWithToken( $params, $session,
- self::$users['uploader']->user );
+ self::$users['uploader']->getUser() );
} catch ( UsageException $e ) {
$exception = true;
}
@@ -311,7 +311,7 @@
$exception = false;
try {
list( $result ) = $this->doApiRequestWithToken(
$params, $session,
- self::$users['uploader']->user ); // FIXME:
leaks a temporary file
+ self::$users['uploader']->getUser() ); //
FIXME: leaks a temporary file
} catch ( UsageException $e ) {
$exception = true;
}
@@ -331,7 +331,7 @@
*/
public function testUploadStash( $session ) {
$this->setMwGlobals( array(
- 'wgUser' => self::$users['uploader']->user, // @todo
FIXME: still used somewhere
+ 'wgUser' => self::$users['uploader']->getUser(), //
@todo FIXME: still used somewhere
) );
$extension = 'png';
@@ -368,7 +368,7 @@
$exception = false;
try {
list( $result, , $session ) =
$this->doApiRequestWithToken( $params, $session,
- self::$users['uploader']->user ); // FIXME:
leaks a temporary file
+ self::$users['uploader']->getUser() ); //
FIXME: leaks a temporary file
} catch ( UsageException $e ) {
$exception = true;
}
@@ -397,7 +397,7 @@
$exception = false;
try {
list( $result ) = $this->doApiRequestWithToken(
$params, $session,
- self::$users['uploader']->user );
+ self::$users['uploader']->getUser() );
} catch ( UsageException $e ) {
$exception = true;
}
@@ -415,7 +415,7 @@
public function testUploadChunks( $session ) {
$this->setMwGlobals( array(
// @todo FIXME: still used somewhere
- 'wgUser' => self::$users['uploader']->user,
+ 'wgUser' => self::$users['uploader']->getUser(),
) );
$chunkSize = 1048576;
@@ -473,7 +473,7 @@
// Upload fist chunk ( and get the session key )
try {
list( $result, , $session ) =
$this->doApiRequestWithToken( $params, $session,
- self::$users['uploader']->user
);
+
self::$users['uploader']->getUser() );
} catch ( UsageException $e ) {
$this->markTestIncomplete(
$e->getMessage() );
}
@@ -501,7 +501,7 @@
// Upload current chunk
try {
list( $result, , $session ) =
$this->doApiRequestWithToken( $params, $session,
- self::$users['uploader']->user );
+ self::$users['uploader']->getUser() );
} catch ( UsageException $e ) {
$this->markTestIncomplete( $e->getMessage() );
}
@@ -541,7 +541,7 @@
$exception = false;
try {
list( $result ) = $this->doApiRequestWithToken(
$params, $session,
- self::$users['uploader']->user );
+ self::$users['uploader']->getUser() );
} catch ( UsageException $e ) {
$exception = true;
}
--
To view, visit https://gerrit.wikimedia.org/r/230124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec47ea2609b4d407e827cec5bf2a834b75727005
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
