wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-23 21:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix removing a domain when the page doesn't exist

Browse source 
This was an unfortunate mistake in the refactoring in I2ccb587,
caused by incomplete documentation and a confusing mixture of
possible return types.

I9166c2b fixed one of the two places already. The situation in this
patch here cannot really happen in reality (there is nothing to
remove when the page is empty). Still I think the code is easier to
read when the two places behave the same.

Change-Id: Iea51c3a7a8185cbc3771143353f4795dde712ec4
This commit is contained in:
thiemowmde 2023-06-22 11:54:53 +02:00
parent 8f216a6030
commit 0bb3aa38ed
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/BlockedDomainStorage.php
View file

@ -193,7 +193,7 @@ class BlockedDomainStorage implements IDBAccessObject {
* @param string $domain domain to be blocked
* @param string $notes User provided notes
* @param \MediaWiki\Permissions\Authority|\MediaWiki\User\UserIdentity $user Performer
* @return RevisionRecord|null
* @return RevisionRecord|null Null on failure
*/
public function addDomain( string $domain, string $notes, $user ): ?RevisionRecord {
$content = $this->fetchLatestConfig();
@ -213,11 +213,11 @@ class BlockedDomainStorage implements IDBAccessObject {
* @param string $domain domain to be removed from the blocked list
* @param string $notes User provided notes
* @param \MediaWiki\Permissions\Authority|\MediaWiki\User\UserIdentity $user Performer
* @return RevisionRecord|null RevisionRecord on success, StatusValue on failure.
* @return RevisionRecord|null Null on failure
*/
public function removeDomain( string $domain, string $notes, $user ): ?RevisionRecord {
$content = $this->fetchLatestConfig();
if ( !$content ) {
if ( $content === null ) {
return null;
}
foreach ( $content as $key => $value ) {
@ -232,7 +232,7 @@ class BlockedDomainStorage implements IDBAccessObject {
}
/**
* @return array|null
* @return array[]|null Empty array when the page doesn't exist, null on failure
*/
private function fetchLatestConfig(): ?array {
$configPage = $this->getBlockedDomainPage();
@ -256,12 +256,12 @@ class BlockedDomainStorage implements IDBAccessObject {
/**
* Save the provided content into the page
*
* @param array $content To be turned into JSON
* @param array[] $content To be turned into JSON
* @param \MediaWiki\Permissions\Authority|\MediaWiki\User\UserIdentity $user Performer
* @param string $comment Save comment
* @return RevisionRecord|null
*/
private function saveContent( $content, $user, $comment ) {
private function saveContent( array $content, $user, $comment ): ?RevisionRecord {
$configPage = $this->getBlockedDomainPage();
$page = $this->wikiPageFactory->newFromLinkTarget( $configPage );
$updater = $page->newPageUpdater( $user );