aboutsummaryrefslogtreecommitdiffstats
path: root/tests/phpunit/includes/api
diff options
context:
space:
mode:
Diffstat (limited to 'tests/phpunit/includes/api')
-rw-r--r--tests/phpunit/includes/api/ApiBaseTest.php4
-rw-r--r--tests/phpunit/includes/api/ApiBlockTest.php3
-rw-r--r--tests/phpunit/includes/api/ApiEditPageTest.php6
-rw-r--r--tests/phpunit/includes/api/ApiMoveTest.php5
-rw-r--r--tests/phpunit/includes/api/ApiQueryBlocksTest.php7
-rw-r--r--tests/phpunit/includes/api/ApiQueryInfoTest.php6
-rw-r--r--tests/phpunit/includes/api/ApiRevisionDeleteTest.php3
-rw-r--r--tests/phpunit/includes/api/ApiUnblockTest.php7
-rw-r--r--tests/phpunit/includes/api/ApiUserrightsTest.php10
9 files changed, 31 insertions, 20 deletions
diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php
index 0a64c5b92cbc..740a1a4b44ab 100644
--- a/tests/phpunit/includes/api/ApiBaseTest.php
+++ b/tests/phpunit/includes/api/ApiBaseTest.php
@@ -1331,7 +1331,7 @@ class ApiBaseTest extends ApiTestCase {
'reason' => __METHOD__,
'expiry' => time() + 100500,
] );
- $block->insert();
+ MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block );
$mockTrait = $this->getMockForTrait( ApiBlockInfoTrait::class );
$mockTrait->method( 'getLanguage' )->willReturn( 'en' );
@@ -1390,7 +1390,7 @@ class ApiBaseTest extends ApiTestCase {
'reason' => __METHOD__,
'expiry' => time() + 100500,
] );
- $block->insert();
+ MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block );
$mockTrait = $this->getMockForTrait( ApiBlockInfoTrait::class );
$mockTrait->method( 'getLanguage' )->willReturn( 'en' );
diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php
index 89af50431513..3d0bce17d41f 100644
--- a/tests/phpunit/includes/api/ApiBlockTest.php
+++ b/tests/phpunit/includes/api/ApiBlockTest.php
@@ -3,6 +3,7 @@
use MediaWiki\Block\DatabaseBlock;
use MediaWiki\Block\Restriction\NamespaceRestriction;
use MediaWiki\Block\Restriction\PageRestriction;
+use MediaWiki\MediaWikiServices;
/**
* @group API
@@ -102,7 +103,7 @@ class ApiBlockTest extends ApiTestCase {
'timestamp' => '19370101000000',
'expiry' => 'infinity',
] );
- $block->insert();
+ MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block );
$this->doBlock( [], $blocked );
}
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index 53940ce28d55..72f740e73aa2 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -1,6 +1,7 @@
<?php
use MediaWiki\Block\DatabaseBlock;
+use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\RevisionRecord;
/**
@@ -1493,7 +1494,8 @@ class ApiEditPageTest extends ApiTestCase {
'expiry' => 'infinity',
'enableAutoblock' => true,
] );
- $block->insert();
+ $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore();
+ $blockStore->insertBlock( $block );
try {
$this->doApiRequestWithToken( [
@@ -1506,7 +1508,7 @@ class ApiEditPageTest extends ApiTestCase {
$this->assertSame( 'You have been blocked from editing.', $ex->getMessage() );
$this->assertNotNull( DatabaseBlock::newFromTarget( '127.0.0.1' ), 'Autoblock spread' );
} finally {
- $block->delete();
+ $blockStore->deleteBlock( $block );
self::$users['sysop']->getUser()->clearInstanceCache();
}
}
diff --git a/tests/phpunit/includes/api/ApiMoveTest.php b/tests/phpunit/includes/api/ApiMoveTest.php
index 8642d9900b91..b82214eb3666 100644
--- a/tests/phpunit/includes/api/ApiMoveTest.php
+++ b/tests/phpunit/includes/api/ApiMoveTest.php
@@ -205,6 +205,7 @@ class ApiMoveTest extends ApiTestCase {
public function testMoveWhileBlocked() {
$this->assertNull( DatabaseBlock::newFromTarget( '127.0.0.1' ), 'Sanity check' );
+ $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore();
$block = new DatabaseBlock( [
'address' => self::$users['sysop']->getUser()->getName(),
'by' => self::$users['sysop']->getUser()->getId(),
@@ -213,7 +214,7 @@ class ApiMoveTest extends ApiTestCase {
'expiry' => 'infinity',
'enableAutoblock' => true,
] );
- $block->insert();
+ $blockStore->insertBlock( $block );
$name = ucfirst( __FUNCTION__ );
$id = $this->createPage( $name );
@@ -229,7 +230,7 @@ class ApiMoveTest extends ApiTestCase {
$this->assertSame( 'You have been blocked from editing.', $ex->getMessage() );
$this->assertNotNull( DatabaseBlock::newFromTarget( '127.0.0.1' ), 'Autoblock spread' );
} finally {
- $block->delete();
+ $blockStore->deleteBlock( $block );
self::$users['sysop']->getUser()->clearInstanceCache();
$this->assertSame( $id, Title::newFromText( $name )->getArticleID() );
}
diff --git a/tests/phpunit/includes/api/ApiQueryBlocksTest.php b/tests/phpunit/includes/api/ApiQueryBlocksTest.php
index 88612c2c7809..a3858eeb6fb7 100644
--- a/tests/phpunit/includes/api/ApiQueryBlocksTest.php
+++ b/tests/phpunit/includes/api/ApiQueryBlocksTest.php
@@ -3,6 +3,7 @@
use MediaWiki\Block\DatabaseBlock;
use MediaWiki\Block\Restriction\NamespaceRestriction;
use MediaWiki\Block\Restriction\PageRestriction;
+use MediaWiki\MediaWikiServices;
/**
* @group API
@@ -37,7 +38,7 @@ class ApiQueryBlocksTest extends ApiTestCase {
'expiry' => 'infinity',
] );
- $block->insert();
+ MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block );
list( $data ) = $this->doApiRequest( [
'action' => 'query',
@@ -66,7 +67,7 @@ class ApiQueryBlocksTest extends ApiTestCase {
'ipb_sitewide' => 1,
] );
- $block->insert();
+ MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block );
list( $data ) = $this->doApiRequest( [
'action' => 'query',
@@ -96,7 +97,7 @@ class ApiQueryBlocksTest extends ApiTestCase {
'sitewide' => 0,
] );
- $block->insert();
+ MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block );
$subset = [
'id' => $block->getId(),
diff --git a/tests/phpunit/includes/api/ApiQueryInfoTest.php b/tests/phpunit/includes/api/ApiQueryInfoTest.php
index fd45cbcf8a4b..fcf6321c3190 100644
--- a/tests/phpunit/includes/api/ApiQueryInfoTest.php
+++ b/tests/phpunit/includes/api/ApiQueryInfoTest.php
@@ -1,6 +1,7 @@
<?php
use MediaWiki\Block\DatabaseBlock;
+use MediaWiki\MediaWikiServices;
/**
* @group API
@@ -113,7 +114,8 @@ class ApiQueryInfoTest extends ApiTestCase {
'enableAutoblock' => true,
] );
- $block->insert();
+ $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore();
+ $blockStore->insertBlock( $block );
$page = $this->getExistingTestPage( 'Pluto' );
$title = $page->getTitle();
@@ -126,7 +128,7 @@ class ApiQueryInfoTest extends ApiTestCase {
'intestactionsdetail' => 'full',
], null, false, $badActor );
- $block->delete();
+ $blockStore->deleteBlock( $block );
$this->assertArrayHasKey( 'query', $data );
$this->assertArrayHasKey( 'pages', $data['query'] );
diff --git a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
index cd210799a6f5..0514a376af54 100644
--- a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
+++ b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
@@ -2,6 +2,7 @@
use MediaWiki\Block\DatabaseBlock;
use MediaWiki\Block\Restriction\PageRestriction;
+use MediaWiki\MediaWikiServices;
/**
* Tests for action=revisiondelete
@@ -137,7 +138,7 @@ class ApiRevisionDeleteTest extends ApiTestCase {
$block->setRestrictions( [
new PageRestriction( 0, Title::newFromText( self::$page )->getArticleID() )
] );
- $block->insert();
+ MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block );
$revid = array_shift( $this->revs );
diff --git a/tests/phpunit/includes/api/ApiUnblockTest.php b/tests/phpunit/includes/api/ApiUnblockTest.php
index e595ccf24218..c8c9f3c55014 100644
--- a/tests/phpunit/includes/api/ApiUnblockTest.php
+++ b/tests/phpunit/includes/api/ApiUnblockTest.php
@@ -1,6 +1,7 @@
<?php
use MediaWiki\Block\DatabaseBlock;
+use MediaWiki\MediaWikiServices;
/**
* @group API
@@ -32,7 +33,7 @@ class ApiUnblockTest extends ApiTestCase {
'address' => $this->blockee->getName(),
'by' => $this->blocker->getId(),
] );
- $result = $block->insert();
+ $result = MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block );
$this->assertNotFalse( $result, 'Could not insert block' );
$blockFromDB = DatabaseBlock::newFromID( $result['id'] );
$this->assertTrue( $blockFromDB !== null, 'Could not retrieve block' );
@@ -98,7 +99,7 @@ class ApiUnblockTest extends ApiTestCase {
'address' => $this->blocker->getName(),
'by' => $this->getTestUser( 'sysop' )->getUser()->getId(),
] );
- $block->insert();
+ MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block );
$this->doUnblock();
}
@@ -108,7 +109,7 @@ class ApiUnblockTest extends ApiTestCase {
'address' => $this->blocker->getName(),
'by' => $this->getTestUser( 'sysop' )->getUser()->getId(),
] );
- $result = $block->insert();
+ $result = MediaWikiServices::getInstance()->getDatabaseBlockStore()->insertBlock( $block );
$this->assertNotFalse( $result, 'Could not insert block' );
$this->doUnblock( [ 'user' => $this->blocker->getName() ] );
diff --git a/tests/phpunit/includes/api/ApiUserrightsTest.php b/tests/phpunit/includes/api/ApiUserrightsTest.php
index 88dda0bf5109..f82fca72f7f0 100644
--- a/tests/phpunit/includes/api/ApiUserrightsTest.php
+++ b/tests/phpunit/includes/api/ApiUserrightsTest.php
@@ -134,12 +134,13 @@ class ApiUserrightsTest extends ApiTestCase {
global $wgUser;
$block = new DatabaseBlock( [ 'address' => $wgUser, 'by' => $wgUser->getId(), ] );
- $block->insert();
+ $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore();
+ $blockStore->insertBlock( $block );
try {
$this->doSuccessfulRightsChange();
} finally {
- $block->delete();
+ $blockStore->deleteBlock( $block );
$wgUser->clearInstanceCache();
}
}
@@ -150,12 +151,13 @@ class ApiUserrightsTest extends ApiTestCase {
$this->setPermissions( true, true );
$block = new DatabaseBlock( [ 'address' => $user, 'by' => $user->getId() ] );
- $block->insert();
+ $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore();
+ $blockStore->insertBlock( $block );
try {
$this->doFailedRightsChange( 'You have been blocked from editing.' );
} finally {
- $block->delete();
+ $blockStore->deleteBlock( $block );
$user->clearInstanceCache();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 07:01:29 +0000