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

Use PHP type casting instead of ArrayHelper

Browse Source
This commit is contained in:
Mehdi Achour
2015-11-16 18:16:29 +01:00
parent 8ada653e8e
commit cf01d5ff92
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@ 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;
@@ -332,7 +331,7 @@ 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) {
$file = ArrayHelper::toArray($file); $file = (array) $file;
$inputFiles[] = $bundles[$name]->basePath . '/' . $file[0]; $inputFiles[] = $bundles[$name]->basePath . '/' . $file[0];
} }
} }

4
framework/web/AssetBundle.php
View File

@@ -152,7 +152,7 @@ class AssetBundle extends Object
$view->registerJsFile($manager->getAssetUrl($this, $js), $this->jsOptions); $view->registerJsFile($manager->getAssetUrl($this, $js), $this->jsOptions);
} }
foreach ($this->css as $css) { foreach ($this->css as $css) {
$css = ArrayHelper::toArray($css); $css = (array) $css;
$file = array_shift($css); $file = array_shift($css);
$options = ArrayHelper::merge($this->cssOptions, $css); $options = ArrayHelper::merge($this->cssOptions, $css);
$view->registerCssFile($manager->getAssetUrl($this, $file), $options); $view->registerCssFile($manager->getAssetUrl($this, $file), $options);
@@ -178,7 +178,7 @@ class AssetBundle extends Object
} }
} }
foreach ($this->css as $i => $css) { foreach ($this->css as $i => $css) {
$css = ArrayHelper::toArray($css); $css = (array) $css;
$file = array_shift($css); $file = array_shift($css);
if (Url::isRelative($file)) { if (Url::isRelative($file)) {
$css = ArrayHelper::merge($this->cssOptions, $css); $css = ArrayHelper::merge($this->cssOptions, $css);