tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-13 08:25:00 +02:00
Code Issues Projects Releases Wiki Activity

ENH: resolve relative references in CSS files when combining

Browse Source
This commit is contained in:
Sergey Shevchenko 2021-11-01 14:16:00 +13:00
parent 9b1052f955
commit c5e68dd2c0
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/View/Requirements_Backend.php
View File

@ -1395,6 +1395,10 @@ MESSAGE
throw new InvalidArgumentException("Combined file {$file} does not exist");
}
$fileContent = file_get_contents($filePath ?? '');
if ($type == 'css') {
// resolve relative paths for css files
$fileContent = $this->resolveCSSReferences($fileContent, $file);
}
// Use configured minifier
if ($minify) {
$fileContent = $this->minifier->minify($fileContent, $type, $file);
@ -1421,6 +1425,34 @@ MESSAGE
return $combinedURL;
}
/**
* Resolves relative paths in CSS files which are lost when combining them
*
* @param string $content
* @param string $filePath
* @return string New content with paths resolved
*/
protected function resolveCSSReferences($content, $filePath)
{
$fileUrl = Injector::inst()->get(ResourceURLGenerator::class)->urlForResource($filePath);
$fileUrlDir = dirname($fileUrl);
$content = preg_replace_callback('#([\.]{1,2}/)+#', function ($a) use ($fileUrlDir) {
$full = $fileUrlDir . '/' . $a[0];
$full = preg_replace('#/{2,}#', '/', $full); // ensure there's no repeated slashes
while (strpos($full, './') > 0) {
$post = $full;
$post = preg_replace('#([^/\.]+)/\.\./#', '', $post); // erase 'something/../' with the predecessor
$post = preg_replace('#([^/\.]+)/\./#', '\\1/', $post); // erase './'
if ($post == $full) {
break; // nothing changed
}
$full = $post;
}
return $full;
}, $content);
return $content;
}
/**
* Given a filename and list of files, generate a new filename unique to these files
*