From dfb6e1f404bcca2e6c0128e45ab41f78181bcf71 Mon Sep 17 00:00:00 2001
From: Yakir Sitbon <kingyes1@gmail.com>
Date: Fri, 18 Oct 2013 12:03:36 +0000
Subject: [PATCH] Convert to short syntax [2].

---
 .../backend/controllers/SiteController.php         | 40 ++++++------
 apps/advanced/backend/views/layouts/main.php       | 30 ++++-----
 apps/advanced/backend/views/site/login.php         |  4 +-
 apps/advanced/common/config/params.php             | 12 ++--
 apps/advanced/common/models/LoginForm.php          | 10 +--
 apps/advanced/common/models/User.php               | 54 ++++++++--------
 apps/advanced/console/config/main.php              | 26 ++++----
 apps/advanced/console/config/params.php            |  4 +-
 .../environments/dev/backend/config/main-local.php | 12 ++--
 .../dev/backend/config/params-local.php            |  4 +-
 .../dev/common/config/params-local.php             |  4 +-
 .../environments/dev/console/config/main-local.php |  4 +-
 .../dev/console/config/params-local.php            |  4 +-
 .../dev/frontend/config/main-local.php             | 12 ++--
 .../dev/frontend/config/params-local.php           |  4 +-
 apps/advanced/environments/index.php               | 28 ++++----
 .../prod/backend/config/main-local.php             |  4 +-
 .../prod/backend/config/params-local.php           |  4 +-
 .../prod/common/config/params-local.php            |  4 +-
 .../prod/console/config/main-local.php             |  4 +-
 .../prod/console/config/params-local.php           |  4 +-
 .../prod/frontend/config/main-local.php            |  4 +-
 .../prod/frontend/config/params-local.php          |  4 +-
 apps/advanced/frontend/config/AppAsset.php         | 12 ++--
 apps/advanced/frontend/config/main.php             | 38 +++++------
 apps/advanced/frontend/config/params.php           |  4 +-
 .../frontend/controllers/SiteController.php        | 74 +++++++++++-----------
 apps/advanced/frontend/models/ContactForm.php      | 14 ++--
 .../frontend/views/emails/passwordResetToken.php   |  2 +-
 apps/advanced/frontend/views/layouts/main.php      | 36 +++++------
 apps/advanced/frontend/views/site/contact.php      | 12 ++--
 apps/advanced/frontend/views/site/login.php        |  6 +-
 .../views/site/requestPasswordResetToken.php       |  4 +-
 .../advanced/frontend/views/site/resetPassword.php |  4 +-
 apps/advanced/frontend/views/site/signup.php       |  4 +-
 apps/advanced/init                                 |  6 +-
 apps/advanced/requirements.php                     | 44 ++++++-------
 apps/basic/config/console.php                      |  2 +-
 apps/basic/requirements.php                        | 44 ++++++-------
 apps/basic/tests/acceptance/ContactCept.php        | 10 +--
 apps/basic/tests/acceptance/LoginCept.php          | 10 +--
 apps/basic/tests/functional/ContactCept.php        | 10 +--
 apps/basic/tests/functional/LoginCept.php          | 10 +--
 apps/basic/views/layouts/main.php                  | 38 +++++------
 apps/basic/views/site/contact.php                  | 12 ++--
 apps/basic/views/site/login.php                    | 18 +++---
 apps/basic/web/index-test.php                      |  2 +-
 47 files changed, 348 insertions(+), 348 deletions(-)

diff --git a/apps/advanced/backend/controllers/SiteController.php b/apps/advanced/backend/controllers/SiteController.php
index 28f2310..ebfb484 100644
--- a/apps/advanced/backend/controllers/SiteController.php
+++ b/apps/advanced/backend/controllers/SiteController.php
@@ -10,32 +10,32 @@ class SiteController extends Controller
 {
 	public function behaviors()
 	{
-		return array(
-			'access' => array(
+		return [
+			'access' => [
 				'class' => \yii\web\AccessControl::className(),
-				'rules' => array(
-					array(
-						'actions' => array('login'),
+				'rules' => [
+					[
+						'actions' => ['login'],
 						'allow' => true,
-						'roles' => array('?'),
-					),
-					array(
-						'actions' => array('logout', 'index'),
+						'roles' => ['?'],
+					],
+					[
+						'actions' => ['logout', 'index'],
 						'allow' => true,
-						'roles' => array('@'),
-					),
-				),
-			),
-		);
+						'roles' => ['@'],
+					],
+				],
+			],
+		];
 	}
 
 	public function actions()
 	{
-		return array(
-			'error' => array(
+		return [
+			'error' => [
 				'class' => 'yii\web\ErrorAction',
-			),
-		);
+			],
+		];
 	}
 
 	public function actionIndex()
@@ -49,9 +49,9 @@ class SiteController extends Controller
 		if ($model->load($_POST) && $model->login()) {
 			return $this->goHome();
 		} else {
-			return $this->render('login', array(
+			return $this->render('login', [
 				'model' => $model,
-			));
+			]);
 		}
 	}
 
diff --git a/apps/advanced/backend/views/layouts/main.php b/apps/advanced/backend/views/layouts/main.php
index 928f990..6d958cb 100644
--- a/apps/advanced/backend/views/layouts/main.php
+++ b/apps/advanced/backend/views/layouts/main.php
@@ -22,32 +22,32 @@ AppAsset::register($this);
 <body>
 	<?php $this->beginBody(); ?>
 	<?php
