Merge pull request #1 from yiisoft/master

Sync..
Convert to short syntax [2].
Merge pull request #1012 from KingYes/master

 	Convert to short syntax [2].