Use RemexHtml as the tidy implementation for parser tests

[lhc/web/wiklou.git] / tests / parser / TidySupport.php

diff --git a/tests/parser/TidySupport.php b/tests/parser/TidySupport.php
index c0a9312..559960d 100644 (file)
--- a/tests/parser/TidySupport.php
+++ b/tests/parser/TidySupport.php
@@ -32,7 +32,7 @@ class TidySupport {
         * @param bool $useConfiguration
         */
        public function __construct( $useConfiguration = false ) {
         * @param bool $useConfiguration
         */
        public function __construct( $useConfiguration = false ) {

-               global $IP, $wgUseTidy, $wgTidyBin, $wgTidyInternal, $wgTidyConfig,
+               global $wgUseTidy, $wgTidyBin, $wgTidyInternal, $wgTidyConfig,

                        $wgTidyConf, $wgTidyOpts;
 
                $this->enabled = true;
                        $wgTidyConf, $wgTidyOpts;
 
                $this->enabled = true;


@@ -55,26 +55,7 @@ class TidySupport {
                                $this->enabled = false;
                        }
                } else {
                                $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' ];
                }
                if ( !$this->enabled ) {
                        $this->config = [ 'driver' => 'disabled' ];