L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-83811 core: Make sure to trim leading backslashes too for Windows

Browse Source
This commit is contained in:
Jun Pataleta
2024-11-27 10:36:46 +08:00
parent d3cabadd38
commit 4e22073a9b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tests/component_test.php
+3 -3
View File
@@ -1349,10 +1349,10 @@ final class component_test extends \advanced_testcase {
foreach ($paths as $path) {
// The composer.json can specify any arbitrary directory within the folder.
// It always contains a leading slash (/).
// It always contains a leading slash (/) or backslash (\) on Windows.
// It may also have an optional trailing slash (/).
// Concatenate the parts and removes the slashes.
$relativenamespacepath = trim("{$relativepath}/{$path}", '/');
$relativenamespacepath = trim("{$relativepath}/{$path}", '/\\');
// The Moodle PSR-4 autoloader data has two formats:
// - a string, for a single source; or
@@ -1377,7 +1377,7 @@ final class component_test extends \advanced_testcase {
// The Moodle composer file autoloads are a simple string[].
$autoloadnamefiles = $rc->getProperty('composerautoloadfiles')->getValue(null);
foreach ($composer['autoload']['files'] as $file) {
$this->assertContains(trim($relativepath, '/') . "/{$file}", $autoloadnamefiles);
$this->assertContains(trim($relativepath, '/\\') . "/{$file}", $autoloadnamefiles);
}
}
}