From e9ee631c8858ea61f51d2f15cbef2aa01708d4d7 Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Mon, 13 Feb 2017 14:42:26 -0800 Subject: [PATCH] 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 --- tests/parser/TidySupport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) ) { -- 2.20.1