php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 23:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

improved error handling of AssetConverter

Browse Source 
issue #1140
This commit is contained in:
Carsten Brandt
2013-11-05 12:32:55 +01:00
parent 58589e03bd
commit d4c68522d4
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/yii/views/errorHandler/exception.php
View File

@@ -359,7 +359,7 @@ pre .diff .change{
} }
?></h1> ?></h1>
<?php endif; ?> <?php endif; ?>
<h2><?= $handler->htmlEncode($exception->getMessage()) ?></h2> <h2><?= nl2br($handler->htmlEncode($exception->getMessage())) ?></h2>
<?= $handler->renderPreviousExceptions($exception) ?> <?= $handler->renderPreviousExceptions($exception) ?>
</div> </div>

2
framework/yii/views/errorHandler/previousException.php
View File

@@ -15,7 +15,7 @@
<span><?= $handler->htmlEncode(get_class($exception)) ?></span> <span><?= $handler->htmlEncode(get_class($exception)) ?></span>
<?php endif; ?> <?php endif; ?>
</h2> </h2>
<h3><?= $handler->htmlEncode($exception->getMessage()) ?></h3> <h3><?= nl2br($handler->htmlEncode($exception->getMessage())) ?></h3>
<p>in <span class="file"><?= $exception->getFile() ?></span> at line <span class="line"><?= $exception->getLine() ?></span></p> <p>in <span class="file"><?= $exception->getFile() ?></span> at line <span class="line"><?= $exception->getLine() ?></span></p>
<?= $handler->renderPreviousExceptions($exception) ?> <?= $handler->renderPreviousExceptions($exception) ?>
</div> </div>

11
framework/yii/web/AssetConverter.php
View File

@@ -9,6 +9,7 @@ namespace yii\web;
use Yii; use Yii;
use yii\base\Component; use yii\base\Component;
use yii\base\Exception;
/** /**
* AssetConverter supports conversion of several popular script formats into JS or CSS scripts. * AssetConverter supports conversion of several popular script formats into JS or CSS scripts.
@@ -24,7 +25,7 @@ class AssetConverter extends Component implements AssetConverterInterface
* target script types (either "css" or "js") and the commands used for the conversion. * target script types (either "css" or "js") and the commands used for the conversion.
*/ */
public $commands = [ public $commands = [
'less' => ['css', 'lessc {from} {to}'], 'less' => ['css', 'lessc {from} {to} --no-color'],
'scss' => ['css', 'sass {from} {to}'], 'scss' => ['css', 'sass {from} {to}'],
'sass' => ['css', 'sass {from} {to}'], 'sass' => ['css', 'sass {from} {to}'],
'styl' => ['js', 'stylus < {from} > {to}'], 'styl' => ['js', 'stylus < {from} > {to}'],
@@ -82,10 +83,12 @@ class AssetConverter extends Component implements AssetConverterInterface
} }
$status = proc_close($proc); $status = proc_close($proc);
if ($status !== 0) { if ($status === 0) {
Yii::error("AssetConverter command '$command' failed with exit code $status:\nSTDOUT:\n$stdout\nSTDERR:\n$stderr\n");
} else {
Yii::trace("Converted $asset into $result:\nSTDOUT:\n$stdout\nSTDERR:\n$stderr", __METHOD__); Yii::trace("Converted $asset into $result:\nSTDOUT:\n$stdout\nSTDERR:\n$stderr", __METHOD__);
} elseif (YII_DEBUG) {
throw new Exception("AssetConverter command '$command' failed with exit code $status:\nSTDOUT:\n$stdout\nSTDERR:\n$stderr");
} else {
Yii::error("AssetConverter command '$command' failed with exit code $status:\nSTDOUT:\n$stdout\nSTDERR:\n$stderr");
} }
return $status === 0; return $status === 0;
} }