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

Merge branch 'MDL-50153-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
David Monllao 2015-05-08 13:21:29 +08:00
commit f9c14c6135
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/component.php
View File

@ -707,12 +707,12 @@ $cache = '.var_export($cache, true).';
*/
protected static function load_psr_classes($basedir, $subdir = null) {
if ($subdir) {
$fulldir = implode(DIRECTORY_SEPARATOR, array($basedir, $subdir));
$classnameprefix = preg_replace('/\//', '_', $subdir);
$fulldir = realpath($basedir . DIRECTORY_SEPARATOR . $subdir);
$classnameprefix = preg_replace('#' . preg_quote(DIRECTORY_SEPARATOR) . '#', '_', $subdir);
} else {
$fulldir = $basedir;
}
if (!is_dir($fulldir)) {
if (!$fulldir || !is_dir($fulldir)) {
return;
}

10
lib/tests/messageinbound_test.php
View File

@ -50,7 +50,9 @@ class core_messageinbound_testcase extends advanced_testcase {
$messagedata->html = '';
list($message, $format) = test_handler::remove_quoted_text($messagedata);
$this->assertEquals($expectedplain, $message);
// Trim both the expected and the actual - we are not concerned about trailing whitespace.
$this->assertEquals(rtrim($expectedplain), rtrim($message));
$this->assertEquals(FORMAT_PLAIN, $format);
}
@ -60,7 +62,9 @@ class core_messageinbound_testcase extends advanced_testcase {
$messagedata->html = $mime->getPart($htmlpartid)->getContents();
list($message, $format) = test_handler::remove_quoted_text($messagedata);
$this->assertEquals($expectedhtml, $message);
// Trim both the expected and the actual - we are not concerned about trailing whitespace.
$this->assertEquals(rtrim($expectedhtml), rtrim($message));
$this->assertEquals(FORMAT_PLAIN, $format);
}
}
@ -103,7 +107,7 @@ class core_messageinbound_testcase extends advanced_testcase {
protected function read_test_file(\SplFileInfo $file, $fixturesdir) {
// Break on the --[TOKEN]-- tags in the file.
$tokens = preg_split('#(?:^|\n*)----([A-Z]+)----\n#', file_get_contents($file->getRealPath()),
$tokens = preg_split('#(?:^|[\r]?\n*)----([A-Z]+)----[\r]?\n#', file_get_contents($file->getRealPath()),
null, PREG_SPLIT_DELIM_CAPTURE);
$sections = array(
// Key => Required.