diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2025-02-20 20:21:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2025-02-20 20:21:46 +0000 |
| commit | 817e07006fd210d9937aba9701f94f534f1c1326 (patch) | |
| tree | 86bf910aeec19aba8f9a58108872c4e7a00ce185 /maintenance | |
| parent | d7bf135edf3b290796631480fece636b900989bf (diff) | |
| parent | 7fdc51ed4d27ba6211215c6198b7e448de799cde (diff) | |
| download | mediawikicore-817e07006fd210d9937aba9701f94f534f1c1326.tar.gz mediawikicore-817e07006fd210d9937aba9701f94f534f1c1326.zip | |
Merge "Revert "maintenance: Use DatabaseSqlite for type-hinting instead of DBConnRef""
Diffstat (limited to 'maintenance')
| -rw-r--r-- | maintenance/SqliteMaintenance.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/maintenance/SqliteMaintenance.php b/maintenance/SqliteMaintenance.php index 4db628d836f0..da9a3ab59485 100644 --- a/maintenance/SqliteMaintenance.php +++ b/maintenance/SqliteMaintenance.php @@ -23,7 +23,7 @@ use MediaWiki\Maintenance\Maintenance; use Wikimedia\AtEase\AtEase; -use Wikimedia\Rdbms\DatabaseSqlite; +use Wikimedia\Rdbms\DBConnRef; use Wikimedia\Rdbms\IMaintainableDatabase; // @codeCoverageIgnoreStart @@ -62,8 +62,6 @@ class SqliteMaintenance extends Maintenance { return; } - /** @var DatabaseSqlite $dbw */ - '@phan-var DatabaseSqlite $dbw'; if ( $this->hasOption( 'vacuum' ) ) { $this->vacuum( $dbw ); @@ -78,8 +76,9 @@ class SqliteMaintenance extends Maintenance { } } - private function vacuum( DatabaseSqlite $dbw ) { - $prevSize = filesize( $dbw->getDbFilePath() ); + private function vacuum( DBConnRef $dbw ) { + // Call non-standard DatabaseSqlite::getDbFilePath method + $prevSize = filesize( $dbw->__call( 'getDbFilePath', [] ) ); if ( $prevSize == 0 ) { $this->fatalError( "Can't vacuum an empty database.\n" ); } @@ -110,10 +109,10 @@ class SqliteMaintenance extends Maintenance { } } - private function backup( DatabaseSqlite $dbw, $fileName ) { + private function backup( DBConnRef $dbw, $fileName ) { $this->output( "Backing up database:\n Locking..." ); $dbw->query( 'BEGIN IMMEDIATE TRANSACTION', __METHOD__ ); - $ourFile = $dbw->getDbFilePath(); + $ourFile = $dbw->__call( 'getDbFilePath', [] ); $this->output( " Copying database file $ourFile to $fileName..." ); AtEase::suppressWarnings(); if ( !copy( $ourFile, $fileName ) ) { |