Error202
/
yii2-swiftmailer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fixed test break about AssetController.

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
a5850657f8
commit
2fccd566b2
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      yii/console/controllers/AssetController.php

10
yii/console/controllers/AssetController.php
Unescape View File

@ -256,7 +256,7 @@ class AssetController extends Controller
foreach ($target->depends as $name) { foreach ($target->depends as $name) {
if (isset($bundles[$name])) { if (isset($bundles[$name])) {
foreach ($bundles[$name]->$type as $file) { foreach ($bundles[$name]->$type as $file) {
$inputFiles[] = $bundles[$name]->basePath . $file; $inputFiles[] = $bundles[$name]->basePath . '/' . $file;
} }
} else { } else {
throw new Exception("Unknown bundle: $name"); throw new Exception("Unknown bundle: $name");
@ -383,13 +383,13 @@ EOD
if (is_string($this->jsCompressor)) { if (is_string($this->jsCompressor)) {
$tmpFile = $outputFile . '.tmp'; $tmpFile = $outputFile . '.tmp';
$this->combineJsFiles($inputFiles, $tmpFile); $this->combineJsFiles($inputFiles, $tmpFile);
$log = shell_exec(strtr($this->jsCompressor, array( echo shell_exec(strtr($this->jsCompressor, array(
'{from}' => escapeshellarg($tmpFile), '{from}' => escapeshellarg($tmpFile),
'{to}' => escapeshellarg($outputFile), '{to}' => escapeshellarg($outputFile),
))); )));
@unlink($tmpFile); @unlink($tmpFile);
} else { } else {
$log = call_user_func($this->jsCompressor, $this, $inputFiles, $outputFile); call_user_func($this->jsCompressor, $this, $inputFiles, $outputFile);
} }
if (!file_exists($outputFile)) { if (!file_exists($outputFile)) {
throw new Exception("Unable to compress JavaScript files into '{$outputFile}'."); throw new Exception("Unable to compress JavaScript files into '{$outputFile}'.");
@ -412,13 +412,13 @@ EOD
if (is_string($this->cssCompressor)) { if (is_string($this->cssCompressor)) {
$tmpFile = $outputFile . '.tmp'; $tmpFile = $outputFile . '.tmp';
$this->combineCssFiles($inputFiles, $tmpFile); $this->combineCssFiles($inputFiles, $tmpFile);
$log = shell_exec(strtr($this->cssCompressor, array( echo shell_exec(strtr($this->cssCompressor, array(
'{from}' => escapeshellarg($tmpFile), '{from}' => escapeshellarg($tmpFile),
'{to}' => escapeshellarg($outputFile), '{to}' => escapeshellarg($outputFile),
))); )));
@unlink($tmpFile); @unlink($tmpFile);
} else { } else {
$log = call_user_func($this->cssCompressor, $this, $inputFiles, $outputFile); call_user_func($this->cssCompressor, $this, $inputFiles, $outputFile);
} }
if (!file_exists($outputFile)) { if (!file_exists($outputFile)) {
throw new Exception("Unable to compress CSS files into '{$outputFile}'."); throw new Exception("Unable to compress CSS files into '{$outputFile}'.");

Write Preview
Loading…
Cancel
Save