mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 14:02:32 +02:00
Code Issues Projects Releases Wiki Activity

MDL-77714 general: Remove mentions to Travis CI in a few places

Browse Source 
Not critical to have, but better don't mention it. Note that all
the cases need to stay because there may be other environments
where the same problems are reproducible.

Only exception is the CURL_SSLVERSION_TLSv1_2 constant, that
can be safely removed because it's available since PHP 5.5.19.
This commit is contained in:
Eloy Lafuente (stronk7) 2023-03-22 19:13:11 +01:00
parent 9a344c8967
commit 3faf1c1989
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/tests/upgrade_util_test.php
View File

@ -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.
*

6
lib/weblib.php
View File

@ -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 <html><body>, 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 <html><body>, 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)));
}

2
payment/tests/helper_test.php
View File

@ -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).