*/
private $dbClone;
- /**
- * @var TidySupport
- */
- private $tidySupport;
-
/**
* @var TidyDriverBase
*/
$this->disableSaveParse = !empty( $options['disable-save-parse'] );
- $this->tidySupport = new TidySupport( !empty( $options['use-tidy-config'] ) );
- if ( !$this->tidySupport->isEnabled() ) {
- $this->recorder->warning(
- "Warning: tidy is not installed, skipping some tests\n" );
- }
-
if ( isset( $options['upload-dir'] ) ) {
$this->uploadDir = $options['upload-dir'];
}
$options->setTimestamp( $this->getFakeTimestamp() );
if ( isset( $opts['tidy'] ) ) {
- if ( !$this->tidySupport->isEnabled() ) {
- $this->recorder->skipped( $test, 'tidy extension is not installed' );
- return false;
- } else {
- $options->setTidy( true );
- }
+ $options->setTidy( true );
}
if ( isset( $opts['title'] ) ) {
if ( isset( $opts['tidy'] ) ) {
// Cache a driver instance
if ( $this->tidyDriver === null ) {
- $this->tidyDriver = MWTidy::factory( $this->tidySupport->getConfig() );
+ $this->tidyDriver = MWTidy::factory();
}
$tidy = $this->tidyDriver;
} else {
# Suppress warnings about running tests without tidy
Wikimedia\suppressWarnings();
wfDeprecated( 'disabling tidy' );
+ wfDeprecated( 'MWTidy::setInstance' );
Wikimedia\restoreWarnings();
MWTidy::setInstance( $tidy );
* @return array
*/
private function listTables() {
- global $wgCommentTableSchemaMigrationStage, $wgActorTableSchemaMigrationStage;
+ global $wgActorTableSchemaMigrationStage;
$tables = [ 'user', 'user_properties', 'user_former_groups', 'page', 'page_restrictions',
'protected_titles', 'revision', 'ip_changes', 'text', 'pagelinks', 'imagelinks',
'querycache', 'objectcache', 'job', 'l10n_cache', 'redirect', 'querycachetwo',
'archive', 'user_groups', 'page_props', 'category',
'slots', 'content', 'slot_roles', 'content_models',
+ 'comment', 'revision_comment_temp',
];
- if ( $wgCommentTableSchemaMigrationStage >= MIGRATION_WRITE_BOTH ) {
- // The new tables for comments are in use
- $tables[] = 'comment';
- $tables[] = 'revision_comment_temp';
- }
-
if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_NEW ) {
// The new tables for actors are in use
$tables[] = 'actor';