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

Fix build failure: Handle arrays in assets command

Browse Source
This commit is contained in:
Mehdi Achour
2015-11-16 15:31:20 +01:00
parent 5619e98eda
commit 8ada653e8e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/console/controllers/AssetController.php
View File

@@ -10,6 +10,7 @@ namespace yii\console\controllers;
use Yii; use Yii;
use yii\console\Exception; use yii\console\Exception;
use yii\console\Controller; use yii\console\Controller;
use yii\helpers\ArrayHelper;
use yii\helpers\Console; use yii\helpers\Console;
use yii\helpers\FileHelper; use yii\helpers\FileHelper;
use yii\helpers\VarDumper; use yii\helpers\VarDumper;
@@ -331,7 +332,8 @@ class AssetController extends Controller
if (isset($bundles[$name])) { if (isset($bundles[$name])) {
if (!$this->isBundleExternal($bundles[$name])) { if (!$this->isBundleExternal($bundles[$name])) {
foreach ($bundles[$name]->$type as $file) { foreach ($bundles[$name]->$type as $file) {
$inputFiles[] = $bundles[$name]->basePath . '/' . $file; $file = ArrayHelper::toArray($file);
$inputFiles[] = $bundles[$name]->basePath . '/' . $file[0];
} }
} }
} else { } else {