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

Merge pull request #1567 from crtlib/master

Browse Source 
short array syntax
This commit is contained in:
Qiang Xue
2013-12-18 05:34:09 -08:00
parent 3d9340032e 8c4412be50
commit a4fe805cf0
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/yii/db/oci/QueryBuilder.php
View File

@@ -45,7 +45,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
if (($limit < 0) && ($offset < 0)) { if (($limit < 0) && ($offset < 0)) {
return $this->sql; return $this->sql;
} }
$filters = array(); $filters = [];
if ($offset > 0) { if ($offset > 0) {
$filters[] = 'rowNumId > ' . (int)$offset; $filters[] = 'rowNumId > ' . (int)$offset;
} }

2
framework/yii/db/oci/Schema.php
View File

@@ -221,7 +221,7 @@ EOD;
} }
$rows = $command->queryAll(); $rows = $command->queryAll();
$names = array(); $names = [];
foreach ($rows as $row) { foreach ($rows as $row) {
$names[] = $row['TABLE_NAME']; $names[] = $row['TABLE_NAME'];
} }

2
framework/yii/test/DbFixtureManager.php
View File

@@ -52,7 +52,7 @@ class DbFixtureManager extends Component
public $db = 'db'; public $db = 'db';
/** /**
* @var array list of database schemas that the test tables may reside in. Defaults to * @var array list of database schemas that the test tables may reside in. Defaults to
* array(''), meaning using the default schema (an empty string refers to the * [''], meaning using the default schema (an empty string refers to the
* default schema). This property is mainly used when turning on and off integrity checks * default schema). This property is mainly used when turning on and off integrity checks
* so that fixture data can be populated into the database without causing problem. * so that fixture data can be populated into the database without causing problem.
*/ */

2
framework/yii/web/AssetManager.php
View File

@@ -131,7 +131,7 @@ class AssetManager extends Component
if ($this->bundles[$name] instanceof AssetBundle) { if ($this->bundles[$name] instanceof AssetBundle) {
return $this->bundles[$name]; return $this->bundles[$name];
} elseif (is_array($this->bundles[$name])) { } elseif (is_array($this->bundles[$name])) {
$bundle = Yii::createObject(array_merge(array('class' => $name), $this->bundles[$name])); $bundle = Yii::createObject(array_merge(['class' => $name], $this->bundles[$name]));
} else { } else {
throw new InvalidConfigException("Invalid asset bundle: $name"); throw new InvalidConfigException("Invalid asset bundle: $name");
} }