Skip to content

Fix site relative partial paths failing in 1.2 #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukeTowers merged 4 commits into from
Jun 25, 2022
Merged

Fix site relative partial paths failing in 1.2 #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4f069b
Handle local reference partial paths early in ViewMaker
bennothommo Jun 24, 2022
94f364e
Run tests with the base path as the current directory
bennothommo Jun 24, 2022
7d7cf09
Swap order of pathing - check view paths first, then relative
bennothommo Jun 24, 2022
fbe2866
Remove submodule
bennothommo Jun 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/system/console/WinterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ protected function execPhpUnit(string $config, array $args): int

$process = new Process(
array_merge([$this->phpUnitExec, '--configuration=' . $config], $args),
dirname($config),
base_path(),
null,
null
);
Expand Down
42 changes: 20 additions & 22 deletions modules/system/traits/ViewMaker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,32 +186,30 @@ public function getViewPath(string $fileName, string|array $viewPaths = null): s
$fileName = substr($fileName, 0, strrpos($fileName, '.'));
}


if (File::isPathSymbol($fileName)) {
// Handle path symbols
$absolutePath = File::symbolizePath($fileName);
// Check if this a path relative to the view paths
foreach ($viewPaths as $path) {
$absolutePath = File::symbolizePath($path);
foreach ($allowedExtensions as $ext) {
$viewPath = $absolutePath . ".$ext";

if (
File::isLocalPath($viewPath)
|| (
!Config::get('cms.restrictBaseDir', true)
&& realpath($viewPath) !== false
)
) {
$viewPath = $absolutePath . DIRECTORY_SEPARATOR . $fileName . ".$ext";
if (File::isFile($viewPath)) {
return $viewPath;
}
}
} else {
foreach ($viewPaths as $path) {
$absolutePath = File::symbolizePath($path);
foreach ($allowedExtensions as $ext) {
$viewPath = $absolutePath . DIRECTORY_SEPARATOR . $fileName . ".$ext";
if (File::isFile($viewPath)) {
return $viewPath;
}
}
}

// Next, check if this is a local path reference
$absolutePath = File::symbolizePath($fileName);
foreach ($allowedExtensions as $ext) {
$viewPath = $absolutePath . ".$ext";

if (
File::isLocalPath($viewPath)
|| (
!Config::get('cms.restrictBaseDir', true)
&& realpath($viewPath) !== false
)
) {
return $viewPath;
}
}

Expand Down