-		NavBar::begin(array(
+		NavBar::begin([
 			'brandLabel' => 'My Company',
 			'brandUrl' => Yii::$app->homeUrl,
-			'options' => array(
+			'options' => [
 				'class' => 'navbar-inverse navbar-fixed-top',
-			),
-		));
-		$menuItems = array(
-			array('label' => 'Home', 'url' => array('/site/index')),
-		);
+			],
+		]);
+		$menuItems = [
+			['label' => 'Home', 'url' => ['/site/index']],
+		];
 		if (Yii::$app->user->isGuest) {
-			$menuItems[] = array('label' => 'Login', 'url' => array('/site/login'));
+			$menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
 		} else {
-			$menuItems[] = array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout'));
+			$menuItems[] = ['label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => ['/site/logout']];
 		}
-		echo Nav::widget(array(
-			'options' => array('class' => 'navbar-nav pull-right'),
+		echo Nav::widget([
+			'options' => ['class' => 'navbar-nav pull-right'],
 			'items' => $menuItems,
-		));
+		]);
 		NavBar::end();
 	?>
 
 	<div class="container">
-	<?php echo Breadcrumbs::widget(array(
-		'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(),
-	)); ?>
+	<?php echo Breadcrumbs::widget([
+		'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+	]); ?>
 	<?php echo $content; ?>
 	</div>
 
diff --git a/apps/advanced/backend/views/site/login.php b/apps/advanced/backend/views/site/login.php
index 0c16570..bcb673d 100644
--- a/apps/advanced/backend/views/site/login.php
+++ b/apps/advanced/backend/views/site/login.php
@@ -17,12 +17,12 @@ $this->params['breadcrumbs'][] = $this->title;
 
 	<div class="row">
 		<div class="col-lg-5">
-			<?php $form = ActiveForm::begin(array('id' => 'login-form')); ?>
+			<?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
 				<?php echo $form->field($model, 'username'); ?>
 				<?php echo $form->field($model, 'password')->passwordInput(); ?>
 				<?php echo $form->field($model, 'rememberMe')->checkbox(); ?>
 				<div class="form-group">
-					<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?>
+					<?php echo Html::submitButton('Login', ['class' => 'btn btn-primary']); ?>
 				</div>
 			<?php ActiveForm::end(); ?>
 		</div>
diff --git a/apps/advanced/common/config/params.php b/apps/advanced/common/config/params.php
index 2dff87b..7dab548 100644
--- a/apps/advanced/common/config/params.php
+++ b/apps/advanced/common/config/params.php
@@ -4,19 +4,19 @@ Yii::setAlias('common', __DIR__ . '/../');
 Yii::setAlias('frontend', __DIR__ . '/../../frontend');
 Yii::setAlias('backend', __DIR__ . '/../../backend');
 
-return array(
+return [
 	'adminEmail' => 'admin@example.com',
 	'supportEmail' => 'support@example.com',
 
-	'components.cache' => array(
+	'components.cache' => [
 		'class' => 'yii\caching\FileCache',
-	),
+	],
 
-	'components.db' => array(
+	'components.db' => [
 		'class' => 'yii\db\Connection',
 		'dsn' => 'mysql:host=localhost;dbname=yii2advanced',
 		'username' => 'root',
 		'password' => '',
 		'charset' => 'utf8',
-	),
-);
+	],
+];
diff --git a/apps/advanced/common/models/LoginForm.php b/apps/advanced/common/models/LoginForm.php
index 4631dbd..339005b 100644
--- a/apps/advanced/common/models/LoginForm.php
+++ b/apps/advanced/common/models/LoginForm.php
@@ -19,14 +19,14 @@ class LoginForm extends Model
 	 */
 	public function rules()
 	{
-		return array(
+		return [
 			// username and password are both required
-			array('username, password', 'required'),
+			['username, password', 'required'],
 			// password is validated by validatePassword()
-			array('password', 'validatePassword'),
+			['password', 'validatePassword'],
 			// rememberMe must be a boolean value
-			array('rememberMe', 'boolean'),
-		);
+			['rememberMe', 'boolean'],
+		];
 	}
 
 	/**
diff --git a/apps/advanced/common/models/User.php b/apps/advanced/common/models/User.php
index 62baf48..17bd630 100644
--- a/apps/advanced/common/models/User.php
+++ b/apps/advanced/common/models/User.php
@@ -34,15 +34,15 @@ class User extends ActiveRecord implements IdentityInterface
 
 	public function behaviors()
 	{
-		return array(
-			'timestamp' => array(
+		return [
+			'timestamp' => [
 				'class' => 'yii\behaviors\AutoTimestamp',
-				'attributes' => array(
-					ActiveRecord::EVENT_BEFORE_INSERT => array('create_time', 'update_time'),
+				'attributes' => [
+					ActiveRecord::EVENT_BEFORE_INSERT => ['create_time', 'update_time'],
 					ActiveRecord::EVENT_BEFORE_UPDATE => 'update_time',
-				),
-			),
-		);
+				],
+			],
+		];
 	}
 
 	/**
@@ -64,7 +64,7 @@ class User extends ActiveRecord implements IdentityInterface
 	 */
 	public static function findByUsername($username)
 	{
-		return static::find(array('username' => $username, 'status' => static::STATUS_ACTIVE));
+		return static::find(['username' => $username, 'status' => static::STATUS_ACTIVE]);
 	}
 
 	/**
@@ -103,29 +103,29 @@ class User extends ActiveRecord implements IdentityInterface
 
 	public function rules()
 	{
-		return array(
-			array('username', 'filter', 'filter' => 'trim'),
-			array('username', 'required'),
-			array('username', 'string', 'min' => 2, 'max' => 255),
-
-			array('email', 'filter', 'filter' => 'trim'),
-			array('email', 'required'),
-			array('email', 'email'),
-			array('email', 'unique', 'message' => 'This email address has already been taken.', 'on' => 'signup'),
-			array('email', 'exist', 'message' => 'There is no user with such email.', 'on' => 'requestPasswordResetToken'),
-
-			array('password', 'required'),
-			array('password', 'string', 'min' => 6),
-		);
+		return [
+			['username', 'filter', 'filter' => 'trim'],
+			['username', 'required'],
+			['username', 'string', 'min' => 2, 'max' => 255],
+
+			['email', 'filter', 'filter' => 'trim'],
+			['email', 'required'],
+			['email', 'email'],
+			['email', 'unique', 'message' => 'This email address has already been taken.', 'on' => 'signup'],
+			['email', 'exist', 'message' => 'There is no user with such email.', 'on' => 'requestPasswordResetToken'],
+
+			['password', 'required'],
+			['password', 'string', 'min' => 6],
+		];
 	}
 
 	public function scenarios()
 	{
-		return array(
-			'signup' => array('username', 'email', 'password'),
-			'resetPassword' => array('password'),
-			'requestPasswordResetToken' => array('email'),
-		);
+		return [
+			'signup' => ['username', 'email', 'password'],
+			'resetPassword' => ['password'],
+			'requestPasswordResetToken' => ['email'],
+		];
 	}
 
 	public function beforeSave($insert)
diff --git a/apps/advanced/console/config/main.php b/apps/advanced/console/config/main.php
index 7a223c3..fbf452a 100644
--- a/apps/advanced/console/config/main.php
+++ b/apps/advanced/console/config/main.php
@@ -8,24 +8,24 @@ $params = array_merge(
 	require(__DIR__ . '/params-local.php')
 );
 
-return array(
+return [
 	'id' => 'app-console',
 	'basePath' => dirname(__DIR__),
 	'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
 	'controllerNamespace' => 'console\controllers',
-	'modules' => array(
-	),
-	'components' => array(
+	'modules' => [
+	],
+	'components' => [
 		'db' => $params['components.db'],
 		'cache' => $params['components.cache'],
-		'log' => array(
-			'targets' => array(
-				array(
+		'log' => [
+			'targets' => [
+				[
 					'class' => 'yii\log\FileTarget',
-					'levels' => array('error', 'warning'),
-				),
-			),
-		),
-	),
+					'levels' => ['error', 'warning'],
+				],
+			],
+		],
+	],
 	'params' => $params,
-);
+];
diff --git a/apps/advanced/console/config/params.php b/apps/advanced/console/config/params.php
index 1643a70..0e625dc 100644
--- a/apps/advanced/console/config/params.php
+++ b/apps/advanced/console/config/params.php
@@ -1,4 +1,4 @@
 <?php
-return array(
+return [
 	'adminEmail' => 'admin@example.com',
-);
+];
diff --git a/apps/advanced/environments/dev/backend/config/main-local.php b/apps/advanced/environments/dev/backend/config/main-local.php
index 2689ed1..0c1f40e 100644
--- a/apps/advanced/environments/dev/backend/config/main-local.php
+++ b/apps/advanced/environments/dev/backend/config/main-local.php
@@ -1,11 +1,11 @@
 <?php
-return array(
-	'preload' => array(
+return [
+	'preload' => [
 		//'debug',
-	),
-	'modules' => array(
+	],
+	'modules' => [
 //		'debug' => array(
 //			'class' => 'yii\debug\Module',
 //		),
-	),
-);
+	],
+];
diff --git a/apps/advanced/environments/dev/backend/config/params-local.php b/apps/advanced/environments/dev/backend/config/params-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/dev/backend/config/params-local.php
+++ b/apps/advanced/environments/dev/backend/config/params-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/environments/dev/common/config/params-local.php b/apps/advanced/environments/dev/common/config/params-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/dev/common/config/params-local.php
+++ b/apps/advanced/environments/dev/common/config/params-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/environments/dev/console/config/main-local.php b/apps/advanced/environments/dev/console/config/main-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/dev/console/config/main-local.php
+++ b/apps/advanced/environments/dev/console/config/main-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/environments/dev/console/config/params-local.php b/apps/advanced/environments/dev/console/config/params-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/dev/console/config/params-local.php
+++ b/apps/advanced/environments/dev/console/config/params-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/environments/dev/frontend/config/main-local.php b/apps/advanced/environments/dev/frontend/config/main-local.php
index 35d10ed..70a97ab 100644
--- a/apps/advanced/environments/dev/frontend/config/main-local.php
+++ b/apps/advanced/environments/dev/frontend/config/main-local.php
@@ -1,11 +1,11 @@
 <?php
-return array(
-	'preload' => array(
+return [
+	'preload' => [
 		//'debug',
-	),
-	'modules' => array(
+	],
+	'modules' => [
 //			'debug' => array(
 //				'class' => 'yii\debug\Module',
 //			),
-	),
-);
+	],
+];
diff --git a/apps/advanced/environments/dev/frontend/config/params-local.php b/apps/advanced/environments/dev/frontend/config/params-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/dev/frontend/config/params-local.php
+++ b/apps/advanced/environments/dev/frontend/config/params-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/environments/index.php b/apps/advanced/environments/index.php
index 78d221a..50f578f 100644
--- a/apps/advanced/environments/index.php
+++ b/apps/advanced/environments/index.php
@@ -16,23 +16,23 @@
  * );
  * ```
  */
-return array(
-	'Development' => array(
+return [
+	'Development' => [
 		'path' => 'dev',
-		'writable' => array(
+		'writable' => [
 			// handled by composer.json already
-		),
-		'executable' => array(
+		],
+		'executable' => [
 			'yii',
-		),
-	),
-	'Production' => array(
+		],
+	],
+	'Production' => [
 		'path' => 'prod',
-		'writable' => array(
+		'writable' => [
 			// handled by composer.json already
-		),
-		'executable' => array(
+		],
+		'executable' => [
 			'yii',
-		),
-	),
-);
+		],
+	],
+];
diff --git a/apps/advanced/environments/prod/backend/config/main-local.php b/apps/advanced/environments/prod/backend/config/main-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/prod/backend/config/main-local.php
+++ b/apps/advanced/environments/prod/backend/config/main-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/environments/prod/backend/config/params-local.php b/apps/advanced/environments/prod/backend/config/params-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/prod/backend/config/params-local.php
+++ b/apps/advanced/environments/prod/backend/config/params-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/environments/prod/common/config/params-local.php b/apps/advanced/environments/prod/common/config/params-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/prod/common/config/params-local.php
+++ b/apps/advanced/environments/prod/common/config/params-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/environments/prod/console/config/main-local.php b/apps/advanced/environments/prod/console/config/main-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/prod/console/config/main-local.php
+++ b/apps/advanced/environments/prod/console/config/main-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/environments/prod/console/config/params-local.php b/apps/advanced/environments/prod/console/config/params-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/prod/console/config/params-local.php
+++ b/apps/advanced/environments/prod/console/config/params-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/environments/prod/frontend/config/main-local.php b/apps/advanced/environments/prod/frontend/config/main-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/prod/frontend/config/main-local.php
+++ b/apps/advanced/environments/prod/frontend/config/main-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/environments/prod/frontend/config/params-local.php b/apps/advanced/environments/prod/frontend/config/params-local.php
index 5b61b0e..d0b9c34 100644
--- a/apps/advanced/environments/prod/frontend/config/params-local.php
+++ b/apps/advanced/environments/prod/frontend/config/params-local.php
@@ -1,3 +1,3 @@
 <?php
-return array(
-);
+return [
+];
diff --git a/apps/advanced/frontend/config/AppAsset.php b/apps/advanced/frontend/config/AppAsset.php
index 4df653c..98306e3 100644
--- a/apps/advanced/frontend/config/AppAsset.php
+++ b/apps/advanced/frontend/config/AppAsset.php
@@ -17,13 +17,13 @@ class AppAsset extends AssetBundle
 {
 	public $basePath = '@webroot';
 	public $baseUrl = '@web';
-	public $css = array(
+	public $css = [
 		'css/site.css',
-	);
-	public $js = array(
-	);
-	public $depends = array(
+	];
+	public $js = [
+	];
+	public $depends = [
 		'yii\web\YiiAsset',
 		'yii\bootstrap\BootstrapAsset',
-	);
+	];
 }
diff --git a/apps/advanced/frontend/config/main.php b/apps/advanced/frontend/config/main.php
index 975a3b4..fca46d9 100644
--- a/apps/advanced/frontend/config/main.php
+++ b/apps/advanced/frontend/config/main.php
@@ -8,35 +8,35 @@ $params = array_merge(
 	require(__DIR__ . '/params-local.php')
 );
 
-return array(
+return [
 	'id' => 'app-frontend',
 	'basePath' => dirname(__DIR__),
 	'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
 	'controllerNamespace' => 'frontend\controllers',
-	'modules' => array(
+	'modules' => [
 		'gii' => 'yii\gii\Module'
-	),
-	'components' => array(
-		'request' => array(
+	],
+	'components' => [
+		'request' => [
 			'enableCsrfValidation' => true,
-		),
+		],
 		'db' => $params['components.db'],
 		'cache' => $params['components.cache'],
-		'user' => array(
+		'user' => [
 			'identityClass' => 'common\models\User',
-		),
-		'log' => array(
+		],
+		'log' => [
 			'traceLevel' => YII_DEBUG ? 3 : 0,
-			'targets' => array(
-				array(
+			'targets' => [
+				[
 					'class' => 'yii\log\FileTarget',
-					'levels' => array('error', 'warning'),
-				),
-			),
-		),
-		'errorHandler' => array(
+					'levels' => ['error', 'warning'],
+				],
+			],
+		],
+		'errorHandler' => [
 			'errorAction' => 'site/error',
-		),
-	),
+		],
+	],
 	'params' => $params,
-);
+];
diff --git a/apps/advanced/frontend/config/params.php b/apps/advanced/frontend/config/params.php
index 1643a70..0e625dc 100644
--- a/apps/advanced/frontend/config/params.php
+++ b/apps/advanced/frontend/config/params.php
@@ -1,4 +1,4 @@
 <?php
-return array(
+return [
 	'adminEmail' => 'admin@example.com',
-);
+];
diff --git a/apps/advanced/frontend/controllers/SiteController.php b/apps/advanced/frontend/controllers/SiteController.php
index a9413de..26aa300 100644
--- a/apps/advanced/frontend/controllers/SiteController.php
+++ b/apps/advanced/frontend/controllers/SiteController.php
@@ -14,37 +14,37 @@ class SiteController extends Controller
 {
 	public function behaviors()
 	{
-		return array(
-			'access' => array(
+		return [
+			'access' => [
 				'class' => \yii\web\AccessControl::className(),
-				'only' => array('login', 'logout', 'signup'),
-				'rules' => array(
-					array(
-						'actions' => array('login', 'signup'),
+				'only' => ['login', 'logout', 'signup'],
+				'rules' => [
+					[
+						'actions' => ['login', 'signup'],
 						'allow' => true,
-						'roles' => array('?'),
-					),
-					array(
-						'actions' => array('logout'),
+						'roles' => ['?'],
+					],
+					[
+						'actions' => ['logout'],
 						'allow' => true,
-						'roles' => array('@'),
-					),
-				),
-			),
-		);
+						'roles' => ['@'],
+					],
+				],
+			],
+		];
 	}
 
 	public function actions()
 	{
-		return array(
-			'error' => array(
+		return [
+			'error' => [
 				'class' => 'yii\web\ErrorAction',
-			),
-			'captcha' => array(
+			],
+			'captcha' => [
 				'class' => 'yii\captcha\CaptchaAction',
 				'fixedVerifyCode' => YII_ENV_TEST ? 'testme' : null,
-			),
-		);
+			],
+		];
 	}
 
 	public function actionIndex()
@@ -58,9 +58,9 @@ class SiteController extends Controller
 		if ($model->load($_POST) && $model->login()) {
 			return $this->goHome();
 		} else {
-			return $this->render('login', array(
+			return $this->render('login', [
 				'model' => $model,
-			));
+			]);
 		}
 	}
 
@@ -77,9 +77,9 @@ class SiteController extends Controller
 			Yii::$app->session->setFlash('success', 'Thank you for contacting us. We will respond to you as soon as possible.');
 			return $this->refresh();
 		} else {
-			return $this->render('contact', array(
+			return $this->render('contact', [
 				'model' => $model,
-			));
+			]);
 		}
 	}
 
@@ -98,9 +98,9 @@ class SiteController extends Controller
 			}
 		}
 
