diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b1a3ec..d3b4409 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -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 diff --git a/build b/build index 10d5746..3c2344c 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 10d57463ef3332f79d6b0e763ca8c5d2c4860e16 +Subproject commit 3c2344c631a9023b228fd9970c8daf0583b333e1 diff --git a/composer.json b/composer.json index 8ad74db..05d22a3 100644 --- a/composer.json +++ b/composer.json @@ -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 + } } } \ No newline at end of file diff --git a/src/EditWarningApi.php b/src/EditWarningApi.php index fb56c2f..ba9bb55 100644 --- a/src/EditWarningApi.php +++ b/src/EditWarningApi.php @@ -4,6 +4,7 @@ use ApiBase; use Exception; +use MediaWiki\MediaWikiServices; use User; class EditWarningApi extends ApiBase { @@ -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' ) {