update lock clucknut
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 14s
Build, Push and Deploy / build-and-push (push) Successful in 3m14s
Build, Push and Deploy / deploy-staging (push) Successful in 25s
Build, Push and Deploy / deploy-production (push) Has been skipped

This commit is contained in:
2026-04-18 20:32:18 +07:00
parent 4554035227
commit dcaf267458
3359 changed files with 153185 additions and 205489 deletions

View File

@@ -443,6 +443,8 @@ public function makePathRelative(string $endPath, string $startPath): string
throw new InvalidArgumentException(\sprintf('The end path "%s" is not absolute.', $endPath));
}
$originalEndPath = $endPath;
// Normalize separators on Windows
if ('\\' === \DIRECTORY_SEPARATOR) {
$endPath = str_replace('\\', '/', $endPath);
@@ -499,6 +501,11 @@ public function makePathRelative(string $endPath, string $startPath): string
// Construct $endPath from traversing to the common path, then to the remaining $endPath
$relativePath = $traverser.('' !== $endPathRemainder ? $endPathRemainder.'/' : '');
// Remove ending "/" if $endPath points to an existing file
if (str_ends_with($relativePath, '/') && is_file($originalEndPath)) {
$relativePath = substr($relativePath, 0, -1);
}
return '' === $relativePath ? './' : $relativePath;
}