Merge pull request #1567 from crtlib/master

framework/yii/db/oci/QueryBuilder.php

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

framework/yii/db/oci/Schema.php

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

framework/yii/test/DbFixtureManager.php

@@ -52,7 +52,7 @@ class DbFixtureManager extends Component
 	public $db = 'db';
 	/**
 	 * @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
 	 * so that fixture data can be populated into the database without causing problem.
 	 */

framework/yii/web/AssetManager.php

@@ -131,7 +131,7 @@ class AssetManager extends Component
 			if ($this->bundles[$name] instanceof AssetBundle) {
 				return $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 {
 				throw new InvalidConfigException("Invalid asset bundle: $name");
 			}