Fixes related to #129 and #2446:

1. Fix CS.
2. Add additional PHPDoc declarations.
Merge branch 'master' of github.com:yiisoft/yii