-		return $this->render('signup', array(
+		return $this->render('signup', [
 			'model' => $model,
-		));
+		]);
 	}
 
 	public function actionRequestPasswordReset()
@@ -115,17 +115,17 @@ class SiteController extends Controller
 				Yii::$app->getSession()->setFlash('error', 'There was an error sending email.');
 			}
 		}
-		return $this->render('requestPasswordResetToken', array(
+		return $this->render('requestPasswordResetToken', [
 			'model' => $model,
-		));
+		]);
 	}
 
 	public function actionResetPassword($token)
 	{
-		$model = User::find(array(
+		$model = User::find([
 			'password_reset_token' => $token,
 			'status' => User::STATUS_ACTIVE,
-		));
+		]);
 
 		if (!$model) {
 			throw new HttpException(400, 'Wrong password reset token.');
@@ -137,17 +137,17 @@ class SiteController extends Controller
 			return $this->goHome();
 		}
 
-		return $this->render('resetPassword', array(
+		return $this->render('resetPassword', [
 			'model' => $model,
-		));
+		]);
 	}
 
 	private function sendPasswordResetEmail($email)
 	{
-		$user = User::find(array(
+		$user = User::find([
 			'status' => User::STATUS_ACTIVE,
 			'email' => $email,
-		));
+		]);
 
 		if (!$user) {
 			return false;
@@ -158,9 +158,9 @@ class SiteController extends Controller
 			$fromEmail = \Yii::$app->params['supportEmail'];
 			$name = '=?UTF-8?B?' . base64_encode(\Yii::$app->name . ' robot') . '?=';
 			$subject = '=?UTF-8?B?' . base64_encode('Password reset for ' . \Yii::$app->name) . '?=';
-			$body = $this->renderPartial('/emails/passwordResetToken', array(
+			$body = $this->renderPartial('/emails/passwordResetToken', [
 				'user' => $user,
-			));
+			]);
 			$headers = "From: $name <{$fromEmail}>\r\n" .
 				"MIME-Version: 1.0\r\n" .
 				"Content-type: text/plain; charset=UTF-8";
diff --git a/apps/advanced/frontend/models/ContactForm.php b/apps/advanced/frontend/models/ContactForm.php
index b3d8682..ddb622b 100644
--- a/apps/advanced/frontend/models/ContactForm.php
+++ b/apps/advanced/frontend/models/ContactForm.php
@@ -20,14 +20,14 @@ class ContactForm extends Model
 	 */
 	public function rules()
 	{
-		return array(
+		return [
 			// name, email, subject and body are required
-			array('name, email, subject, body', 'required'),
+			['name, email, subject, body', 'required'],
 			// email has to be a valid email address
-			array('email', 'email'),
+			['email', 'email'],
 			// verifyCode needs to be entered correctly
-			array('verifyCode', 'captcha'),
-		);
+			['verifyCode', 'captcha'],
+		];
 	}
 
 	/**
@@ -35,9 +35,9 @@ class ContactForm extends Model
 	 */
 	public function attributeLabels()
 	{
-		return array(
+		return [
 			'verifyCode' => 'Verification Code',
-		);
+		];
 	}
 
 	/**
diff --git a/apps/advanced/frontend/views/emails/passwordResetToken.php b/apps/advanced/frontend/views/emails/passwordResetToken.php
index 1e7a855..134dc08 100644
--- a/apps/advanced/frontend/views/emails/passwordResetToken.php
+++ b/apps/advanced/frontend/views/emails/passwordResetToken.php
@@ -6,7 +6,7 @@ use yii\helpers\Html;
  * @var common\models\User $user;
  */
 
-$resetLink = Yii::$app->urlManager->createAbsoluteUrl('site/reset-password', array('token' => $user->password_reset_token));
+$resetLink = Yii::$app->urlManager->createAbsoluteUrl('site/reset-password', ['token' => $user->password_reset_token]);
 ?>
 
 Hello <?php echo Html::encode($user->username)?>,
diff --git a/apps/advanced/frontend/views/layouts/main.php b/apps/advanced/frontend/views/layouts/main.php
index 0165ba0..d3e05a7 100644
--- a/apps/advanced/frontend/views/layouts/main.php
+++ b/apps/advanced/frontend/views/layouts/main.php
@@ -23,35 +23,35 @@ AppAsset::register($this);
 <body>
 	<?php $this->beginBody(); ?>
 	<?php
-		NavBar::begin(array(
+		NavBar::begin([
 			'brandLabel' => 'My Company',
 			'brandUrl' => Yii::$app->homeUrl,
-			'options' => array(
+			'options' => [
 				'class' => 'navbar-inverse navbar-fixed-top',
-			),
-		));
-		$menuItems = array(
-			array('label' => 'Home', 'url' => array('/site/index')),
-			array('label' => 'About', 'url' => array('/site/about')),
-			array('label' => 'Contact', 'url' => array('/site/contact')),
-		);
+			],
+		]);
+		$menuItems = [
+			['label' => 'Home', 'url' => ['/site/index']],
+			['label' => 'About', 'url' => ['/site/about']],
+			['label' => 'Contact', 'url' => ['/site/contact']],
+		];
 		if (Yii::$app->user->isGuest) {
-			$menuItems[] = array('label' => 'Signup', 'url' => array('/site/signup'));
-			$menuItems[] = array('label' => 'Login', 'url' => array('/site/login'));
+			$menuItems[] = ['label' => 'Signup', 'url' => ['/site/signup']];
+			$menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
 		} else {
-			$menuItems[] = array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout'));
+			$menuItems[] = ['label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => ['/site/logout']];
 		}
-		echo Nav::widget(array(
-			'options' => array('class' => 'navbar-nav pull-right'),
+		echo Nav::widget([
+			'options' => ['class' => 'navbar-nav pull-right'],
 			'items' => $menuItems,
-		));
+		]);
 		NavBar::end();
 	?>
 
 	<div class="container">
-	<?php echo Breadcrumbs::widget(array(
-		'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(),
-	)); ?>
+	<?php echo Breadcrumbs::widget([
+		'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+	]); ?>
 	<?php echo Alert::widget()?>
 	<?php echo $content; ?>
 	</div>
diff --git a/apps/advanced/frontend/views/site/contact.php b/apps/advanced/frontend/views/site/contact.php
index 851deda..9b1b392 100644
--- a/apps/advanced/frontend/views/site/contact.php
+++ b/apps/advanced/frontend/views/site/contact.php
@@ -20,17 +20,17 @@ $this->params['breadcrumbs'][] = $this->title;
 
 	<div class="row">
 		<div class="col-lg-5">
-			<?php $form = ActiveForm::begin(array('id' => 'contact-form')); ?>
+			<?php $form = ActiveForm::begin(['id' => 'contact-form']); ?>
 				<?php echo $form->field($model, 'name'); ?>
 				<?php echo $form->field($model, 'email'); ?>
 				<?php echo $form->field($model, 'subject'); ?>
-				<?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?>
-				<?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), array(
-					'options' => array('class' => 'form-control'),
+				<?php echo $form->field($model, 'body')->textArea(['rows' => 6]); ?>
+				<?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), [
+					'options' => ['class' => 'form-control'],
 					'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
-				)); ?>
+				]); ?>
 				<div class="form-group">
-					<?php echo Html::submitButton('Submit', array('class' => 'btn btn-primary')); ?>
+					<?php echo Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?>
 				</div>
 			<?php ActiveForm::end(); ?>
 		</div>
diff --git a/apps/advanced/frontend/views/site/login.php b/apps/advanced/frontend/views/site/login.php
index 5e7f6f6..22b5db5 100644
--- a/apps/advanced/frontend/views/site/login.php
+++ b/apps/advanced/frontend/views/site/login.php
@@ -17,15 +17,15 @@ $this->params['breadcrumbs'][] = $this->title;
 
 	<div class="row">
 		<div class="col-lg-5">
-			<?php $form = ActiveForm::begin(array('id' => 'login-form')); ?>
+			<?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
 				<?php echo $form->field($model, 'username'); ?>
 				<?php echo $form->field($model, 'password')->passwordInput(); ?>
 				<?php echo $form->field($model, 'rememberMe')->checkbox(); ?>
 				<div style="color:#999;margin:1em 0">
-					If you forgot your password you can <?php echo Html::a('reset it', array('site/request-password-reset'))?>.
+					If you forgot your password you can <?php echo Html::a('reset it', ['site/request-password-reset'])?>.
 				</div>
 				<div class="form-group">
-					<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?>
+					<?php echo Html::submitButton('Login', ['class' => 'btn btn-primary']); ?>
 				</div>
 			<?php ActiveForm::end(); ?>
 		</div>
diff --git a/apps/advanced/frontend/views/site/requestPasswordResetToken.php b/apps/advanced/frontend/views/site/requestPasswordResetToken.php
index c754948..0b0ace4 100644
--- a/apps/advanced/frontend/views/site/requestPasswordResetToken.php
+++ b/apps/advanced/frontend/views/site/requestPasswordResetToken.php
@@ -17,10 +17,10 @@ $this->params['breadcrumbs'][] = $this->title;
 
 	<div class="row">
 		<div class="col-lg-5">
-			<?php $form = ActiveForm::begin(array('id' => 'request-password-reset-form')); ?>
+			<?php $form = ActiveForm::begin(['id' => 'request-password-reset-form']); ?>
 				<?php echo $form->field($model, 'email'); ?>
 				<div class="form-group">
-					<?php echo Html::submitButton('Send', array('class' => 'btn btn-primary')); ?>
+					<?php echo Html::submitButton('Send', ['class' => 'btn btn-primary']); ?>
 				</div>
 			<?php ActiveForm::end(); ?>
 		</div>
diff --git a/apps/advanced/frontend/views/site/resetPassword.php b/apps/advanced/frontend/views/site/resetPassword.php
index 2c38028..92a1363 100644
--- a/apps/advanced/frontend/views/site/resetPassword.php
+++ b/apps/advanced/frontend/views/site/resetPassword.php
@@ -17,10 +17,10 @@ $this->params['breadcrumbs'][] = $this->title;
 
 	<div class="row">
 		<div class="col-lg-5">
-			<?php $form = ActiveForm::begin(array('id' => 'reset-password-form')); ?>
+			<?php $form = ActiveForm::begin(['id' => 'reset-password-form']); ?>
 				<?php echo $form->field($model, 'password')->passwordInput(); ?>
 				<div class="form-group">
-					<?php echo Html::submitButton('Save', array('class' => 'btn btn-primary')); ?>
+					<?php echo Html::submitButton('Save', ['class' => 'btn btn-primary']); ?>
 				</div>
 			<?php ActiveForm::end(); ?>
 		</div>
diff --git a/apps/advanced/frontend/views/site/signup.php b/apps/advanced/frontend/views/site/signup.php
index 92525bf..7f6c2ad 100644
--- a/apps/advanced/frontend/views/site/signup.php
+++ b/apps/advanced/frontend/views/site/signup.php
@@ -17,12 +17,12 @@ $this->params['breadcrumbs'][] = $this->title;
 
 	<div class="row">
 		<div class="col-lg-5">
-			<?php $form = ActiveForm::begin(array('id' => 'form-signup')); ?>
+			<?php $form = ActiveForm::begin(['id' => 'form-signup']); ?>
 				<?php echo $form->field($model, 'username'); ?>
 				<?php echo $form->field($model, 'email'); ?>
 				<?php echo $form->field($model, 'password')->passwordInput(); ?>
 				<div class="form-group">
-					<?php echo Html::submitButton('Signup', array('class' => 'btn btn-primary')); ?>
+					<?php echo Html::submitButton('Signup', ['class' => 'btn btn-primary']); ?>
 				</div>
 			<?php ActiveForm::end(); ?>
 		</div>
diff --git a/apps/advanced/init b/apps/advanced/init
index 3a8f6a6..f5d2691 100755
--- a/apps/advanced/init
+++ b/apps/advanced/init
@@ -73,7 +73,7 @@ echo "\n  ... initialization completed.\n\n";
 
 function getFileList($root, $basePath = '')
 {
-	$files = array();
+	$files = [];
 	$handle = opendir($root);
 	while (($path = readdir($handle)) !== false) {
 		if ($path === '.svn' || $path === '.' || $path === '..') {
@@ -135,13 +135,13 @@ function copyFile($root, $source, $target, &$all)
 
 function getParams()
 {
-	$rawParams = array();
+	$rawParams = [];
 	if (isset($_SERVER['argv'])) {
 		$rawParams = $_SERVER['argv'];
 		array_shift($rawParams);
 	}
 
-	$params = array();
+	$params = [];
 	foreach ($rawParams as $param) {
 		if (preg_match('/^--(\w+)(=(.*))?$/', $param, $matches)) {
 			$name = $matches[1];
diff --git a/apps/advanced/requirements.php b/apps/advanced/requirements.php
index c9e6493..139284f 100644
--- a/apps/advanced/requirements.php
+++ b/apps/advanced/requirements.php
@@ -26,78 +26,78 @@ $requirementsChecker = new YiiRequirementChecker();
 /**
  * Adjust requirements according to your application specifics.
  */
-$requirements = array(
+$requirements = [
 	// Database :
-	array(
+	[
 		'name' => 'PDO extension',
 		'mandatory' => true,
 		'condition' => extension_loaded('pdo'),
 		'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
-	),
-	array(
+	],
+	[
 		'name' => 'PDO SQLite extension',
 		'mandatory' => false,
 		'condition' => extension_loaded('pdo_sqlite'),
 		'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
 		'memo' => 'Required for SQLite database.',
-	),
-	array(
+	],
+	[
 		'name' => 'PDO MySQL extension',
 		'mandatory' => false,
 		'condition' => extension_loaded('pdo_mysql'),
 		'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
 		'memo' => 'Required for MySQL database.',
-	),
+	],
 	// Cache :
-	array(
+	[
 		'name' => 'Memcache extension',
 		'mandatory' => false,
 		'condition' => extension_loaded('memcache') || extension_loaded('memcached'),
 		'by' => '<a href="http://www.yiiframework.com/doc/api/CMemCache">CMemCache</a>',
 		'memo' => extension_loaded('memcached') ? 'To use memcached set <a href="http://www.yiiframework.com/doc/api/CMemCache#useMemcached-detail">CMemCache::useMemcached</a> to <code>true</code>.' : ''
-	),
-	array(
+	],
+	[
 		'name' => 'APC extension',
 		'mandatory' => false,
 		'condition' => extension_loaded('apc') || extension_loaded('apc'),
 		'by' => '<a href="http://www.yiiframework.com/doc/api/CApcCache">CApcCache</a>',
-	),
+	],
 	// Additional PHP extensions :
-	array(
+	[
 		'name' => 'Mcrypt extension',
 		'mandatory' => false,
 		'condition' => extension_loaded('mcrypt'),
 		'by' => '<a href="http://www.yiiframework.com/doc/api/CSecurityManager">CSecurityManager</a>',
 		'memo' => 'Required by encrypt and decrypt methods.'
-	),
+	],
 	// PHP ini :
-	'phpSafeMode' => array(
+	'phpSafeMode' => [
 		'name' => 'PHP safe mode',
 		'mandatory' => false,
 		'condition' => $requirementsChecker->checkPhpIniOff("safe_mode"),
 		'by' => 'File uploading and console command execution',
 		'memo' => '"safe_mode" should be disabled at php.ini',
-	),
-	'phpExposePhp' => array(
+	],
+	'phpExposePhp' => [
 		'name' => 'Expose PHP',
 		'mandatory' => false,
 		'condition' => $requirementsChecker->checkPhpIniOff("expose_php"),
 		'by' => 'Security reasons',
 		'memo' => '"expose_php" should be disabled at php.ini',
-	),
-	'phpAllowUrlInclude' => array(
+	],
+	'phpAllowUrlInclude' => [
 		'name' => 'PHP allow url include',
 		'mandatory' => false,
 		'condition' => $requirementsChecker->checkPhpIniOff("allow_url_include"),
 		'by' => 'Security reasons',
 		'memo' => '"allow_url_include" should be disabled at php.ini',
-	),
-	'phpSmtp' => array(
+	],
+	'phpSmtp' => [
 		'name' => 'PHP mail SMTP',
 		'mandatory' => false,
 		'condition' => strlen(ini_get('SMTP'))>0,
 		'by' => 'Email sending',
 		'memo' => 'PHP mail SMTP server required',
-	),
-);
+	],
+];
 $requirementsChecker->checkYii()->check($requirements)->render();
diff --git a/apps/basic/config/console.php b/apps/basic/config/console.php
index 8d50bd2..cc1cdb8 100644
--- a/apps/basic/config/console.php
+++ b/apps/basic/config/console.php
@@ -3,7 +3,7 @@ $params = require(__DIR__ . '/params.php');
 return [
 	'id' => 'bootstrap-console',
 	'basePath' => dirname(__DIR__),
-	'preload' => array('log'),
+	'preload' => ['log'],
 	'controllerPath' => dirname(__DIR__) . '/commands',
 	'controllerNamespace' => 'app\commands',
 	'modules' => [
diff --git a/apps/basic/requirements.php b/apps/basic/requirements.php
index c9e6493..139284f 100644
--- a/apps/basic/requirements.php
+++ b/apps/basic/requirements.php
@@ -26,78 +26,78 @@ $requirementsChecker = new YiiRequirementChecker();
 /**
  * Adjust requirements according to your application specifics.
  */
-$requirements = array(
+$requirements = [
 	// Database :
-	array(
+	[
 		'name' => 'PDO extension',
 		'mandatory' => true,
 		'condition' => extension_loaded('pdo'),
 		'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
-	),
-	array(
+	],
+	[
 		'name' => 'PDO SQLite extension',
 		'mandatory' => false,
 		'condition' => extension_loaded('pdo_sqlite'),
 		'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
 		'memo' => 'Required for SQLite database.',
-	),
-	array(
+	],
+	[
 		'name' => 'PDO MySQL extension',
 		'mandatory' => false,
 		'condition' => extension_loaded('pdo_mysql'),
 		'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
 		'memo' => 'Required for MySQL database.',
-	),
+	],
 	// Cache :
-	array(
+	[
 		'name' => 'Memcache extension',
 		'mandatory' => false,
 		'condition' => extension_loaded('memcache') || extension_loaded('memcached'),
 		'by' => '<a href="http://www.yiiframework.com/doc/api/CMemCache">CMemCache</a>',
 		'memo' => extension_loaded('memcached') ? 'To use memcached set <a href="http://www.yiiframework.com/doc/api/CMemCache#useMemcached-detail">CMemCache::useMemcached</a> to <code>true</code>.' : ''
-	),
-	array(
+	],
+	[
 		'name' => 'APC extension',
 		'mandatory' => false,
 		'condition' => extension_loaded('apc') || extension_loaded('apc'),
 		'by' => '<a href="http://www.yiiframework.com/doc/api/CApcCache">CApcCache</a>',
-	),
+	],
 	// Additional PHP extensions :
-	array(
+	[
 		'name' => 'Mcrypt extension',
 		'mandatory' => false,
 		'condition' => extension_loaded('mcrypt'),
 		'by' => '<a href="http://www.yiiframework.com/doc/api/CSecurityManager">CSecurityManager</a>',
 		'memo' => 'Required by encrypt and decrypt methods.'
-	),
+	],
 	// PHP ini :
-	'phpSafeMode' => array(
+	'phpSafeMode' => [
 		'name' => 'PHP safe mode',
 		'mandatory' => false,
 		'condition' => $requirementsChecker->checkPhpIniOff("safe_mode"),
 		'by' => 'File uploading and console command execution',
 		'memo' => '"safe_mode" should be disabled at php.ini',
-	),
-	'phpExposePhp' => array(
+	],
+	'phpExposePhp' => [
 		'name' => 'Expose PHP',
 		'mandatory' => false,
 		'condition' => $requirementsChecker->checkPhpIniOff("expose_php"),
 		'by' => 'Security reasons',
 		'memo' => '"expose_php" should be disabled at php.ini',
-	),
-	'phpAllowUrlInclude' => array(
+	],
+	'phpAllowUrlInclude' => [
 		'name' => 'PHP allow url include',
 		'mandatory' => false,
 		'condition' => $requirementsChecker->checkPhpIniOff("allow_url_include"),
 		'by' => 'Security reasons',
 		'memo' => '"allow_url_include" should be disabled at php.ini',
-	),
-	'phpSmtp' => array(
+	],
+	'phpSmtp' => [
 		'name' => 'PHP mail SMTP',
 		'mandatory' => false,
 		'condition' => strlen(ini_get('SMTP'))>0,
 		'by' => 'Email sending',
 		'memo' => 'PHP mail SMTP server required',
-	),
-);
+	],
+];
 $requirementsChecker->checkYii()->check($requirements)->render();
diff --git a/apps/basic/tests/acceptance/ContactCept.php b/apps/basic/tests/acceptance/ContactCept.php
index 73527ab..5ec5641 100644
--- a/apps/basic/tests/acceptance/ContactCept.php
+++ b/apps/basic/tests/acceptance/ContactCept.php
@@ -4,7 +4,7 @@ $I->wantTo('ensure that contact works');
 $I->amOnPage('?r=site/contact');
 $I->see('Contact', 'h1');
 
-$I->submitForm('#contact-form', array());
+$I->submitForm('#contact-form', []);
 $I->see('Contact', 'h1');
 $I->see('Name cannot be blank');
 $I->see('Email cannot be blank');
@@ -12,25 +12,25 @@ $I->see('Subject cannot be blank');
 $I->see('Body cannot be blank');
 $I->see('The verification code is incorrect');
 
-$I->submitForm('#contact-form', array(
+$I->submitForm('#contact-form', [
 	'ContactForm[name]' => 'tester',
 	'ContactForm[email]' => 'tester.email',
 	'ContactForm[subject]' => 'test subject',
 	'ContactForm[body]' => 'test content',
 	'ContactForm[verifyCode]' => 'testme',
-));
+]);
 $I->dontSee('Name cannot be blank', '.help-inline');
 $I->see('Email is not a valid email address.');
 $I->dontSee('Subject cannot be blank', '.help-inline');
 $I->dontSee('Body cannot be blank', '.help-inline');
 $I->dontSee('The verification code is incorrect', '.help-inline');
 
-$I->submitForm('#contact-form', array(
+$I->submitForm('#contact-form', [
 	'ContactForm[name]' => 'tester',
 	'ContactForm[email]' => 'tester@example.com',
 	'ContactForm[subject]' => 'test subject',
 	'ContactForm[body]' => 'test content',
 	'ContactForm[verifyCode]' => 'testme',
-));
+]);
 $I->dontSeeElement('#contact-form');
 $I->see('Thank you for contacting us. We will respond to you as soon as possible.');
diff --git a/apps/basic/tests/acceptance/LoginCept.php b/apps/basic/tests/acceptance/LoginCept.php
index 77c4a07..5621b15 100644
--- a/apps/basic/tests/acceptance/LoginCept.php
+++ b/apps/basic/tests/acceptance/LoginCept.php
@@ -4,20 +4,20 @@ $I->wantTo('ensure that login works');
 $I->amOnPage('?r=site/login');
 $I->see('Login', 'h1');
 
-$I->submitForm('#login-form', array());
+$I->submitForm('#login-form', []);
 $I->dontSee('Logout (admin)');
 $I->see('Username cannot be blank');
 $I->see('Password cannot be blank');
 
-$I->submitForm('#login-form', array(
+$I->submitForm('#login-form', [
 	'LoginForm[username]' => 'admin',
 	'LoginForm[password]' => 'wrong',
-));
+]);
 $I->dontSee('Logout (admin)');
 $I->see('Incorrect username or password');
 
-$I->submitForm('#login-form', array(
+$I->submitForm('#login-form', [
 	'LoginForm[username]' => 'admin',
 	'LoginForm[password]' => 'admin',
-));
+]);
 $I->see('Logout (admin)');
diff --git a/apps/basic/tests/functional/ContactCept.php b/apps/basic/tests/functional/ContactCept.php
index 6feafd9..b58361a 100644
--- a/apps/basic/tests/functional/ContactCept.php
+++ b/apps/basic/tests/functional/ContactCept.php
@@ -4,7 +4,7 @@ $I->wantTo('ensure that contact works');
 $I->amOnPage('?r=site/contact');
 $I->see('Contact', 'h1');
 
-$I->submitForm('#contact-form', array());
+$I->submitForm('#contact-form', []);
 $I->see('Contact', 'h1');
 $I->see('Name cannot be blank');
 $I->see('Email cannot be blank');
@@ -12,25 +12,25 @@ $I->see('Subject cannot be blank');
 $I->see('Body cannot be blank');
 $I->see('The verification code is incorrect');
 
-$I->submitForm('#contact-form', array(
+$I->submitForm('#contact-form', [
 	'ContactForm[name]' => 'tester',
 	'ContactForm[email]' => 'tester.email',
 	'ContactForm[subject]' => 'test subject',
 	'ContactForm[body]' => 'test content',
 	'ContactForm[verifyCode]' => 'testme',
-));
+]);
 $I->dontSee('Name cannot be blank', '.help-inline');
 $I->see('Email is not a valid email address.');
 $I->dontSee('Subject cannot be blank', '.help-inline');
 $I->dontSee('Body cannot be blank', '.help-inline');
 $I->dontSee('The verification code is incorrect', '.help-inline');
 
-$I->submitForm('#contact-form', array(
+$I->submitForm('#contact-form', [
 	'ContactForm[name]' => 'tester',
 	'ContactForm[email]' => 'tester@example.com',
 	'ContactForm[subject]' => 'test subject',
 	'ContactForm[body]' => 'test content',
 	'ContactForm[verifyCode]' => 'testme',
-));
+]);
 $I->dontSeeElement('#contact-form');
 $I->see('Thank you for contacting us. We will respond to you as soon as possible.');
diff --git a/apps/basic/tests/functional/LoginCept.php b/apps/basic/tests/functional/LoginCept.php
index 11f8f6b..9d71378 100644
--- a/apps/basic/tests/functional/LoginCept.php
+++ b/apps/basic/tests/functional/LoginCept.php
@@ -4,20 +4,20 @@ $I->wantTo('ensure that login works');
 $I->amOnPage('?r=site/login');
 $I->see('Login', 'h1');
 
-$I->submitForm('#login-form', array());
+$I->submitForm('#login-form', []);
 $I->dontSee('Logout (admin)');
 $I->see('Username cannot be blank');
 $I->see('Password cannot be blank');
 
-$I->submitForm('#login-form', array(
+$I->submitForm('#login-form', [
 	'LoginForm[username]' => 'admin',
 	'LoginForm[password]' => 'wrong',
-));
+]);
 $I->dontSee('Logout (admin)');
 $I->see('Incorrect username or password');
 
-$I->submitForm('#login-form', array(
+$I->submitForm('#login-form', [
 	'LoginForm[username]' => 'admin',
 	'LoginForm[password]' => 'admin',
-));
+]);
 $I->see('Logout (admin)');
diff --git a/apps/basic/views/layouts/main.php b/apps/basic/views/layouts/main.php
index 1b7083d..30246b1 100644
--- a/apps/basic/views/layouts/main.php
+++ b/apps/basic/views/layouts/main.php
@@ -21,33 +21,33 @@ app\config\AppAsset::register($this);
 <body>
 <?php $this->beginBody(); ?>
 	<?php
-		NavBar::begin(array(
+		NavBar::begin([
 			'brandLabel' => 'My Company',
 			'brandUrl' => Yii::$app->homeUrl,
-			'options' => array(
+			'options' => [
 				'class' => 'navbar-inverse navbar-fixed-top',
-			),
-		));
-		echo Nav::widget(array(
-			'options' => array('class' => 'navbar-nav pull-right'),
-			'items' => array(
-				array('label' => 'Home', 'url' => array('/site/index')),
-				array('label' => 'About', 'url' => array('/site/about')),
-				array('label' => 'Contact', 'url' => array('/site/contact')),
+			],
+		]);
+		echo Nav::widget([
+			'options' => ['class' => 'navbar-nav pull-right'],
+			'items' => [
+				['label' => 'Home', 'url' => ['/site/index']],
+				['label' => 'About', 'url' => ['/site/about']],
+				['label' => 'Contact', 'url' => ['/site/contact']],
 				Yii::$app->user->isGuest ?
-					array('label' => 'Login', 'url' => array('/site/login')) :
-					array('label' => 'Logout (' . Yii::$app->user->identity->username .')' ,
-						'url' => array('/site/logout'),
-						'linkOptions' => array('data-method' => 'post')),
-			),
-		));
+					['label' => 'Login', 'url' => ['/site/login']] :
+					['label' => 'Logout (' . Yii::$app->user->identity->username .')' ,
+						'url' => ['/site/logout'],
+						'linkOptions' => ['data-method' => 'post']],
+			],
+		]);
 		NavBar::end();
 	?>
 
 	<div class="container">
-		<?php echo Breadcrumbs::widget(array(
-			'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(),
-		)); ?>
+		<?php echo Breadcrumbs::widget([
+			'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+		]); ?>
 		<?php echo $content; ?>
 	</div>
 
diff --git a/apps/basic/views/site/contact.php b/apps/basic/views/site/contact.php
index d1411c0..55113cc 100644
--- a/apps/basic/views/site/contact.php
+++ b/apps/basic/views/site/contact.php
@@ -28,17 +28,17 @@ $this->params['breadcrumbs'][] = $this->title;
 
 	<div class="row">
 		<div class="col-lg-5">
-			<?php $form = ActiveForm::begin(array('id' => 'contact-form')); ?>
+			<?php $form = ActiveForm::begin(['id' => 'contact-form']); ?>
 				<?php echo $form->field($model, 'name'); ?>
 				<?php echo $form->field($model, 'email'); ?>
 				<?php echo $form->field($model, 'subject'); ?>
-				<?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?>
-				<?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), array(
-					'options' => array('class' => 'form-control'),
+				<?php echo $form->field($model, 'body')->textArea(['rows' => 6]); ?>
+				<?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), [
+					'options' => ['class' => 'form-control'],
 					'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
-				)); ?>
+				]); ?>
 				<div class="form-group">
-					<?php echo Html::submitButton('Submit', array('class' => 'btn btn-primary')); ?>
+					<?php echo Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?>
 				</div>
 			<?php ActiveForm::end(); ?>
 		</div>
diff --git a/apps/basic/views/site/login.php b/apps/basic/views/site/login.php
index f61d9d7..7efb8b7 100644
--- a/apps/basic/views/site/login.php
+++ b/apps/basic/views/site/login.php
@@ -15,26 +15,26 @@ $this->params['breadcrumbs'][] = $this->title;
 
 	<p>Please fill out the following fields to login:</p>
 
-	<?php $form = ActiveForm::begin(array(
+	<?php $form = ActiveForm::begin([
 		'id' => 'login-form',
-		'options' => array('class' => 'form-horizontal'),
-		'fieldConfig' => array(
+		'options' => ['class' => 'form-horizontal'],
+		'fieldConfig' => [
 			'template' => "{label}\n<div class=\"col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
-			'labelOptions' => array('class' => 'col-lg-1 control-label'),
-		),
-	)); ?>
+			'labelOptions' => ['class' => 'col-lg-1 control-label'],
+		],
+	]); ?>
 
 	<?php echo $form->field($model, 'username'); ?>
 
 	<?php echo $form->field($model, 'password')->passwordInput(); ?>
 
-	<?php echo $form->field($model, 'rememberMe', array(
+	<?php echo $form->field($model, 'rememberMe', [
 		'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
-	))->checkbox(); ?>
+	])->checkbox(); ?>
 
 	<div class="form-group">
 		<div class="col-lg-offset-1 col-lg-11">
-			<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?>
+			<?php echo Html::submitButton('Login', ['class' => 'btn btn-primary']); ?>
 		</div>
 	</div>
 
diff --git a/apps/basic/web/index-test.php b/apps/basic/web/index-test.php
index 79273ae..c9bd338 100644
--- a/apps/basic/web/index-test.php
+++ b/apps/basic/web/index-test.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1'))) {
+if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
 	die('You are not allowed to access this file.');
 }