Skip to content

Fixed building path to files for Yii version >=2.0.39 with non-empty BaseUrl #61

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed building path to files for Yii version >=2.0.39 with non-empty BaseUrl #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions src/AssetsAutoCompressComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ protected function _processingJsFiles($files = [])
if (!$this->jsFileRemouteCompile) {
foreach ($files as $fileCode => $fileTag) {
if (!Url::isRelative($fileCode)) {
$fileCode = $this->getFileCode($fileCode);
$resultFiles[$fileCode] = $fileTag;
}
}
Expand All @@ -429,6 +430,7 @@ protected function _processingJsFiles($files = [])
foreach ($files as $fileCode => $fileTag) {
if (Url::isRelative($fileCode)) {
if ($pos = strpos($fileCode, "?")) {
$fileCode = $this->getFileCode($fileCode);
$fileCode = substr($fileCode, 0, $pos);
}

Expand Down Expand Up @@ -600,6 +602,7 @@ protected function _processingCssFiles($files = [])
if (!$this->cssFileRemouteCompile) {
foreach ($files as $fileCode => $fileTag) {
if (!Url::isRelative($fileCode)) {
$fileCode = $this->getFileCode($fileCode);
$resultFiles[$fileCode] = $fileTag;
}
}
Expand All @@ -616,6 +619,7 @@ protected function _processingCssFiles($files = [])
$resultFiles = [];
foreach ($files as $fileCode => $fileTag) {
if (Url::isRelative($fileCode)) {
$fileCode = $this->getFileCode($fileCode);
$fileCodeLocal = $fileCode;
if ($pos = strpos($fileCode, "?")) {
$fileCodeLocal = substr($fileCodeLocal, 0, $pos);
Expand Down Expand Up @@ -726,6 +730,18 @@ protected function _processingHtml($html)
return $html;
}

/**
* Fix for Yii version 2.0.39 and higher if the project has a non-empty baseUrl
*
* @param string $fileCode Path to file
*
* @return string
* @link https://github.com/yiisoft/yii2/issues/18414
*/
protected function getFileCode($fileCode)
{
return !empty(\Yii::$app->request->getBaseUrl()) ? str_replace(\Yii::$app->request->getBaseUrl(), '', $fileCode) : $fileCode;
}

/**
* @param $value
Expand Down