Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ jobs:
strategy:
matrix:
include:
- mediawiki_version: '1.35'
php_version: 7.4
database_type: mysql
database_image: "mysql:5.7"
coverage: false
experimental: false
- mediawiki_version: '1.39'
php_version: 8.1
database_type: mysql
Expand All @@ -42,7 +36,13 @@ jobs:
coverage: false
experimental: false
- mediawiki_version: '1.42'
php_version: 8.1
php_version: 8.2
database_type: mysql
database_image: "mysql:8"
coverage: false
experimental: false
- mediawiki_version: '1.43'
php_version: 8.2
database_type: mysql
database_image: "mysql:8"
coverage: false
Expand Down
2 changes: 1 addition & 1 deletion build
Submodule build updated 4 files
+16 −0 Dockerfile
+9 −0 Makefile
+4 −2 README.adoc
+2 −0 docker-compose.yml
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,10 @@
"phpunit": "php ../../tests/phpunit/phpunit.php -c phpunit.xml.dist --testdox",
"phpunit-coverage": "php ../../tests/phpunit/phpunit.php -c phpunit.xml.dist --testdox --coverage-text --coverage-html coverage/php --coverage-clover coverage/php/coverage.xml",
"minus-x": "minus-x check ."
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
3 changes: 2 additions & 1 deletion src/EditWarningApi.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use ApiBase;
use Exception;
use MediaWiki\MediaWikiServices;
use User;

class EditWarningApi extends ApiBase {
Expand All @@ -27,7 +28,7 @@ public function execute() {
}

try {
$dbw = wfGetDB( DB_MASTER );
$dbw = MediaWikiServices::getInstance()->getDBLoadBalancer()->getConnection( DB_PRIMARY );
$ew->removeLock( $dbw );

if ( $ewAction === 'lock' ) {
Expand Down