wikimedia/mediawiki-extensions-Interwiki
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Interwiki synced 2024-11-23 14:06:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Upgrade mediawiki/mediawiki-codesniffer to v43.0.0

Browse source 
Change-Id: I7720215d153da5509d8b416b9981ccf496db74a4
This commit is contained in:
Umherirrender 2024-03-11 19:25:16 +01:00
parent be3aba2964
commit a6a4562141
2 changed files with 75 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
composer.json
View file

@ -1,6 +1,6 @@
{
"require-dev": {
"mediawiki/mediawiki-codesniffer": "41.0.0",
"mediawiki/mediawiki-codesniffer": "43.0.0",
"mediawiki/mediawiki-phan-config": "0.14.0",
"mediawiki/minus-x": "1.1.1",
"php-parallel-lint/php-console-highlighter": "1.0.0",
@ -18,5 +18,10 @@
],
"phan": "phan -d . --long-progress-bar",
"phpcs": "phpcs -sp --cache"
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
}
}

138
includes/SpecialInterwiki.php
View file

@ -262,79 +262,79 @@ class SpecialInterwiki extends SpecialPage {
$lookup = MediaWikiServices::getInstance()->getInterwikiLookup();
$dbw = wfGetDB( DB_PRIMARY );
switch ( $do ) {
case 'delete':
$dbw->delete( 'interwiki', [ 'iw_prefix' => $prefix ], __METHOD__ );
case 'delete':
$dbw->delete( 'interwiki', [ 'iw_prefix' => $prefix ], __METHOD__ );
if ( $dbw->affectedRows() === 0 ) {
$status->fatal( 'interwiki_delfailed', $prefix );
} else {
$this->getOutput()->addWikiMsg( 'interwiki_deleted', $prefix );
$log = new LogPage( 'interwiki' );
$log->addEntry(
'iw_delete',
$selfTitle,
$reason,
[ $prefix ],
$this->getUser()
);
$lookup->invalidateCache( $prefix );
}
break;
/** @noinspection PhpMissingBreakStatementInspection */
case 'add':
$contLang = MediaWikiServices::getInstance()->getContentLanguage();
$prefix = $contLang->lc( $prefix );
// Fall through
case 'edit':
$theurl = $data['url'];
$api = $data['api'] ?? '';
$local = $data['local'] ? 1 : 0;
$trans = $data['trans'] ? 1 : 0;
$rows = [
'iw_prefix' => $prefix,
'iw_url' => $theurl,
'iw_api' => $api,
'iw_wikiid' => '',
'iw_local' => $local,
'iw_trans' => $trans
];
if ( $prefix === '' || $theurl === '' ) {
$status->fatal( 'interwiki-submit-empty' );
if ( $dbw->affectedRows() === 0 ) {
$status->fatal( 'interwiki_delfailed', $prefix );
} else {
$this->getOutput()->addWikiMsg( 'interwiki_deleted', $prefix );
$log = new LogPage( 'interwiki' );
$log->addEntry(
'iw_delete',
$selfTitle,
$reason,
[ $prefix ],
$this->getUser()
);
$lookup->invalidateCache( $prefix );
}
break;
}
/** @noinspection PhpMissingBreakStatementInspection */
case 'add':
$contLang = MediaWikiServices::getInstance()->getContentLanguage();
$prefix = $contLang->lc( $prefix );
// Fall through
case 'edit':
$theurl = $data['url'];
$api = $data['api'] ?? '';
$local = $data['local'] ? 1 : 0;
$trans = $data['trans'] ? 1 : 0;
$rows = [
'iw_prefix' => $prefix,
'iw_url' => $theurl,
'iw_api' => $api,
'iw_wikiid' => '',
'iw_local' => $local,
'iw_trans' => $trans
];
// Simple URL validation: check that the protocol is one of
// the supported protocols for this wiki.
// (bug 30600)
if ( !wfParseUrl( $theurl ) ) {
$status->fatal( 'interwiki-submit-invalidurl' );
if ( $prefix === '' || $theurl === '' ) {
$status->fatal( 'interwiki-submit-empty' );
break;
}
// Simple URL validation: check that the protocol is one of
// the supported protocols for this wiki.
// (bug 30600)
if ( !wfParseUrl( $theurl ) ) {
$status->fatal( 'interwiki-submit-invalidurl' );
break;
}
if ( $do === 'add' ) {
$dbw->insert( 'interwiki', $rows, __METHOD__, [ 'IGNORE' ] );
} else { // $do === 'edit'
$dbw->update( 'interwiki', $rows, [ 'iw_prefix' => $prefix ], __METHOD__, [ 'IGNORE' ] );
}
// used here: interwiki_addfailed, interwiki_added, interwiki_edited
if ( $dbw->affectedRows() === 0 ) {
$status->fatal( "interwiki_{$do}failed", $prefix );
} else {
$this->getOutput()->addWikiMsg( "interwiki_{$do}ed", $prefix );
$log = new LogPage( 'interwiki' );
$log->addEntry(
'iw_' . $do,
$selfTitle,
$reason,
[ $prefix, $theurl, $trans, $local ],
$this->getUser()
);
// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
$lookup->invalidateCache( $prefix );
}
break;
}
if ( $do === 'add' ) {
$dbw->insert( 'interwiki', $rows, __METHOD__, [ 'IGNORE' ] );
} else { // $do === 'edit'
$dbw->update( 'interwiki', $rows, [ 'iw_prefix' => $prefix ], __METHOD__, [ 'IGNORE' ] );
}
// used here: interwiki_addfailed, interwiki_added, interwiki_edited
if ( $dbw->affectedRows() === 0 ) {
$status->fatal( "interwiki_{$do}failed", $prefix );
} else {
$this->getOutput()->addWikiMsg( "interwiki_{$do}ed", $prefix );
$log = new LogPage( 'interwiki' );
$log->addEntry(
'iw_' . $do,
$selfTitle,
$reason,
[ $prefix, $theurl, $trans, $local ],
$this->getUser()
);
// @phan-suppress-next-line PhanTypeMismatchArgumentNullable
$lookup->invalidateCache( $prefix );
}
break;
}
return $status;