Browse Source

Doc comments for "yii\console\controllers\AssetController" has been updated.

tags/2.0.0-beta
Klimov Paul 12 years ago
parent
commit
06752ae9e7
  1. 2
      tests/unit/framework/console/controllers/AssetControllerTest.php
  2. 20
      yii/console/controllers/AssetController.php

2
tests/unit/framework/console/controllers/AssetControllerTest.php

@ -93,8 +93,6 @@ class AssetControllerTest extends TestCase
protected function createCompressConfig(array $bundles) protected function createCompressConfig(array $bundles)
{ {
$baseUrl = '/test'; $baseUrl = '/test';
$config = array( $config = array(
'bundles' => $this->createBundleConfig($bundles), 'bundles' => $this->createBundleConfig($bundles),
'targets' => array( 'targets' => array(

20
yii/console/controllers/AssetController.php

@ -12,6 +12,8 @@ use yii\console\Exception;
use yii\console\Controller; use yii\console\Controller;
/** /**
* This command allows you to combine and compress your JavaScript and CSS files.
*
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
*/ */
@ -74,7 +76,7 @@ class AssetController extends Controller
public $cssCompressor = 'java -jar yuicompressor.jar {from} -o {to}'; public $cssCompressor = 'java -jar yuicompressor.jar {from} -o {to}';
/** /**
* Compresses the asset files according to the given configuration. * Combines and compresses the asset files according to the given configuration.
* @param string $configFile configuration file name. * @param string $configFile configuration file name.
* @param string $bundleFile * @param string $bundleFile
*/ */
@ -210,8 +212,9 @@ class AssetController extends Controller
} }
/** /**
* @param \yii\web\AssetBundle[] $bundles * Publishes given asset bundles.
* @param array $options * @param \yii\web\AssetBundle[] $bundles asset bundles to be published.
* @param array $options assert manager instance configuration.
*/ */
protected function publishBundles($bundles, $options) protected function publishBundles($bundles, $options)
{ {
@ -225,11 +228,12 @@ class AssetController extends Controller
} }
/** /**
* @param \yii\web\AssetBundle $target * Builds output asset bundle.
* @param string $type either "js" or "css" * @param \yii\web\AssetBundle $target output asset bundle
* @param \yii\web\AssetBundle[] $bundles * @param string $type either "js" or "css".
* @param integer $timestamp * @param \yii\web\AssetBundle[] $bundles source asset bundles.
* @throws Exception * @param integer $timestamp current timestamp.
* @throws Exception on failure.
*/ */
protected function buildTarget($target, $type, $bundles, $timestamp) protected function buildTarget($target, $type, $bundles, $timestamp)
{ {

Loading…
Cancel
Save