Skip to content

Commit

Permalink
Fix #19712: cast shell_exec() output to string for jsCompressor
Browse files Browse the repository at this point in the history
  • Loading branch information
impayru authored Dec 12, 2022
1 parent e5da5d5 commit 3ad01aa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions framework/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Yii Framework 2 Change Log
- Enh #9740: Usage of DI instead of new keyword in Schemas (manchenkoff)
- Enh #19689: Remove empty elements from the `class` array in `yii\helpers\BaseHtml::renderTagAttributes()` to prevent unwanted spaces (MoritzLost)
- Chg #19696: Change visibility of `yii\web\View::isPageEnded` to `protected` (lubosdz, samdark)
- Bug #19712: Cast shell_exec() output to string for jsCompressor (impayru)

2.0.47 November 18, 2022
------------------------
Expand Down
2 changes: 1 addition & 1 deletion framework/console/controllers/AssetController.php
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ protected function compressJsFiles($inputFiles, $outputFile)
if (is_string($this->jsCompressor)) {
$tmpFile = $outputFile . '.tmp';
$this->combineJsFiles($inputFiles, $tmpFile);
$this->stdout(shell_exec(strtr($this->jsCompressor, [
$this->stdout((string)shell_exec(strtr($this->jsCompressor, [
'{from}' => escapeshellarg($tmpFile),
'{to}' => escapeshellarg($outputFile),
])));
Expand Down

0 comments on commit 3ad01aa

Please sign in to comment.