diff --git a/lib/tests/upgrade_util_test.php b/lib/tests/upgrade_util_test.php index a851661bfd2..0176df678f6 100644 --- a/lib/tests/upgrade_util_test.php +++ b/lib/tests/upgrade_util_test.php @@ -16,11 +16,6 @@ namespace core; -defined('MOODLE_INTERNAL') || die(); - -// Hack to let tests run on Travis CI. -defined('CURL_SSLVERSION_TLSv1_2') || define('CURL_SSLVERSION_TLSv1_2', 6); - /** * Upgrade utility class tests. * diff --git a/lib/weblib.php b/lib/weblib.php index ed22ae02138..bc40502da56 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -1394,9 +1394,9 @@ function format_text($text, $format = FORMAT_MOODLE, $options = null, $courseidd } // This regex is nasty and I don't like it. The correct way to solve this is by loading the HTML like so: - // $domdoc->loadHTML($text, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD); however it seems like the libxml - // version that travis uses doesn't work properly and ends up leaving , so I'm forced to use - // this regex to remove those tags. + // $domdoc->loadHTML($text, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD); however it seems like some libxml + // versions don't work properly and end up leaving , so I'm forced to use + // this regex to remove those tags as a preventive measure. $text = trim(preg_replace('~<(?:!DOCTYPE|/?(?:html|body))[^>]*>\s*~i', '', $domdoc->saveHTML($domdoc->documentElement))); } diff --git a/payment/tests/helper_test.php b/payment/tests/helper_test.php index 80b3c547c8a..13fe85b627d 100644 --- a/payment/tests/helper_test.php +++ b/payment/tests/helper_test.php @@ -190,7 +190,7 @@ class helper_test extends advanced_testcase { // - https://unicode-org.atlassian.net/browse/ICU-8853 // - https://unicode-org.atlassian.net/browse/ICU-8840 // It has been detected that versions prior to ICU-61.1 / ICU-62.1 come with this - // problem. Noticeably Travis images (as of December 2021) use buggy ICU-60.1. + // problem. Noticeably some CI images (as of December 2021) use buggy ICU-60.1. // So, here, we are going to dynamically verify the behaviour and skip the // test when buggy one is found. No need to apply this to code as dar as the real // formatting is not critical for the functionality (just small glitch).