X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fparser%2FTidySupport.php;h=559960def5b6e480791c550f441555d97c2b1d77;hp=c0a9312ba9e122874796635dc2f501a8a8a0d7d3;hb=bd912292041cfb92e45eeffb7ca0f06cca267b98;hpb=a63770525dca7e271719d8f00ce0e2ced226c411 diff --git a/tests/parser/TidySupport.php b/tests/parser/TidySupport.php index c0a9312ba9..559960def5 100644 --- a/tests/parser/TidySupport.php +++ b/tests/parser/TidySupport.php @@ -32,7 +32,7 @@ class TidySupport { * @param bool $useConfiguration */ public function __construct( $useConfiguration = false ) { - global $IP, $wgUseTidy, $wgTidyBin, $wgTidyInternal, $wgTidyConfig, + global $wgUseTidy, $wgTidyBin, $wgTidyInternal, $wgTidyConfig, $wgTidyConf, $wgTidyOpts; $this->enabled = true; @@ -55,26 +55,7 @@ class TidySupport { $this->enabled = false; } } else { - $this->config = [ - 'tidyConfigFile' => "$IP/includes/tidy/tidy.conf", - 'tidyCommandLine' => '', - ]; - if ( extension_loaded( 'tidy' ) && ( wfIsHHVM() || class_exists( 'tidy' ) ) ) { - $this->config['driver'] = wfIsHHVM() ? 'RaggettInternalHHVM' : 'RaggettInternalPHP'; - } else { - if ( is_executable( $wgTidyBin ) ) { - $this->config['driver'] = 'RaggettExternal'; - $this->config['tidyBin'] = $wgTidyBin; - } else { - $path = ExecutableFinder::findInDefaultPaths( $wgTidyBin ); - if ( $path !== false ) { - $this->config['driver'] = 'RaggettExternal'; - $this->config['tidyBin'] = $wgTidyBin; - } else { - $this->enabled = false; - } - } - } + $this->config = [ 'driver' => 'RemexHtml' ]; } if ( !$this->enabled ) { $this->config = [ 'driver' => 'disabled' ];