From: Arlo Breault <abreault@wikimedia.org>
Date: Mon, 13 Feb 2017 22:42:26 +0000 (-0800)
Subject: Don't test for tidy class on hhvm
X-Git-Tag: 1.31.0-rc.0~4089^2
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=e9ee631c8858ea61f51d2f15cbef2aa01708d4d7;p=lhc%2Fweb%2Fwiklou.git

Don't test for tidy class on hhvm

 * It doesn't support the oo interface.

 * Should make the tidy tests run in CI.

Bug: T157730
Change-Id: Ied80f70b7cafcf64d736cb0eeb1a30d52c1d7921
---

diff --git a/tests/parser/TidySupport.php b/tests/parser/TidySupport.php
index 6b5fb4847f..39c9ca5272 100644
--- a/tests/parser/TidySupport.php
+++ b/tests/parser/TidySupport.php
@@ -58,7 +58,7 @@ class TidySupport {
 				'tidyConfigFile' => "$IP/includes/tidy/tidy.conf",
 				'tidyCommandLine' => '',
 			];
-			if ( extension_loaded( 'tidy' ) && class_exists( 'tidy' ) ) {
+			if ( extension_loaded( 'tidy' ) && ( wfIsHHVM() || class_exists( 'tidy' ) ) ) {
 				$this->config['driver'] = wfIsHHVM() ? 'RaggettInternalHHVM' : 'RaggettInternalPHP';
 			} else {
 				if ( is_executable( $wgTidyBin ) ) {