Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
06752ae9
Commit
06752ae9
authored
May 16, 2013
by
Klimov Paul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Doc comments for "yii\console\controllers\AssetController" has been updated.
parent
563f992b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
AssetControllerTest.php
...nit/framework/console/controllers/AssetControllerTest.php
+0
-2
AssetController.php
yii/console/controllers/AssetController.php
+12
-8
No files found.
tests/unit/framework/console/controllers/AssetControllerTest.php
View file @
06752ae9
...
@@ -93,8 +93,6 @@ class AssetControllerTest extends TestCase
...
@@ -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
(
...
...
yii/console/controllers/AssetController.php
View file @
06752ae9
...
@@ -12,6 +12,8 @@ use yii\console\Exception;
...
@@ -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
...
@@ -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.
* Com
bines and com
presses 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
...
@@ -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
...
@@ -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
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment